From 60447b8d30683be1de45b2c0761070f0f87f30b7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 29 Oct 2017 20:52:24 +0100 Subject: [PATCH 1/3] default landing page toggle button on workflow config --- rowers/templates/show_graph.html | 11 ++++++++++- rowers/templates/workflowconfig2.html | 16 ++++++++++++++-- rowers/urls.py | 1 + rowers/views.py | 22 +++++++++++++++++++--- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/rowers/templates/show_graph.html b/rowers/templates/show_graph.html index c14bd873..00cdab68 100644 --- a/rowers/templates/show_graph.html +++ b/rowers/templates/show_graph.html @@ -43,7 +43,16 @@

{% endif %} -
+
+ {% if user.is_authenticated and user == rower.user %} +

+ Workflow View +

+ {% else %} +

 

+ {% endif %} +
+
{% if user.is_authenticated and user == rower.user %}

Delete Chart diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html index 86b1e7f5..abdfe052 100644 --- a/rowers/templates/workflowconfig2.html +++ b/rowers/templates/workflowconfig2.html @@ -21,7 +21,7 @@

On this page, you can configure the content of your "Workflow" page for each workout. If you want to remove an element, change it to "None". You can add one new element at a time.

-
+

Left Panel

{{ leftpanel_formset.management_form }} @@ -33,7 +33,7 @@
-
+

Middle Panel

{{ middlepanel_formset.management_form }} @@ -45,6 +45,18 @@
+
+
+ {% if rower.defaultlandingpage == 'workout_edit_view' %} +

Default landing page is Edit View. Set default landing page to

+ Workflow View + {% else %} +

Default landing page is Workflow View. Set default landing page to

+ Edit View + {% endif %} +
+
+
diff --git a/rowers/urls.py b/rowers/urls.py index 5ba765db..9a4653f9 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -320,6 +320,7 @@ urlpatterns = [ url(r'^me/favoritecharts/$',views.rower_favoritecharts_view), url(r'^me/workflowconfig$',views.workout_workflow_config_view), url(r'^me/workflowconfig2$',views.workout_workflow_config2_view), + url(r'^me/workflowdefault$',views.workflow_default_view), url(r'^email/send/$', views.sendmail), url(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'), url(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'), diff --git a/rowers/views.py b/rowers/views.py index ac1a4750..858cbba5 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -6147,7 +6147,23 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance', 'plottype':plottype, 'promember':promember, }) - + +# Change default landing page +@login_required() +def workflow_default_view(request): + r = getrower(request.user) + if r.defaultlandingpage == 'workout_edit_view': + r.defaultlandingpage = 'workout_workflow_view' + else: + r.defaultlandingpage = 'workout_edit_view' + + r.save() + + url = reverse(workout_workflow_config2_view) + + return HttpResponseRedirect(url) + + # Workflow Configuration @login_required() def workout_workflow_config_view(request): @@ -6257,10 +6273,10 @@ def workout_workflow_config2_view(request): tmplt = 'workflowconfig2.html' - + return render(request,tmplt, { - 'rower':r, + 'rower':getrower(request.user), 'leftpanel_formset':leftpanel_formset, 'middlepanel_formset':middlepanel_formset, 'workoutid': workoutid, From 13fc8e1fed262251e01a6e724e4816ec44eafe44 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 29 Oct 2017 21:00:40 +0100 Subject: [PATCH 2/3] import now defaults to default landing page --- rowers/views.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 858cbba5..76a705e1 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7660,7 +7660,9 @@ def workout_getstravaworkout_view(request,stravaid): messages.error(request,message) - url = reverse(workout_edit_view, + r = getrower(request.user) + + url = reverse(r.defaultlandingpage, kwargs = { 'id':int(id), }) @@ -7681,7 +7683,9 @@ def workout_getrunkeeperworkout_view(request,runkeeperid): if message: messages.error(request,message) - url = reverse(workout_edit_view, + r = getrower(request.user) + + url = reverse(r.defaultlandingpage, kwargs = { 'id':int(id), }) @@ -7700,7 +7704,9 @@ def workout_getunderarmourworkout_view(request,underarmourid): if message: messages.error(request,message) - url = reverse(workout_edit_view, + r = getrower(request.user) + + url = reverse(r.defaultlandingpage, kwargs = { 'id':int(id), }) @@ -7725,7 +7731,9 @@ def workout_getsporttracksworkout_view(request,sporttracksid): if message: messages.error(request,message) - url = reverse(workout_edit_view, + r = getrower(request.user) + + url = reverse(r.defaultlandingpage, kwargs = { 'id':int(id), }) @@ -7869,7 +7877,9 @@ def workout_getc2workout_view(request,c2id): if message: messages.error(request,message) - url = reverse(workout_edit_view, + r = getrower(request.user) + + url = reverse(r.defaultlandingpage, kwargs = { 'id':int(id), }) From 40fedbe4c454295976bfb9d166d000408f77044a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 29 Oct 2017 21:04:31 +0100 Subject: [PATCH 3/3] bug fix nr of comments on workflow middle panel --- rowers/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rowers/views.py b/rowers/views.py index 76a705e1..e44ba678 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -6303,6 +6303,10 @@ def workout_workflow_view(request,id): if request.user == row.user.user: mayedit=1 + comments = WorkoutComment.objects.filter(workout=row) + + aantalcomments = len(comments) + workouttype = 'ote' if row.workouttype in ('water','coastal'): workouttype = 'otw' @@ -6364,6 +6368,7 @@ def workout_workflow_view(request,id): 'mapdiv':mapdiv, 'statcharts':statcharts, 'rower':r, + 'aantalcomments':aantalcomments, }) # The famous flex chart