From 80f4ca585be867cfc7312fd6f018c67480cb08e0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Nov 2017 17:12:40 +0100 Subject: [PATCH] able to load scripts but cannot get them to go to the right place Work in progress --- rowers/templates/flexthumbnails.html | 23 ++++++++-------------- rowers/templates/workflow.html | 14 +++++++++++++ rowers/templates/workflow_snippet.html | 14 +++++++++++++ rowers/urls.py | 1 + rowers/views.py | 27 ++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 rowers/templates/workflow_snippet.html 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 }} -
- - {{ chart.div | safe }} - - {% if rower.showfavoritechartnotes %} - {{ chart.notes }} - {% endif %} -
-
- {% endfor %} -{% endif %} +
+ +
+
+ +
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html index af5e31ed..76c2bbb6 100644 --- a/rowers/templates/workflow.html +++ b/rowers/templates/workflow.html @@ -25,6 +25,20 @@ {% 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 }} +
+ + {{ chart.div | safe }} + + {% if rower.showfavoritechartnotes %} + {{ chart.notes }} + {% endif %} +
+
+ {% 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..eb0effb6 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)