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

everything working,

Browse Source
This commit is contained in:
Sander Roosendaal
2022-04-07 16:29:11 +02:00
parent 084e384aaa
commit cad9e6ab77
7 changed files with 324 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/models.py
View File

@@ -2414,7 +2414,7 @@ class PlannedSessionStep(models.Model):
manager = models.ForeignKey(User, null=True, on_delete=models.CASCADE)
name = models.TextField(default='',max_length=200, blank=True, null=True)
type = models.TextField(default='',max_length=200, blank=True, null=True)
durationvalue = models.IntegerField(default=0)
durationvalue = models.FloatField(default=0)
durationtype = models.TextField(default='',max_length=200, blank=True, null=True,
choices=durationtypes)
targetvalue = models.IntegerField(default=0)
@@ -2435,6 +2435,8 @@ class PlannedSessionStep(models.Model):
elif self.intensity == "Rest":
self.color = 'add8e6'
self.durationvalue = int(self.durationvalue)
super(PlannedSessionStep, self).save(*args, **kwargs)
def asdict(self):
@@ -2442,7 +2444,10 @@ class PlannedSessionStep(models.Model):
'wkt_step_name': self.name,
'durationType': self.durationtype,
'durationValue': self.durationvalue,
'targetType': self.targettype,
'targetValue': self.targetvalue,
'targetValueLow': self.targetvaluelow,
'targetValueHigh': self.targetvaluehigh,
'description': self.description,
'stepId': self.pk,
'intensity': self.intensity,
@@ -2458,13 +2463,33 @@ class StepEditorForm(ModelForm):
#'type',
'durationtype',
'durationvalue',
'targettype',
'targetvalue',
'targetvaluelow',
'targetvaluehigh',
'intensity',
'description',
]
widgets = {
'name': forms.Textarea(attrs={'rows':1, 'cols':50}),
}
def __init__(self, *args, **kwargs):
super(StepEditorForm, self).__init__(*args, **kwargs)
if self.instance.durationtype == 'Time':
self.initial['durationvalue'] = self.instance.durationvalue / 60000
elif self.instance.durationtype == 'Distance':
form.initial['durationvalue'] = self.instance.durationvalue / 100
def save(self, *args, **kwargs):
# conversions
if self.instance.durationtype == 'Time':
self.instance.durationvalue *= 60000
elif self.instance.durationtype == 'Distance':
self.instance.durationvalue *= 100
return super(StepEditorForm, self).save(*args, **kwargs)
class PlannedSession(models.Model):