diff --git a/rowers/models.py b/rowers/models.py index d6316883..74373e98 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -10,6 +10,7 @@ from django.dispatch import receiver from django.forms.widgets import SplitDateTimeWidget from django.forms.extras.widgets import SelectDateWidget from django.forms.formsets import BaseFormSet +from django.contrib.admin.widgets import AdminDateWidget from datetimewidget.widgets import DateTimeWidget from django.core.validators import validate_email import os @@ -671,6 +672,8 @@ class GeoPoint(models.Model): def half_year_from_now(): return timezone.now()+timezone.timedelta(days=182) +def a_week_from_now(): + return timezone.now()+timezone.timedelta(days=7) # models related to training planning - draft # Do we need a separate class TestTarget? @@ -819,14 +822,14 @@ class PlannedSession(models.Model): name = models.CharField(max_length=150,blank=True) - comment = models.TextField(max_length=300,blank=True, + comment = models.TextField(max_length=500,blank=True, ) startdate = models.DateField(default=timezone.now, - verbose_name='Start Date') + verbose_name='On or After') - enddate = models.DateField(default=timezone.now, - verbose_name='End Date') + enddate = models.DateField(default=a_week_from_now, + verbose_name='On or Before') sessiontype = models.CharField(default='session', choices=sessiontypechoices, @@ -858,7 +861,7 @@ class PlannedSession(models.Model): team = models.ManyToManyField(Team,blank=True) rower = models.ManyToManyField(Rower,blank=True) - sessionmode = models.CharField(default='distance', + sessionmode = models.CharField(default='time', choices=sessionmodechoices, max_length=150, verbose_name='Session Mode') @@ -884,6 +887,7 @@ class DateInput(forms.DateInput): input_type = 'date' class PlannedSessionForm(ModelForm): + class Meta: model = PlannedSession fields = ['startdate', @@ -896,6 +900,12 @@ class PlannedSessionForm(ModelForm): 'sessionunit', 'comment', ] + + dateTimeOptions = { + 'format': 'yyyy-mm-dd', + 'autoclose': True, + } + widgets = { 'comment': forms.Textarea, 'startdate': DateInput(), diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 82b4bba2..79fc24f5 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -66,21 +66,21 @@