execution chart without plan

rowers/views/planviews.py

@@ -2336,46 +2336,77 @@ def rower_trainingplan_execution_view(request,
                                       id=0,
                                       userid=0):
 
-    startdate,enddate = get_dates_timeperiod(request)
-
-    try:
-        plan = TrainingPlan.objects.get(id=id)
-    except TrainingPlan.DoesNotExist:
-        raise Http4040("Training Plan Does Not Exist")
-
+    startdate = request.GET.get('startdate')
+    enddate = request.GET.get('enddate')
+    
     r = getrequestrower(request,userid=userid)
 
-    if not checkaccessuser(request.user,plan.manager):
-        if request.user.rower not in plan.rowers.all():
-            raise PermissionDenied("Access denied")
+    
+    if int(id):
+        try:
+            plan = TrainingPlan.objects.get(id=id)
+        except TrainingPlan.DoesNotExist:
+            raise Http404("Training Plan Does Not Exist")
+        if not checkaccessuser(request.user,plan.manager):
+            if request.user.rower not in plan.rowers.all():
+                raise PermissionDenied("Access denied")
 
-    data,message = get_execution_report(r,plan.startdate,plan.enddate,plan=plan)
+    if not startdate or not enddate:
+        startdate = plan.startdate
+        enddate = plan.enddate
+    else:
+        startdate,enddate = get_dates_timeperiod(request)
 
-    script, div = interactive_planchart(data,plan.startdate,plan.enddate)
 
-    breadcrumbs = [
-        {
-            'url':reverse(plannedsessions_view,
-                          kwargs={'userid':userid}),
-            'name': 'Plan'
-        },
-        {
-            'url':reverse(rower_trainingplan_view,
-                          kwargs={'userid':userid,
-                                  'id':id}),
-            'name': plan.name
+    if int(id):
+        data,message = get_execution_report(r,startdate,enddate,plan=plan)
+    else:
+        data,message = get_execution_report(r,startdate,enddate)
+
+    if not data.empty:
+        script, div = interactive_planchart(data,startdate,enddate)
+    else:
+        script = ''
+        div = ''
+        messages.error(request,'The plan does not cover this time range')
+
+    if int(id):
+        breadcrumbs = [
+            {
+                'url':reverse(plannedsessions_view,
+                              kwargs={'userid':userid}),
+                'name': 'Plan'
             },
-        {
-            'url':reverse(rower_trainingplan_execution_view,
-                          kwargs={'userid':userid,
-                                  'id':id}),
-            'name': 'Execution'
+            {
+                'url':reverse(rower_trainingplan_view,
+                              kwargs={'userid':userid,
+                                      'id':id}),
+                'name': plan.name
+            },
+            {
+                'url':reverse(rower_trainingplan_execution_view,
+                              kwargs={'userid':userid,
+                                      'id':id}),
+                'name': 'Execution'
+            }
+        ]
+    else:
+        breadcrumbs = [
+            {
+                'url':reverse(plannedsessions_view,
+                              kwargs={'userid':userid}),
+                'name': 'Plan'
+            },
+            {
+                'url':reverse(rower_trainingplan_execution_view,
+                              kwargs={'userid':userid,
+                                      'id':id}),
+                'name': 'Execution'
             }
         ]
 
     return render(request,'trainingplan_chart.html',
                   {
-                      'plan':plan,
                       'todays_date': timezone.now().date(),
                       'active': 'nav-plan',
                       'breadcrumbs':breadcrumbs,