From f149e2b4316adfa66bedec92d77d502ed00e896c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 8 Feb 2018 22:47:35 +0100 Subject: [PATCH] minor improvements --- rowers/models.py | 15 +- rowers/templates/plannedsessioncreate.html | 43 +- rowers/templates/plannedsessions.html | 64 +- rowers/templates/plannedsessionsmanage.html | 16 +- rowers/templates/planningbuttons.html | 6 +- rowers/views.py | 33 +- rowsandall_app/settings.py | 1 + static/css/bootstrap-grid.css | 2050 +++++ static/css/bootstrap-grid.css.map | 1 + static/css/bootstrap-grid.min.css | 7 + static/css/bootstrap-grid.min.css.map | 1 + static/css/bootstrap-reboot.css | 330 + static/css/bootstrap-reboot.css.map | 1 + static/css/bootstrap-reboot.min.css | 8 + static/css/bootstrap-reboot.min.css.map | 1 + static/css/bootstrap.css | 8975 +++++++++++++++++++ static/css/bootstrap.css.map | 1 + static/css/bootstrap.min.css | 7 + static/css/bootstrap.min.css.map | 1 + static/js/bootstrap.bundle.js | 6328 +++++++++++++ static/js/bootstrap.bundle.js.map | 1 + static/js/bootstrap.bundle.min.js | 7 + static/js/bootstrap.bundle.min.js.map | 1 + static/js/bootstrap.js | 3894 ++++++++ static/js/bootstrap.js.map | 1 + static/js/bootstrap.min.js | 7 + static/js/bootstrap.min.js.map | 1 + templates/basebase.html | 9 +- 28 files changed, 21741 insertions(+), 69 deletions(-) create mode 100644 static/css/bootstrap-grid.css create mode 100644 static/css/bootstrap-grid.css.map create mode 100644 static/css/bootstrap-grid.min.css create mode 100644 static/css/bootstrap-grid.min.css.map create mode 100644 static/css/bootstrap-reboot.css create mode 100644 static/css/bootstrap-reboot.css.map create mode 100644 static/css/bootstrap-reboot.min.css create mode 100644 static/css/bootstrap-reboot.min.css.map create mode 100644 static/css/bootstrap.css create mode 100644 static/css/bootstrap.css.map create mode 100644 static/css/bootstrap.min.css create mode 100644 static/css/bootstrap.min.css.map create mode 100644 static/js/bootstrap.bundle.js create mode 100644 static/js/bootstrap.bundle.js.map create mode 100644 static/js/bootstrap.bundle.min.js create mode 100644 static/js/bootstrap.bundle.min.js.map create mode 100644 static/js/bootstrap.js create mode 100644 static/js/bootstrap.js.map create mode 100644 static/js/bootstrap.min.js create mode 100644 static/js/bootstrap.min.js.map diff --git a/rowers/models.py b/rowers/models.py index b2b12116..74373e98 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -826,10 +826,10 @@ class PlannedSession(models.Model): ) startdate = models.DateField(default=timezone.now, - verbose_name='Start Date') + verbose_name='On or After') enddate = models.DateField(default=a_week_from_now, - verbose_name='End Date') + verbose_name='On or Before') sessiontype = models.CharField(default='session', choices=sessiontypechoices, @@ -861,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') @@ -887,6 +887,7 @@ class DateInput(forms.DateInput): input_type = 'date' class PlannedSessionForm(ModelForm): + class Meta: model = PlannedSession fields = ['startdate', @@ -899,10 +900,16 @@ class PlannedSessionForm(ModelForm): 'sessionunit', 'comment', ] + + dateTimeOptions = { + 'format': 'yyyy-mm-dd', + 'autoclose': True, + } + widgets = { 'comment': forms.Textarea, 'startdate': DateInput(), - 'enddate': AdminDateWidget(), + 'enddate': DateInput(), } diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index 3c7a6709..63bba657 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% load staticfiles %} +{% load rowerfilters %} {% block title %}New Planned Session{% endblock %} - {% block content %}
{% include "planningbuttons.html" %} @@ -14,7 +14,7 @@

Create Session for {{ rower.user.first_name }} {{ rower.user.last_name }}

- {% if user.is_authenticated and user|is_manager %} {% endif %} +
-
-
- {% if form.errors %} -

- Please correct the error{{ form.errors|pluralize }} below. -

- {% endif %} - - - {{ form.as_table }} -
- {% csrf_token %} -
- -
-
-