adding workouts not attached to sessions

rowers/plannedsessions.py

@@ -189,13 +189,32 @@ def get_execution_report(rower,startdate,enddate,plan=None):
         plannedscore = 0
         actualscore = 0
         sps = get_sessions(rower,startdate=mm.startdate,enddate=mm.enddate)
-        for ps in sps:
+        unmatchedworkouts = Workout.objects.filter(
-            if ps.sessionmode == 'rscore':
+            user=rower,
-                plannedscore += ps.planrscore
+            plannedsession=None,
-                actualscore += ps.actualrscore
+            date__gte=mm.startdate,date__lte=mm.enddate)
+        for w in unmatchedworkouts:
+            if w.rscore != 0:
+                actualscore += w.rscore
+            elif w.hrtss != 0:
+                actualscore += w.hrtss
+            else:
+                minutes = w.duration.hour*60+w.duration.minute
+                actualscore += minutes
+        for ps in sps:
+            ratio, status, cdate = is_session_complete(rower,ps)
+            if ps.sessionmode == 'rscore':
+                plannedscore += ps.sessionvalue
+                actualscore += ratio*ps.sessionvalue
             else:
-                ratio, status, cdate = is_session_complete(rower,ps)
                 ws = Workout.objects.filter(user=rower,plannedsession=ps)
+                if not ws:
+                    if ps.sessionmode == 'time':
+                        plannedscore += ps.sessionvalue
+                    elif ps.sessionmode == 'distance':
+                        plannedscore += 60.
+                    elif ps.sessionmode == 'TRIMP':
+                        plannedscore += ps.sessionvalue/2.
                         
                 for w in ws:
                     if w.rscore != 0: