From 9b36280d41ba6f28ce31883a71c85a994f6b3720 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 31 Mar 2022 14:10:25 +0200 Subject: [PATCH] adding instantplan to admin --- rowers/admin.py | 5 ++++- rowers/plannedsessions.py | 1 - rowers/views/planviews.py | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rowers/admin.py b/rowers/admin.py index 27453428..f89d9710 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -8,7 +8,7 @@ from .models import ( WorkoutComment, C2WorldClassAgePerformance, PlannedSession, GeoCourse, GeoPolygon, GeoPoint, VirtualRace, VirtualRaceResult, PaidPlan, IndoorVirtualRaceResult, ShareKey, - CourseStandard, StandardCollection, + CourseStandard, StandardCollection, InstantPlan, ) # Register your models here so you can use them in the Admin module @@ -165,6 +165,8 @@ class StandardCollectionAdmin(admin.ModelAdmin): class CourseStandardAdmin(admin.ModelAdmin): list_display = ('name', 'standardcollection') +class InstantPlanAdmin(admin.ModelAdmin): + list_display = ('name','duration','price') admin.site.unregister(User) admin.site.register(User, UserAdmin) @@ -187,3 +189,4 @@ admin.site.register(PaidPlan, PaidPlanAdmin) admin.site.register(ShareKey, ShareKeyAdmin) admin.site.register(CourseStandard, CourseStandardAdmin) admin.site.register(StandardCollection, StandardCollectionAdmin) +admin.site.register(InstantPlan, InstantPlanAdmin) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index a27cf78c..af0b9830 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1050,7 +1050,6 @@ def get_workouts_session(r, ps): return ws - def create_sessions_from_json(plansteps, rower, startdate, manager): trainingdays = plansteps['trainingDays'] planstartdate = startdate diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index b8dc1a75..36295e50 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2530,11 +2530,15 @@ def rower_view_instantplan(request, id='', userid=0): trainingdays = plansteps['trainingDays'] + + trainingdays2 = [] nextday = trainingdays.pop(0) + for i in range(plansteps['duration']): if nextday['order'] == i+1: nextday['week'] = (divmod(i, 7)[0])+1 + trainingdays2.append(nextday) try: nextday = trainingdays.pop(0) @@ -2549,6 +2553,7 @@ def rower_view_instantplan(request, id='', userid=0): } ) + targets = TrainingTarget.objects.filter( rowers=r, date__gte=timezone.now(),