some more logic around fillers and start dates

rowers/models.py

@@ -1095,7 +1095,20 @@ def createmacrofillers(plan):
         thedate = cycles[0].startdate-datetime.timedelta(days=1)
         cycles = cycles[1:]
                 
+    cycles = TrainingMacroCycle.objects.filter(
+        plan = plan
+        ).order_by("startdate")
 
+    if cycles[0].startdate > plan.startdate:
+        macr = TrainingMacroCycle(
+            plan=plan,
+            startdate = plan.startdate,
+            enddate = cycles[0].startdate-datetime.timedelta(days=1),
+            type='filler',
+            name='Filler'
+        )
+        macr.save()
+    
 def createmesofillers(plan):
     fillers = TrainingMesoCycle.objects.filter(
         plan = plan, type = 'filler'
@@ -1131,6 +1144,20 @@ def createmesofillers(plan):
             macr.save()
         thedate = cycles[0].startdate-datetime.timedelta(days=1)
         cycles = cycles[1:]
+
+    cycles = TrainingMesoCycle.objects.filter(
+        plan = plan
+        ).order_by("startdate")
+
+    if cycles[0].startdate > plan.startdate:
+        macr = TrainingMesoCycle(
+            plan=plan,
+            startdate = plan.startdate,
+            enddate = cycles[0].startdate-datetime.timedelta(days=1),
+            type='filler',
+            name='Filler'
+        )
+        macr.save()
                 
 
 def createmicrofillers(plan):
@@ -1169,6 +1196,20 @@ def createmicrofillers(plan):
         thedate = cycles[0].startdate-datetime.timedelta(days=1)
         cycles = cycles[1:]
 
+    cycles = TrainingMicroCycle.objects.filter(
+        plan = plan
+        ).order_by("startdate")
+
+    if cycles[0].startdate > plan.startdate:
+        macr = TrainingMicroCycle(
+            plan=plan,
+            startdate = plan.startdate,
+            enddate = cycles[0].startdate-datetime.timedelta(days=1),
+            type='filler',
+            name='Filler'
+        )
+        macr.save()
+
 def microcyclecheckdates(plan):
     cycles = TrainingMicroCycle.objects.filter(
         plan=plan
@@ -1203,6 +1244,21 @@ def mesocyclecheckdates(plan):
         thedate = cycles[0].startdate-datetime.timedelta(days=1)
         cycles = cycles[1:]
 
+    cycles = TrainingMesoCycle.objects.filter(
+        plan=plan
+        ).order_by("startdate")
+
+    thedate = plan.startdate
+    while cycles:
+        if cycles[0].startdate < thedate:
+            cycles[0].startdate = thedate
+            cycles[0].save()
+        try:
+            thedate = cycles[1].startdate-datetime.timedelta(days=1)
+        except IndexError:
+            pass
+        cycles = cycles[1:]
+
 def macrocyclecheckdates(plan):
     cycles = TrainingMacroCycle.objects.filter(
         plan=plan