removing races from plan overview

rowers/underarmourstuff.py

@@ -1,5 +1,8 @@
 from rowers.imports import *
 
+import mytypes
+from rowers.mytypes import otwtypes
+
 from rowsandall_app.settings import (
     UNDERARMOUR_CLIENT_KEY,
     UNDERARMOUR_CLIENT_SECRET,
@@ -417,7 +420,7 @@ def add_workout_from_data(user,importid,data,strokedata,
 	times_location = times_distance
 	latcoord = np.zeros(len(times_distance))
 	loncoord = np.zeros(len(times_distance))
-        if workouttype in types.otwtypes:
+        if workouttype in otwtypes:
             workouttype = 'rower'
 	
     try:

rowers/views.py

@@ -18839,10 +18839,12 @@ def rower_trainingplan_view(request,
                 type='userdefined').order_by("startdate")
 
             for mm in microcycles:
-                sps = PlannedSession.objects.filter(
+                sps = get_sessions(r,startdate=mm.startdate,enddate=mm.enddate)
-                    rower = r,
+                
-                    startdate__lte=mm.enddate,
+                #                sps = PlannedSession.objects.filter(
-                    enddate__gte=mm.startdate)
+                #                    rower = r,
+                #                    startdate__lte=mm.enddate,
+                #                    enddate__gte=mm.startdate)
                     
 
                 mm.plantime = 0