From 3b8c252cd84ecdaf78de837870926db1b9c5bc56 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 11 Oct 2018 16:36:29 +0200 Subject: [PATCH] workflow view --- rowers/interactiveplots.py | 3 +- rowers/templates/flexthumbnails.html | 7 +-- rowers/templates/panel_comments.html | 59 ++++++++++--------- rowers/templates/panel_map.html | 16 +++-- rowers/templates/panel_middlesocial.html | 11 ++-- rowers/templates/panel_shortcomment.html | 6 +- rowers/templates/panel_statcharts.html | 21 ++++--- rowers/templates/panel_stats.html | 8 +-- rowers/templates/workflow.html | 75 ++++++++---------------- rowers/urls.py | 3 +- rowers/views.py | 18 ++++++ 11 files changed, 114 insertions(+), 113 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index f2f5004b..e74bd2b6 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -3509,7 +3509,8 @@ def thumbnail_flex_chart(rowdata,id=0,promember=0, - plot.sizing_mode = 'scale_width' +# plot.sizing_mode = 'scale_width' + plot.sizing_mode = 'fixed' plot.toolbar.logo = None plot.toolbar_location = None #plot.yaxis.visible = False diff --git a/rowers/templates/flexthumbnails.html b/rowers/templates/flexthumbnails.html index 16de6af0..9e6c2179 100644 --- a/rowers/templates/flexthumbnails.html +++ b/rowers/templates/flexthumbnails.html @@ -1,9 +1,8 @@ -

Flex Charts

-
- {{ charts | safe }} -
+ diff --git a/rowers/templates/panel_comments.html b/rowers/templates/panel_comments.html index 99de3bbc..db1bd207 100644 --- a/rowers/templates/panel_comments.html +++ b/rowers/templates/panel_comments.html @@ -1,31 +1,34 @@ {% load rowerfilters %} {% load tz %} -
- - -{% localtime on %} - -{% endlocaltime %} - - - - - - - - - - + + + + +
Date/Time:{{ workout.startdatetime|localtime}}
Distance:{{ workout.distance }}m
Duration:{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
Public link to this workout - https://rowsandall.com/rowers/workout/{{ workout.id }} -
Comments +
Public link to interactive chart + https://rowsandall.com/rowers/workout/{{ workout.id }}/interactiveplot + +
+ + + diff --git a/rowers/templates/panel_map.html b/rowers/templates/panel_map.html index 9fd40d8a..77cfda5a 100644 --- a/rowers/templates/panel_map.html +++ b/rowers/templates/panel_map.html @@ -1,9 +1,13 @@ -
- {{ mapdiv|safe }} - - - {{ mapscript|safe }} -
+ diff --git a/rowers/templates/panel_middlesocial.html b/rowers/templates/panel_middlesocial.html index b1c917d2..bf8e07a2 100644 --- a/rowers/templates/panel_middlesocial.html +++ b/rowers/templates/panel_middlesocial.html @@ -1,14 +1,13 @@ -
-
+

Share -
-
-

-

+

diff --git a/rowers/templates/panel_shortcomment.html b/rowers/templates/panel_shortcomment.html index 6774494b..800d8706 100644 --- a/rowers/templates/panel_shortcomment.html +++ b/rowers/templates/panel_shortcomment.html @@ -1,6 +1,7 @@ {% load rowerfilters %} {% load tz %} -
+
    +
  • @@ -10,4 +11,5 @@
    Comments
    -
+ + diff --git a/rowers/templates/panel_statcharts.html b/rowers/templates/panel_statcharts.html index 39b6de59..ec79eea0 100644 --- a/rowers/templates/panel_statcharts.html +++ b/rowers/templates/panel_statcharts.html @@ -1,11 +1,14 @@ {% if statcharts %}

Static Charts

-{% for graph in statcharts %} -
- - {{ graph.filename }} -
-{% endfor %} -{% endif %} +
    + {% for graph in statcharts %} +
  • + + {{ graph.filename }} + +
    • + {% endfor %} + {% endif %} +
diff --git a/rowers/templates/panel_stats.html b/rowers/templates/panel_stats.html index 248127f8..68543efc 100644 --- a/rowers/templates/panel_stats.html +++ b/rowers/templates/panel_stats.html @@ -1,5 +1,3 @@ -
-

- Workout Stats -

-
+

+ Workout Stats +

diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html index 7beed9d4..1a71dab0 100644 --- a/rowers/templates/workflow.html +++ b/rowers/templates/workflow.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% load tz %} @@ -37,69 +37,44 @@ var counter=0; $("#id_sitready").remove(); $("#id_thumbs").append( - "

Click on the thumbnails to view the full chart.

"); + "

  • Click on the thumbnails to view the full chart.

    • "); $.each(json, function(index, element) { console.log('adding thumbnail'); var counter2 = counter+1; - if (shownotes) { $("#id_thumbs").append( - "
    "+ + "
  • "+ ""+counter2+""+ - "
    "+ ""+element.div+""+ - ""+element.notes+""+ - "
    • "); - } else { - $("#id_thumbs").append( - "
    "+ - ""+counter2+""+ - "
    "+ - ""+element.div+""+ - "
    "); + ""); - } $("#id_thumbscripts").append(element.script); counter += 1; + }); }); - }); + + }); {% endblock %} -{% block content %} -
    -
    -

    {{ workout.name }}

    - {% if workout.user.user != user %} -

    {{ workout.user.user.first_name }} {{ workout.user.user.last_name }} - {% endif %} -

    -
    - {% block left_panel %} -
    -

    - Configure this page -

    -
    - {% for templateName in leftTemplates %} - {% include templateName %} - {% endfor %} - {% endblock %} -
    -
    - {% block middle_panel %} - {% for templateName in middleTemplates %} -
    - {% include templateName %} -
    - {% endfor %} - {% endblock %} -
    -
    - {% block right_panel %} -

     

    - {% endblock %} -
    +{% block main %} +

    {{ workout.name }}

    +{% if workout.user.user != user %} +

    {{ workout.user.user.first_name }} {{ workout.user.user.last_name }}

    +{% endif %} + +{% block middle_panel %} +{% for templateName in middleTemplates %} +{% include templateName %} +{% endfor %} +{% endblock %} +{% block right_panel %} +{% endblock %} + +{% endblock %} + +{% block sidebar %} +{% include 'menu_workout.html' %} {% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index d163c11a..9a99a301 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -525,8 +525,7 @@ urlpatterns = [ url(r'^courses/(?P\d+)$',views.course_view), url(r'^courses/(?P\d+)/map$',views.course_map_view), # URLS to be created -# url(r'^me/preferences$',views.user_preferences_view), -# url(r'^help$',views.user_preferences_view),TemplateView.as_view(template_name='help.html'), name='help'), + url(r'^help$',TemplateView.as_view(template_name='help.html'), name='help'), ] diff --git a/rowers/views.py b/rowers/views.py index 6692cd82..124c5414 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -8543,11 +8543,29 @@ def workout_workflow_view(request,id): pass + breadcrumbs = [ + { + 'url':'/rowers/list-workouts', + 'name':'Workouts' + }, + { + 'url':get_workout_default_page(request,id), + 'name': str(row.id) + }, + { + 'url':reverse(workout_workflow_view,kwargs={'id':id}), + 'name': 'View' + } + + ] + return render(request, 'workflow.html', { 'middleTemplates':middleTemplates, 'leftTemplates':leftTemplates, + 'active':'nav-workouts', + 'breadcrumbs':breadcrumbs, 'charts':charts, 'workout':row, 'mapscript':mapscript,