fixing plannedsessions_view

rowers/dataprep.py

@@ -126,8 +126,7 @@ def rscore_approx(row):
         else:
             dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
             dd = dd/3600
-            print(row['rpe'],dd,rpetotss[row['rpe']])
-            return rpetotss[row['rpe']]*dd
+            return int(rpetotss[row['rpe']]*dd)
     if row['rscore'] < 0:
         w = Workout.objects.get(id=row['id'])
         trimp, hrtss = workout_trimp(w)
@@ -135,12 +134,11 @@ def rscore_approx(row):
         if row['rpe'] and row['rpe'] > 0:
             dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
             dd = dd/3600
-            return rpetotss[row['rpe']]*dd
+            return int(rpetotss[row['rpe']]*dd)
         else:  # pragma: no cover
             minutes = row['duration'].hour*60+row['duration'].minute
             return minutes
 
-    print('boer')
     return 0
 
 

rowers/views/planviews.py

@@ -1518,12 +1518,15 @@ def plannedsessions_view(request,
     for w in ws:
         thetrimp, hrtss = dataprep.workout_trimp(w)
         totals['trimp'] += thetrimp
-        tss = dataprep.workout_rscore(w)[0]
-        if not np.isnan(tss) and tss != 0:
-            totals['rscore'] += tss
-        elif tss == 0:
-            totals['rscore'] += hrtss
-            tss = hrtss
+        row = {
+                'rscore': w.rscore,
+                'hrtss': w.hrtss,
+                'rpe': w.rpe,
+                'duration': w.duration,
+                'id': w.id
+            }
+        tss = dataprep.rscore_approx(row)
+        totals['rscore'] += tss
         totals['distance'] += w.distance
         totals['time'] += timefield_to_seconds_duration(w.duration)
         if w.plannedsession:  # pragma: no cover