-
-
- {% if favoritenr > 0 %}
-
<
- {% else %}
-
<
- {% endif %}
-
-
-
-
-
- {% if favoritenr < maxfav %}
-
>
- {% else %}
-
>
- {% endif %}
-
-
+
+
{{ workout.name }}
+
+
+ {% block left_panel %}
+ {% for templateName in leftTemplates %}
+ {% include templateName %}
+ {% endfor %}
+ {% endblock %}
+
+
Click on the thumbnails to view the full chart
+
+
+
+ {% block middle_panel %}
+ {% for templateName in middleTemplates %}
+
+ {% include templateName %}
+
+ {% endfor %}
+ {% endblock %}
+
+
+ {% block right_panel %}
+
+ {% endblock %}
+
+{% endblock %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 96199525..7e6b9fee 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -327,6 +327,7 @@ urlpatterns = [
url(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'),
url(r'^register$',views.rower_register_view),
url(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'),
+ url(r'^workout/(?P
\d+)/workflow$',views.workout_workflow_view),
url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+)/$',views.workout_flexchart3_view),
url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart3_view),
url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart3_view),
diff --git a/rowers/views.py b/rowers/views.py
index 074b5b65..efc20124 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -49,7 +49,7 @@ from rowers.models import (
WorkoutComment,WorkoutCommentForm,RowerExportForm,
)
from rowers.models import FavoriteForm,BaseFavoriteFormSet,SiteAnnouncement
-from rowers.metrics import rowingmetrics
+from rowers.metrics import rowingmetrics,defaultfavoritecharts
import rowers.uploads as uploads
from django.forms.formsets import formset_factory
import StringIO
@@ -324,6 +324,22 @@ def ispromember(user):
result = False
return result
+# More User/Rower utils
+def add_defaultfavorites(r):
+ for c in defaultfavoritecharts:
+ f = FavoriteChart(user=r,
+ yparam1=c['yparam1'],
+ yparam2=c['yparam2'],
+ xparam=c['xparam'],
+ plottype=c['plottype'],
+ workouttype=c['workouttype'],
+ reststrokes=c['reststrokes'],
+ notes=c['notes'])
+
+ f.save()
+ return 1
+
+
# User registration
def rower_register_view(request):
if request.method == 'POST':
@@ -344,6 +360,9 @@ def rower_register_view(request):
therower.save()
+ # create default favorite charts
+ add_defaultfavorites(therower)
+
# Create Sample workout
f = 'media/testdata.csv.gz'
timestr = strftime("%Y%m%d-%H%M%S")
@@ -5827,7 +5846,62 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance',
'promember':promember,
})
-
+
+# Flex thumbnails
+@login_required()
+def workout_workflow_view(request,id):
+ request.session['referer'] = absolute(request)['PATH']
+ request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
+ try:
+ row = Workout.objects.get(id=id)
+ except Workout.DoesNotExist:
+ raise Http404("Workout doesn't exist")
+
+ r = getrower(request.user)
+ result = request.user.is_authenticated() and ispromember(request.user)
+ if result:
+ promember=1
+ if request.user == row.user.user:
+ mayedit=1
+
+ workouttype = 'ote'
+ if row.workouttype in ('water','coastal'):
+ workouttype = 'otw'
+
+ try:
+ favorites = FavoriteChart.objects.filter(user=r,
+ workouttype__in=[workouttype,'both']).order_by("id")
+ maxfav = len(favorites)-1
+ except:
+ favorites = None
+ maxfav = 0
+
+ charts = []
+
+ if favorites:
+ charts = thumbnails_set(r,id,favorites)
+
+ statcharts = GraphImage.objects.filter(workout=row)
+
+ # This will be user configurable in the future
+ middleTemplates = ['panel_statcharts.html','flexthumbnails.html',
+ 'panel_summary.html']
+ leftTemplates = [
+ 'panel_editbuttons.html',
+ 'panel_stats.html',
+ 'panel_staticchart.html',
+ ]
+
+ return render(request,
+ 'workflow.html',
+ {
+ 'middleTemplates':middleTemplates,
+ 'leftTemplates':leftTemplates,
+ 'charts':charts,
+ 'workout':row,
+ 'statcharts':statcharts,
+ })
+
# The famous flex chart
def workout_flexchart3_view(request,*args,**kwargs):
@@ -5959,12 +6033,6 @@ def workout_flexchart3_view(request,*args,**kwargs):
css_resources = ""
- # script = res[0]
- # div = res[1]
- # js_resources = res[2]
- # css_resources = res[3]
-
-
axchoicesbasic = {ax[0]:ax[1] for ax in axes if ax[4]=='basic'}
axchoicespro = {ax[0]:ax[1] for ax in axes if ax[4]=='pro'}
noylist = ["time","distance"]
@@ -6745,7 +6813,10 @@ def workout_add_chart_view(request,id,plotnr=1):
imagename=imagename)
- url = "/rowers/workout/"+str(w.id)+"/edit"
+ try:
+ url = request.session['referer']
+ except KeyError:
+ url = "/rowers/workout/"+str(w.id)+"/edit"
return HttpResponseRedirect(url)
@@ -8258,7 +8329,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
})
# Page where user can manage his favorite charts
-@user_passes_test(ispromember,login_url="/rowers/me/edit",redirect_field_name=None)
+@login_required()
def rower_favoritecharts_view(request):
message = ''
successmessage = ''
diff --git a/static/css/rowsandall.css b/static/css/rowsandall.css
index 7dfd9851..7be4294f 100644
--- a/static/css/rowsandall.css
+++ b/static/css/rowsandall.css
@@ -62,11 +62,28 @@ h1 {
font-weight: normal;
/* padding-top: 20px; */
text-align: left;
+ font-size: 2em;
}
h2 {
-/* padding-top: 20px; */
+ /* padding-top: 20px; */
+ font-weight: normal;
text-align: left;
+ font-size: 1.5em;
+}
+
+h3 {
+ /* padding-top: 20px; */
+ font-weight: normal;
+ text-align: left;
+ font-size: 1em;
+}
+
+h3 {
+ /* padding-top: 20px; */
+ font-weight: normal;
+ text-align: left;
+ font-size: 1em;
}
p {