minor improvements plannedsession views

rowers/plannedsessions.py

@@ -79,13 +79,16 @@ def get_session_metrics(ps):
     distance = []
     firstname = []
     lastname = []
+    completedate = []
+    status = []
 
     for r in rowers:
         rscorev = 0 
         trimpv = 0
         durationv = 0
         distancev = 0
-        
+        completedatev = ''
+        statusv = 0
 
         ws = Workout.objects.filter(user=r,plannedsession=ps)
         if len(ws) != 0:
@@ -94,8 +97,9 @@ def get_session_metrics(ps):
                 durationv += timefield_to_seconds_duration(w.duration)
                 trimpv += dataprep.workout_trimp(w)
                 rscorev += dataprep.workout_rscore(w)
-
-
+                
+            ratio,statusv = is_session_complete_ws(ws,ps)
+            completedatev = ws[0].date.strftime('%Y-%b-%d')
             durationv /= 60.
 
         trimp.append(int(trimpv))
@@ -104,6 +108,8 @@ def get_session_metrics(ps):
         rscore.append(int(rscorev))
         firstname.append(r.user.first_name)
         lastname.append(r.user.last_name)
+        status.append(statusv)
+        completedate.append(completedatev)
 
     thedict = {
         'first_name':firstname,
@@ -111,19 +117,14 @@ def get_session_metrics(ps):
         'duration':duration,
         'distance':distance,
         'rscore':rscore,
-        'trimp':trimp
+        'trimp':trimp,
+        'completedate':completedate,
+        'status':status,    
     }
 
     return thedict
 
-def is_session_complete(r,ps):
-    status = 'not done'
-
-    if r not in ps.rower.all():
-        return 0,'not assigned'
-    
-    ws = Workout.objects.filter(user=r,plannedsession=ps)
-
+def is_session_complete_ws(ws,ps):
     if len(ws)==0:
         today = date.today()
         if today > ps.enddate:
@@ -195,6 +196,18 @@ def is_session_complete(r,ps):
     else:
         return ratio,status
     
+
+def is_session_complete(r,ps):
+    status = 'not done'
+
+    if r not in ps.rower.all():
+        return 0,'not assigned'
+    
+    ws = Workout.objects.filter(user=r,plannedsession=ps)
+
+    return is_session_complete_ws(ws,ps)
+    
+    
 def rank_results(ps):
     return 1