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

FIX: CI Locale Issues

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-27 18:38:58 -04:00
parent 4081918598
commit 14d211326e
8 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
RIGS/forms.py
View File

@@ -13,13 +13,15 @@ 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
class EventForm(forms.ModelForm):
datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS)
datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)

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

@@ -1,4 +1,6 @@
{% load widget_tweaks %}
{% load l10n %}
<div class="col-md-6 my-3">
<div class="card card-default form-hws form-non_rig">
<div class="card-header">Event Details</div>
@@ -49,7 +51,7 @@
{% render_field form.start_date class+="form-control" %}
</div>
<div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
{% render_field form.start_time class+="form-control" %}
{% render_field form.start_time class+="form-control" step="60" %}
</div>
</div>
</div>
@@ -64,7 +66,7 @@
{% render_field form.end_date class+="form-control" %}
</div>
<div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
{% render_field form.end_time class+="form-control" %}
{% render_field form.end_time class+="form-control" step="60" %}
</div>
</div>
</div>
@@ -77,7 +79,7 @@
class="col-sm-4 control-label">{{ form.access_at.label }}</label>
<div class="col-sm-8">
{% render_field form.access_at class+="form-control" %}
{% render_field form.access_at class+="form-control" step="60" %}
</div>
</div>
<div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
@@ -85,7 +87,7 @@
class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
<div class="col-sm-8">
{% render_field form.meet_at class+="form-control" %}
{% render_field form.meet_at class+="form-control" step="60" %}
</div>
</div>
<div class="form-group">

8
RIGS/tests/test_functional.py
View File

@@ -119,7 +119,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 +210,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 +219,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()