mostly working - a few bugs remaining

rowers/views.py

@@ -71,7 +71,10 @@ from rowers.models import (
     TrainingPlan,TrainingPlanForm,TrainingTarget,TrainingTargetForm,
     TrainingMacroCycle,TrainingMesoCycle,TrainingMicroCycle,
     TrainingTarget,TrainingTargetForm,
-    TrainingMacroCycleForm,createmacrofillers
+    TrainingMacroCycleForm,createmacrofillers,
+    createmicrofillers, createmesofillers,
+    microcyclecheckdates,mesocyclecheckdates,macrocyclecheckdates,
+    TrainingMesoCycleForm, TrainingMicroCycleForm,
     )
 from rowers.models import (
     RowerPowerForm,RowerForm,GraphImage,AdvancedWorkoutForm,
@@ -14279,6 +14282,7 @@ def rower_trainingplan_view(request,id=0):
     if not checkaccessuser(request.user,plan.rower):
         raise PermissionDenied("Access denied")
 
+    createmacrofillers(plan)
     macrocycles = TrainingMacroCycle.objects.filter(plan=plan).order_by("startdate")
 
     count = 0
@@ -14286,10 +14290,12 @@ def rower_trainingplan_view(request,id=0):
 
     
     for m in macrocycles:
+        createmesofillers(m)
         mesocycles = TrainingMesoCycle.objects.filter(plan=m).order_by("startdate")
         mesos = {}
         count2 = 0
         for me in mesocycles:
+            createmicrofillers(me)
             microcycles = TrainingMicroCycle.objects.filter(plan=me).order_by("startdate")
             mesos[count2] = (me, microcycles)
             count2 += 1
@@ -14318,8 +14324,12 @@ class TrainingMacroCycleUpdate(UpdateView):
                            'id':plan.id
                        }
                        )
+
     def form_valid(self, form):
+        form.instance.user = self.request.user
+        form.instance.post_date = datetime.datetime.now()
         macrocycle = form.save()
+        mesocyclecheckdates(macrocycle)
         return super(TrainingMacroCycleUpdate, self).form_valid(form)
 
     def get_object(self, *args, **kwargs):
@@ -14331,6 +14341,68 @@ class TrainingMacroCycleUpdate(UpdateView):
             obj.save()
         return obj
         
+class TrainingMesoCycleUpdate(UpdateView):
+    model = TrainingMesoCycle
+    template_name = 'trainingplan_edit.html'
+    form_class = TrainingMesoCycleForm
+
+    
+    def get_success_url(self):
+        plan = self.object.plan
+        createmesofillers(plan)
+        return reverse(rower_trainingplan_view,
+                       kwargs = {
+                           'id':plan.plan.id
+                       }
+                       )
+    
+    def form_valid(self, form):
+        form.instance.user = self.request.user
+        form.instance.post_date = datetime.datetime.now()
+        mesocycle = form.save()
+        microcyclecheckdates(mesocycle)
+        return super(TrainingMesoCycleUpdate, self).form_valid(form)
+
+    def get_object(self, *args, **kwargs):
+        obj = super(TrainingMesoCycleUpdate, self).get_object(*args, **kwargs)
+        r = obj.plan.plan.rower
+        if not checkaccessuser(self.request.user,r):
+            raise Http404
+        else:
+            obj.type = 'userdefined'
+            obj.save()
+        return obj
+        
+class TrainingMicroCycleUpdate(UpdateView):
+    model = TrainingMicroCycle
+    template_name = 'trainingplan_edit.html'
+    form_class = TrainingMicroCycleForm
+
+    
+    def get_success_url(self):
+        plan = self.object.plan
+        createmicrofillers(plan)
+        return reverse(rower_trainingplan_view,
+                       kwargs = {
+                           'id':plan.plan.plan.id
+                       }
+                       )
+    def form_valid(self, form):
+        form.instance.user = self.request.user
+        form.instance.post_date = datetime.datetime.now()
+        microcycle = form.save()
+        return super(TrainingMicroCycleUpdate, self).form_valid(form)
+
+    def get_object(self, *args, **kwargs):
+        obj = super(TrainingMicroCycleUpdate, self).get_object(*args, **kwargs)
+        r = obj.plan.plan.plan.rower
+        if not checkaccessuser(self.request.user,r):
+            raise Http404
+        else:
+            obj.type = 'userdefined'
+            obj.save()
+        return obj
+        
 class TrainingPlanUpdate(UpdateView):
     model = TrainingPlan
     template_name = 'trainingplan_edit.html'
@@ -14343,6 +14415,7 @@ class TrainingPlanUpdate(UpdateView):
         form.instance.user = self.request.user
         form.instance.post_date = datetime.datetime.now()
         plan = form.save()
+        macrocyclecheckdates(plan)
         return super(TrainingPlanUpdate, self).form_valid(form)
 
     def get_object(self, *args, **kwargs):