From 9ccb8dc9f432baaaa08406df5d68e26b9617d7be Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 22 May 2024 09:48:52 +0200 Subject: [PATCH 1/2] initial --- rowers/forms.py | 12 ++++++++++- rowers/models.py | 30 ++++++++++++++++++++++++++++ rowers/templates/favoritecharts.html | 16 +++++++++++++++ rowers/utils.py | 12 +++++++++++ rowers/views/statements.py | 1 + rowers/views/userviews.py | 23 +++++++++++++++++++++ 6 files changed, 93 insertions(+), 1 deletion(-) diff --git a/rowers/forms.py b/rowers/forms.py index 8985cf2b..3d9e3e86 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1,7 +1,8 @@ from rowers.utils import rankingdistances, rankingdurations from rowers.utils import ( workflowleftpanel, workflowmiddlepanel, - defaultleft, defaultmiddle + defaultleft, defaultmiddle, + workout_name_element, ) from rowers.utils import palettes from time import strftime @@ -497,6 +498,15 @@ class WorkFlowMiddlePanelElement(forms.Form): initial='None', ) +class WorkoutNameTemplateElement(forms.Form): + templatechoices = tuple(list(workout_name_element)+[('None', 'None')]) + + element = forms.ChoiceField( + label='', + choices=templatechoices, + initial='None' + ) + # The form to indicate additional actions to be performed immediately # after a successful upload diff --git a/rowers/models.py b/rowers/models.py index bfa22a1c..00095741 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -231,6 +231,34 @@ class AlternativeEmails(models.TextField): value = self._get_val_from_obj(obj) return self.get_deb_prep_value(value) + +# model for Workout Name template list + +class WorkoutNameTemplateField(models.TextField): + def __init__(self, *args, **kwargs): + super(WorkoutNameTemplateField, self).__init__(*args, **kwargs) + + def to_python(self, value): # pragma: no cover + if not value: + return + return json.loads(value) + + def from_db_value(self, value, expression, connection): + if not value: + return + return json.loads(value) + + def get_db_prep_value(self, value, connection, prepared=False): + if not value: + return + return json.dumps(value) + + def value_to_string(self, obj): # pragma: no cover + value = self._get_val_from_obj(obj) + return self.get_deb_prep_value(value) + + + # model for Planned Session Steps @@ -1094,6 +1122,8 @@ class Rower(models.Model): choices=landingpages2, verbose_name="Title link on workout list") + workoutnametemplate = WorkoutNameTemplateField(default=['date','name','distance','ownerfirst','ownerlast','duration','boattype','workouttype']) + # Access tokens c2token = models.CharField( default='', max_length=200, blank=True, null=True) diff --git a/rowers/templates/favoritecharts.html b/rowers/templates/favoritecharts.html index c34c1973..5841dd0c 100644 --- a/rowers/templates/favoritecharts.html +++ b/rowers/templates/favoritecharts.html @@ -41,6 +41,22 @@

+

Workout Name Settings of {{ rower.user.first_name }} {{ rower.user.last_name }}

+ +

+ Use this form to change how the workout is named in charts. Our recommendation is name, date, rower first name, rower last name, workout type + as a minimum. +

+ +
+ {{ workoutnametemplate_formset.management_form }} + + {{ workoutnametemplate_formset.as_table }} +
+ {% csrf_token %} + +
+

Change Favorite Charts of {{ rower.user.first_name }} {{ rower.user.last_name }}

