mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
Explicitly set default format on time widgets, python side
This commit is contained in:
@@ -13,8 +13,8 @@ from RIGS import models
|
||||
|
||||
# Override the django form defaults to use the HTML date/time/datetime UI elements
|
||||
forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
|
||||
forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'})
|
||||
forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
|
||||
forms.TimeField.widget = forms.TimeInput(attrs={'type': 'time'}, format='%H:%M')
|
||||
forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M')
|
||||
|
||||
|
||||
# Events Shit
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% localize off %}
|
||||
<div class="form-group">
|
||||
<label for="{{ form.start_date.id_for_label }}"
|
||||
class="col-sm-4 control-label">{{ form.start_date.label }}</label>
|
||||
@@ -101,7 +100,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endlocalize %}
|
||||
|
||||
{# 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">
|
||||
|
||||
@@ -23,6 +23,7 @@ from django.test.client import Client
|
||||
from django.core import mail, signing
|
||||
from django.http import HttpResponseBadRequest
|
||||
from django.conf import settings
|
||||
import sys
|
||||
|
||||
|
||||
@screenshot_failure_cls
|
||||
@@ -119,7 +120,7 @@ class TestEventCreate(BaseRigboardTest):
|
||||
|
||||
self.page.name = "Test Rig"
|
||||
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.access_at = datetime.datetime(2015, 1, 1, 9)
|
||||
self.page.dry_hire = True
|
||||
@@ -210,8 +211,8 @@ class TestEventCreate(BaseRigboardTest):
|
||||
self.page.name = "Test Date Validation"
|
||||
# end time before start
|
||||
self.page.start_date = datetime.date(2020, 1, 1)
|
||||
self.page.start_time = datetime.time(10)
|
||||
self.page.end_time = datetime.time(9)
|
||||
self.page.start_time = datetime.time(10, 00)
|
||||
self.page.end_time = datetime.time(9, 00)
|
||||
|
||||
# Expected to fail
|
||||
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])
|
||||
|
||||
# Fix it
|
||||
self.page.end_time = datetime.time(23)
|
||||
self.page.end_time = datetime.time(23, 00)
|
||||
|
||||
# Should work
|
||||
self.page.submit()
|
||||
|
||||
Reference in New Issue
Block a user