sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

sort of working, good enough for now

Browse Source
This commit is contained in:
Sander Roosendaal
2025-05-29 13:42:04 +02:00
parent 40462df567
commit 08d892154e
4 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/views/planviews.py
View File

@@ -4217,13 +4217,13 @@ def planmacrocyclebymonth(request, id=0, userid=0): # pragma: no cover
def currentweekplan_view(request):
r = getrower(request.user)
form = CurrentWeekJsonForm()
form = NextWeekPlanForm(instance=r)
if request.method == "POST":
form = CurrentWeekJsonForm(request.POST)
form = NextWeekPlanForm(request.POST, instance=r)
if form.is_valid():
secret = form.cleaned_data['secret']
plan = form.cleaned_data['plan']
secret = form.cleaned_data['training_plan_secret']
plan = form.cleaned_data['training_plan_code']
delete_existing = form.cleaned_data['delete_existing']
post_data = {
@@ -4277,21 +4277,15 @@ def nextweekplan_view(request):
fitness, fatigue = calculate_fitness(r)
form = NextWeekJsonForm(
initial={
'fitness': round(fitness),
'fatigue': round(fatigue),
}
)
form = NextWeekPlanForm(instance=r)
if request.method == "POST":
form = NextWeekJsonForm(request.POST)
form = NextWeekPlanForm(request.POST, instance=r)
if form.is_valid():
fitness = form.cleaned_data['fitness']
fatigue = form.cleaned_data['fatigue']
secret = form.cleaned_data['secret']
plan = form.cleaned_data['plan']
fitness = form.cleaned_data['actualfit']
fatigue = form.cleaned_data['actualfatigue']
secret = form.cleaned_data['training_plan_secret']
plan = form.cleaned_data['training_plan_code']
delete_existing = form.cleaned_data['delete_existing']
post_data = {

3
rowers/views/statements.py
View File

@@ -121,7 +121,7 @@ from rowers.forms import (
TrainingPlanBillingForm, InstantPlanSelectForm,
TrainingZonesForm, InstrokeForm, InStrokeMultipleCompareForm,
ForceCurveMultipleCompareForm, PlanByRscoreForm,
AssignChoices, NextWeekJsonForm, CurrentWeekJsonForm,
AssignChoices,
)
from django.urls import reverse, reverse_lazy
@@ -188,6 +188,7 @@ from rowers.models import ( RowerPowerForm, RowerHRZonesForm, SimpleRowerPowerFo
RowerExportFormConcept2, RowerExportFormGarmin,
RowerExportFormIntervals, RowerExportFormRP3,
RowerExportFormNK, RowerPrivateImportForm,
NextWeekPlanForm,
)
from rowers.models import (
FavoriteForm, BaseFavoriteFormSet, SiteAnnouncement, BasePlannedSessionFormSet,