Merge branch 'release/v21.2.0'

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

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)
@@ -3667,25 +3697,38 @@ class Workout(models.Model):
 
     def __str__(self):
 
-        date = self.date
+        elements = dict(
-        name = self.name
+            date = self.date.strftime('%Y-%m-%d'),
-        distance = str(self.distance)
+            name = self.name,
-        ownerfirst = self.user.user.first_name
+            distance = str(self.distance),
-        ownerlast = self.user.user.last_name
+            ownerfirst = self.user.user.first_name,
-        duration = self.duration
+            ownerlast = self.user.user.last_name,
-        boattype = self.boattype
+            duration = self.duration.strftime("%H:%M:%S"),
-        workouttype = self.workouttype
+            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(
+                stri = u''
-                    d=date.strftime('%Y-%m-%d'),
+                for element in self.user.workoutnametemplate:
-                    n=name,
+                    stri += u'{'+u'{element}'.format(element=element)+u'} '
-                    dist=distance,
+                stri = stri[:-1]
-                    duration=duration.strftime("%H:%M:%S"),
+                return stri.format(**elements)
-                    workouttype=workouttype,
+            except ValueError:
-                    ownerfirst=ownerfirst,
+                return self.name
-                    ownerlast=ownerlast,
+            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
@@ -3693,15 +3736,8 @@ class Workout(models.Model):
                 return "No workout"
         else:
             try:
-                stri = u'{d} {n} {dist}m {duration} {workouttype} {boattype} {ownerfirst} {ownerlast}'.format(
+                stri = u'{date} {name} {distance}m {duration} {workouttype} {boattype} {ownerfirst} {ownerlast}'.format(
-                    d=date.strftime('%Y-%m-%d'),
+                    **elements
-                    n=name,
-                    dist=distance,
-                    duration=duration.strftime("%H:%M:%S"),
-                    workouttype=workouttype,
-                    boattype=boattype,
-                    ownerfirst=ownerfirst,
-                    ownerlast=ownerlast,
                     )
             except (ValueError, AttributeError):
                 stri = self.name

rowers/templates/favoritecharts.html

@@ -41,6 +41,27 @@
 </form>
 </p>
 
+<h1>Workout Name Settings of {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
+
+<p>
+  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. 
+</p>
+
+<form enctype="multipart/form-data" action="" method="post">
+  {{ workoutnametemplate_formset.management_form }}
+  <table width=100%>
+    {{ workoutnametemplate_formset.as_table }}
+  </table>
+  {% csrf_token %}
+  <p>
+    <input class="grid_2 alpha button" type="submit" value="Save">
+  </p>
+  <p>
+    <input type="submit" value="Restore Defaults" name="defaults_workoutname" class="button"/>
+  </p>
+</form>
+    
 
 <h1>Change Favorite Charts of {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 

rowers/utils.py

@@ -57,6 +57,22 @@ 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'),
+    ('boatname', 'Boat name'),
+    ('empowerside', 'Empower side'),
+    ('inboard', 'Inboard'),
+    ('oarlength', 'Oar length'),
+)
+
 
 workflowmiddlepanel = (
     ('panel_statcharts.html', 'Static Charts'),

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,

rowers/views/userviews.py

@@ -322,6 +322,35 @@ 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:
+        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")
+        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)
         if staticchartform.is_valid():
@@ -400,6 +429,7 @@ def rower_favoritecharts_view(request, userid=0):
         'rower': r,
         'staticchartform': staticchartform,
         'datasettingsform': datasettingsform,
+        'workoutnametemplate_formset': workoutnametemplate_formset,
     }
 
     return render(request, 'favoritecharts.html', context)