Merge branch 'develop' into feature/django2

rowers/views/analysisviews.py

@@ -611,11 +611,24 @@ def fitnessmetric_view(request,id=0,mode='rower',
         enddate=enddate,
     )
 
+    breadcrumbs = [
+        {
+            'url':'/rowers/analysis',
+            'name':'Analysis'
+        },
+        {
+            'url':reverse('fitnessmetric_view'),
+            'name': 'Power Progress'
+        }
+    ]
+    
+
     return render(request,'fitnessmetric.html',
                   {
                       'rower':therower,
                       'active':'nav-analysis',
                       'chartscript':script,
+                      'breadcrumbs':breadcrumbs,
                       'the_div':thediv,
                       'mode':mode,
                       'form':form,

rowers/views/paymentviews.py

@@ -522,9 +522,11 @@ def rower_register_view(request):
                                                       title='New User Sample Data',
                                                       notes='This is an example workout to get you started')
             newworkoutid = response[0]
-            w = Workout.objects.get(id=newworkoutid)
-            w.startdatetime = timezone.now()
-            w.save()
+            if newworkoutid:
+                w = Workout.objects.get(id=newworkoutid)
+                w.startdatetime = timezone.now()
+                w.date = timezone.now().date()
+                w.save()
             
             # Create and send email
             fullemail = first_name + " " + last_name + " " + "<" + email + ">"

rowers/views/workoutviews.py

@@ -1178,12 +1178,15 @@ def workouts_view(request,message='',successmessage='',
     startdate = datetime.datetime.combine(startdate,datetime.time())
     enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
 
-    
+    query = None
     if request.method == 'POST':
         dateform = DateRangeForm(request.POST)
+        searchform = SearchForm(request.POST)
         if dateform.is_valid():
             startdate = dateform.cleaned_data['startdate']
             enddate = dateform.cleaned_data['enddate']
+        if searchform.is_valid():
+            query = searchform.cleaned_data['q']
     else:
         dateform = DateRangeForm(initial={
             'startdate':startdate,
@@ -1293,7 +1296,6 @@ def workouts_view(request,message='',successmessage='',
     for w in workoutsnohr:
         res = dataprep.workout_trimp(w)
         
-    query = request.GET.get('q')
     if query:
         query_list = query.split()
         workouts = workouts.filter(