arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-21 07:22:14 +00:00
Code Issues Projects Releases Wiki Activity

Explicitly set default format on time widgets, python side

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-27 19:31:50 +02:00
parent 207cf0aefe
commit af5e5ee83f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PyRIGS/settings.py
View File

@@ -206,7 +206,8 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M')#, '%Y-%m-%dT%H:%M:%S') # Need to allow seconds as datetime-local input type spits out a time that has seconds
DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'

4
RIGS/forms.py
View File

@@ -13,8 +13,8 @@ from RIGS import models
# Override the django form defaults to use the HTML date/time/datetime UI elements # Override the django form defaults to use the HTML date/time/datetime UI elements
forms.DateField.widget = forms.DateInput(attrs={'type': 'date'}) forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'}) forms.TimeField.widget = forms.TimeInput(attrs={'type': 'time'}, format='%H:%M')
forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}) forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M')
# Events Shit # Events Shit

2
RIGS/templates/partials/event_details_form.html
View File

@@ -41,7 +41,6 @@
</div> </div>
</div> </div>
</div> </div>
{% localize off %}
<div class="form-group"> <div class="form-group">
<label for="{{ form.start_date.id_for_label }}" <label for="{{ form.start_date.id_for_label }}"
class="col-sm-4 control-label">{{ form.start_date.label }}</label> class="col-sm-4 control-label">{{ form.start_date.label }}</label>
@@ -101,7 +100,6 @@
</div> </div>
</div> </div>
</div> </div>
{% endlocalize %}
{# Status is needed on all events types and it looks good here in the form #} {# Status is needed on all events types and it looks good here in the form #}
<div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received"> <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">

9
RIGS/tests/test_functional.py
View File

@@ -23,6 +23,7 @@ from django.test.client import Client
from django.core import mail, signing from django.core import mail, signing
from django.http import HttpResponseBadRequest from django.http import HttpResponseBadRequest
from django.conf import settings from django.conf import settings
import sys
@screenshot_failure_cls @screenshot_failure_cls
@@ -119,7 +120,7 @@ class TestEventCreate(BaseRigboardTest):
self.page.name = "Test Rig" self.page.name = "Test Rig"
self.page.start_date = datetime.date(2015, 1, 1) self.page.start_date = datetime.date(2015, 1, 1)
self.page.start_time = datetime.time(10) self.page.start_time = datetime.time(10, 00)
self.page.end_date = datetime.date(2015, 1, 10) self.page.end_date = datetime.date(2015, 1, 10)
self.page.access_at = datetime.datetime(2015, 1, 1, 9) self.page.access_at = datetime.datetime(2015, 1, 1, 9)
self.page.dry_hire = True self.page.dry_hire = True
@@ -210,8 +211,8 @@ class TestEventCreate(BaseRigboardTest):
self.page.name = "Test Date Validation" self.page.name = "Test Date Validation"
# end time before start # end time before start
self.page.start_date = datetime.date(2020, 1, 1) self.page.start_date = datetime.date(2020, 1, 1)
self.page.start_time = datetime.time(10) self.page.start_time = datetime.time(10, 00)
self.page.end_time = datetime.time(9) self.page.end_time = datetime.time(9, 00)
# Expected to fail # Expected to fail
self.page.submit() self.page.submit()
@@ -219,7 +220,7 @@ class TestEventCreate(BaseRigboardTest):
self.assertIn("can't finish before it has started", self.page.errors["General form errors"][0]) self.assertIn("can't finish before it has started", self.page.errors["General form errors"][0])
# Fix it # Fix it
self.page.end_time = datetime.time(23) self.page.end_time = datetime.time(23, 00)
# Should work # Should work
self.page.submit() self.page.submit()