diff --git a/rowers/utils.py b/rowers/utils.py index 49443593..e4de1539 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -57,6 +57,18 @@ landingpages2 = ( ('workout_delete', 'Remove Workout') ) +workout_name_element = ( + ('date', 'Date'), + ('name', 'Name'), + ('distance', 'Distance'), + ('ownerfirst', 'Rower first name'), + ('ownerlast', 'Rower last name'), + ('duration', 'Duration'), + ('boattype','Boat Type'), + ('workouttype', 'Workout Type'), + ('seatnumber','Seat Number') +) + workflowmiddlepanel = ( ('panel_statcharts.html', 'Static Charts'), diff --git a/rowers/views/statements.py b/rowers/views/statements.py index ac88517b..351ca027 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -103,6 +103,7 @@ from rowers.forms import ( CourseConfirmForm, ResampleForm, TeamUploadOptionsForm, WorkFlowLeftPanelForm, WorkFlowMiddlePanelForm, WorkFlowLeftPanelElement, WorkFlowMiddlePanelElement, + WorkoutNameTemplateElement, LandingPageForm, PlannedSessionSelectForm, WorkoutSessionSelectForm, PlannedSessionTeamForm, PlannedSessionTeamMemberForm, VirtualRaceSelectForm, WorkoutRaceSelectForm, CourseSelectForm, diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index b03e5eb7..ef42edf0 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -322,6 +322,28 @@ def rower_favoritecharts_view(request, userid=0): FavoriteChartFormSet = formset_factory( FavoriteForm, formset=BaseFavoriteFormSet, extra=1) + workoutnametemplate = r.workoutnametemplate + WorkoutNameTemplateFormSet = formset_factory(WorkoutNameTemplateElement, extra=1) + + workoutnametemplate_data = [{'element': element} for element in r.workoutnametemplate] + workoutnametemplate_formset = WorkoutNameTemplateFormSet(initial=workoutnametemplate_data, prefix='workoutname') + + if request.method == 'POST' and 'workoutname-TOTAL_FORMS' in request.POST: + workoutnametemplate_formset = WorkoutNameTemplateFormSet(request.POST, prefix='workoutname') + newworkoutnametemplate = [] + if workoutnametemplate_formset.is_valid(): + for form in workoutnametemplate_formset: + element = form.cleaned_data.get('element') + if element != 'None': + newworkoutnametemplate.append(element) + + newworkoutnametemplate = [i for i in newworkoutnametemplate if i is not None] + r.workoutnametemplate = newworkoutnametemplate + try: + r.save() + except IntegrityError: + messages.error("Something went wrong") + if request.method == 'POST' and 'staticgrids' in request.POST: # pragma: no cover staticchartform = StaticChartRowerForm(request.POST, instance=r) if staticchartform.is_valid(): @@ -400,6 +422,7 @@ def rower_favoritecharts_view(request, userid=0): 'rower': r, 'staticchartform': staticchartform, 'datasettingsform': datasettingsform, + 'workoutnametemplate_formset': workoutnametemplate_formset, } return render(request, 'favoritecharts.html', context) From c1a027db6b30f1eba41bcf7746b5e8d83cd7b7b5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 22 May 2024 11:02:24 +0200 Subject: [PATCH 2/2] tested --- rowers/models.py | 58 ++++++++++++++------------ rowers/templates/favoritecharts.html | 7 +++- rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4000 bytes rowers/utils.py | 10 +++-- rowers/views/userviews.py | 33 +++++++++------ 5 files changed, 65 insertions(+), 43 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 00095741..6edc4c92 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3697,25 +3697,38 @@ class Workout(models.Model): def __str__(self): - date = self.date - name = self.name - distance = str(self.distance) - ownerfirst = self.user.user.first_name - ownerlast = self.user.user.last_name - duration = self.duration - boattype = self.boattype - workouttype = self.workouttype + elements = dict( + date = self.date.strftime('%Y-%m-%d'), + name = self.name, + distance = str(self.distance), + ownerfirst = self.user.user.first_name, + ownerlast = self.user.user.last_name, + duration = self.duration.strftime("%H:%M:%S"), + boattype = self.boattype, + workouttype = self.workouttype, + seatnumber = 'seat '+str(self.seatnumber), + boatname = 'boat '+str(self.boatname), + empowerside = self.empowerside, + inboard = self.inboard, + oarlength = self.oarlength + ) - if workouttype not in ['water','rower']: + if len(self.user.workoutnametemplate): try: - stri = u'{d} {n} {dist}m {duration} {workouttype} {ownerfirst} {ownerlast}'.format( - d=date.strftime('%Y-%m-%d'), - n=name, - dist=distance, - duration=duration.strftime("%H:%M:%S"), - workouttype=workouttype, - ownerfirst=ownerfirst, - ownerlast=ownerlast, + stri = u'' + for element in self.user.workoutnametemplate: + stri += u'{'+u'{element}'.format(element=element)+u'} ' + stri = stri[:-1] + return stri.format(**elements) + except ValueError: + return self.name + except AttributeError: + return "No workout" + + if self.workouttype not in ['water','rower']: + try: + stri = u'{date} {name} {distance}m {duration} {workouttype} {ownerfirst} {ownerlast}'.format( + **elements ) except ValueError: stri = self.name @@ -3723,15 +3736,8 @@ class Workout(models.Model): return "No workout" else: try: - stri = u'{d} {n} {dist}m {duration} {workouttype} {boattype} {ownerfirst} {ownerlast}'.format( - d=date.strftime('%Y-%m-%d'), - n=name, - dist=distance, - duration=duration.strftime("%H:%M:%S"), - workouttype=workouttype, - boattype=boattype, - ownerfirst=ownerfirst, - ownerlast=ownerlast, + stri = u'{date} {name} {distance}m {duration} {workouttype} {boattype} {ownerfirst} {ownerlast}'.format( + **elements ) except (ValueError, AttributeError): stri = self.name diff --git a/rowers/templates/favoritecharts.html b/rowers/templates/favoritecharts.html index 5841dd0c..77f2d3f7 100644 --- a/rowers/templates/favoritecharts.html +++ b/rowers/templates/favoritecharts.html @@ -54,7 +54,12 @@ {{ workoutnametemplate_formset.as_table }} {% csrf_token %} - +

+ +

+

+ +

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index cbfec837849c83e882e9fb3ac7f287973c85e473..0fc0e3fd65af81ccb5f49edad498fbf83b44cb3a 100644 GIT binary patch literal 4000 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 F0RZL08Vdjb diff --git a/rowers/utils.py b/rowers/utils.py index e4de1539..9e7d5054 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -64,9 +64,13 @@ workout_name_element = ( ('ownerfirst', 'Rower first name'), ('ownerlast', 'Rower last name'), ('duration', 'Duration'), - ('boattype','Boat Type'), - ('workouttype', 'Workout Type'), - ('seatnumber','Seat Number') + ('boattype','Boat type'), + ('workouttype', 'Workout type'), + ('seatnumber','Seat number'), + ('boatname', 'Boat name'), + ('empowerside', 'Empower side'), + ('inboard', 'Inboard'), + ('oarlength', 'Oar length'), ) diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index ef42edf0..cd42ad56 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -329,20 +329,27 @@ def rower_favoritecharts_view(request, userid=0): workoutnametemplate_formset = WorkoutNameTemplateFormSet(initial=workoutnametemplate_data, prefix='workoutname') if request.method == 'POST' and 'workoutname-TOTAL_FORMS' in request.POST: - workoutnametemplate_formset = WorkoutNameTemplateFormSet(request.POST, prefix='workoutname') - newworkoutnametemplate = [] - if workoutnametemplate_formset.is_valid(): - for form in workoutnametemplate_formset: - element = form.cleaned_data.get('element') - if element != 'None': - newworkoutnametemplate.append(element) + if 'defaults_workoutname' in request.POST: + r.workoutnametemplate = ['date','name','distance','ownerfirst','ownerlast','duration','boattype','workouttype'] + r.save() + else: + workoutnametemplate_formset = WorkoutNameTemplateFormSet(request.POST, prefix='workoutname') + newworkoutnametemplate = [] + if workoutnametemplate_formset.is_valid(): + for form in workoutnametemplate_formset: + element = form.cleaned_data.get('element') + if element != 'None': + newworkoutnametemplate.append(element) - newworkoutnametemplate = [i for i in newworkoutnametemplate if i is not None] - r.workoutnametemplate = newworkoutnametemplate - try: - r.save() - except IntegrityError: - messages.error("Something went wrong") + newworkoutnametemplate = [i for i in newworkoutnametemplate if i is not None] + r.workoutnametemplate = newworkoutnametemplate + try: + r.save() + except IntegrityError: + messages.error("Something went wrong") + workoutnametemplate_data = [{'element': element} for element in r.workoutnametemplate] + workoutnametemplate_formset = WorkoutNameTemplateFormSet(initial=workoutnametemplate_data, prefix='workoutname') + if request.method == 'POST' and 'staticgrids' in request.POST: # pragma: no cover staticchartform = StaticChartRowerForm(request.POST, instance=r)