diff --git a/rowers/templates/document_form.html b/rowers/templates/document_form.html
index 997bfc37..3c02acee 100644
--- a/rowers/templates/document_form.html
+++ b/rowers/templates/document_form.html
@@ -15,12 +15,28 @@
$(document).ready(function() {
$('#id_file').on('change', function(evt) {
var f = this.files[0];
+ var istcx = false;
+ var isgzip = false;
+ var size1 = 10485760;
+ var size2 = 1048576;
+ if ((/\.(tcx|TCX)/i).test(f.name)) {
+ istcx = true;
+ console.log('tcx');
+ if ((/\.(gz|GZ)/i).test(f.name)) {
+ isgzip = true;
+ console.log('gzip');
+ size1 /= 5;
+ size2 /= 5;
+ }
+ }
console.log(f);
- if (f.size > 4194304) {
- alert("File Size must be smaller than 4 MB");
+ console.log(size1)
+ console.log(size2)
+ if (f.size > size1) {
+ alert("File Size must be smaller than 10 MB");
this.value = null;
}
- if (f.size > 1048576) {
+ if (f.size > size2) {
$('#id_offline').val('True');
$('#id_offline').prop('checked','True');
console.log("Set offline to True");
diff --git a/rowers/templates/flexthumbnails.html b/rowers/templates/flexthumbnails.html
index 0ff56cc2..4fda7461 100644
--- a/rowers/templates/flexthumbnails.html
+++ b/rowers/templates/flexthumbnails.html
@@ -1,17 +1,10 @@
-{% if charts %}
+
+
Flex Charts
Click on the thumbnails to view the full chart.
-{% for chart in charts %}
-
-
{{ forloop.counter }}
-
-
- {% endfor %}
-{% endif %}
+
+
+
+
+
+
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html
index af5e31ed..3b0ef5ac 100644
--- a/rowers/templates/workflow.html
+++ b/rowers/templates/workflow.html
@@ -25,6 +25,43 @@
{% block scripts %}
{% include "monitorjobs.html" %}
+
+
{% endblock %}
diff --git a/rowers/templates/workflow_snippet.html b/rowers/templates/workflow_snippet.html
new file mode 100644
index 00000000..7ccbf33a
--- /dev/null
+++ b/rowers/templates/workflow_snippet.html
@@ -0,0 +1,14 @@
+{% for chart in charts %}
+
+
{{ forloop.counter }}
+
+
+ {% endfor %}
+{% endif %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 7a8a64cb..56e91cf6 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -190,6 +190,7 @@ urlpatterns = [
url(r'^graph/(?P\d+)/deleteconfirm$',views.graph_delete_confirm_view),
url(r'^graph/(?P\d+)/delete$',views.graph_delete_view),
url(r'^workout/(?P\d+)/get-thumbnails$',views.get_thumbnails),
+ url(r'^workout/(?P\d+)/get-testscript$',views.get_testscript),
url(r'^workout/upload/team/$',views.team_workout_upload_view),
url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),
url(r'^workout/(?P\d+)/histo$',views.workout_histo_view),
diff --git a/rowers/views.py b/rowers/views.py
index cb7fdb91..6108d6d8 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -515,6 +515,33 @@ def get_thumbnails(request,id):
return JSONResponse(charts)
+@login_required()
+def get_testscript(request,id):
+ try:
+ row = Workout.objects.get(id=id)
+ except Workout.DoesNotExist:
+ raise Http404("Workout doesn't exist")
+ if (checkworkoutuser(request.user,row)==False):
+ raise Http404("You are not allowed to edit this workout")
+
+ r = getrower(request.user)
+
+ object = {
+ "script":"""
+
+
+
+ """,
+ "div":"""
+
+Hoi
+
+"""
+ }
+
+
+ return JSONResponse([object,object])
+
@login_required()
def session_jobs_view(request):
taskstatus = get_stored_tasks_status(request)
@@ -6648,10 +6675,10 @@ def workout_workflow_view(request,id):
charts = []
- if favorites and 'flexthumbnails.html' in r.workflowmiddlepanel:
- charts = thumbnails_set(r,id,favorites)
- if charts[0]['script'] == '':
- charts = []
+# if favorites and 'flexthumbnails.html' in r.workflowmiddlepanel:
+# charts = thumbnails_set(r,id,favorites)
+# if charts[0]['script'] == '':
+# charts = []
if 'panel_map.html' in r.workflowmiddlepanel and rowhascoordinates(row):
rowdata = rdata(row.csvfilename)