diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index ac281cb0..42657e3b 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -110,6 +110,8 @@ USE_L10N = True USE_TZ = True +DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M','%Y-%m-%dT%H:%M:%S') + TEMPLATE_CONTEXT_PROCESSORS = ( "django.contrib.auth.context_processors.auth", "django.core.context_processors.debug", diff --git a/RIGS/forms.py b/RIGS/forms.py new file mode 100644 index 00000000..9e883252 --- /dev/null +++ b/RIGS/forms.py @@ -0,0 +1,17 @@ +__author__ = 'Ghost' +from django import forms +from django.utils import formats +from RIGS import models +from django.conf import settings + +# Events Shit +class EventForm(forms.ModelForm): + datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + 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) + name = forms.CharField(min_length=3) + class Meta: + model = models.Event + fields = ['is_rig', 'name', 'venue', 'start_date', 'start_time', 'end_date', + 'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic', + 'person', 'organisation', 'dry_hire', 'based_on'] \ No newline at end of file diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index c6aa9233..7e0f3730 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -1,7 +1,7 @@ from django.views import generic from django.core.urlresolvers import reverse_lazy -from RIGS import models +from RIGS import models, forms __author__ = 'ghost' @@ -25,6 +25,7 @@ class EventDetail(generic.DetailView): class EventCreate(generic.CreateView): model = models.Event + form_class = forms.EventForm def get_context_data(self, **kwargs): context = super(EventCreate, self).get_context_data(**kwargs) @@ -37,6 +38,7 @@ class EventCreate(generic.CreateView): class EventUpdate(generic.UpdateView): model = models.Event + form_class = forms.EventForm def get_context_data(self, **kwargs): context = super(EventUpdate, self).get_context_data(**kwargs) diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 0b2501df..77601dd2 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -110,7 +110,8 @@ data-target="{{ form.person.id_for_label }}"/>