diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-15 18:34:54 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-15 18:34:54 +0100 |
| commit | 8b9880fb22e0f58d1cbde5720e173ad164cb5a1f (patch) | |
| tree | 0b0e03536d5e20e14a13d7805ce1e75f1fca04ea /archaeological_files_pdl | |
| parent | 1f374dd36b2901b35e4ab0bdbcfcbcbb93224f1a (diff) | |
| download | Ishtar-8b9880fb22e0f58d1cbde5720e173ad164cb5a1f.tar.bz2 Ishtar-8b9880fb22e0f58d1cbde5720e173ad164cb5a1f.zip | |
UI: adapt each form to use the new date widget. Force localization of format.
Diffstat (limited to 'archaeological_files_pdl')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index bc9b0c1e6..14cb0e4d9 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -30,12 +30,13 @@ from ishtar_common.models import Person, Town, Department, valid_id, \ from archaeological_files import models from ishtar_common.forms import get_now, reverse_lazy, ManageOldType, \ - CustomForm, FieldType + CustomForm, FieldType, IshtarForm from ishtar_common import widgets +from bootstrap_datepicker.widgets import DatePicker -class FileFormGeneral(CustomForm, ManageOldType, forms.Form): +class FileFormGeneral(CustomForm, ManageOldType): form_label = _("General") form_admin_name = _(u"Archaeological file - 010 - General") form_slug = "file-010-general" @@ -46,9 +47,9 @@ class FileFormGeneral(CustomForm, ManageOldType, forms.Form): validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) creation_date = forms.DateField(label=_(u"Creation date"), - initial=get_now, widget=widgets.JQueryDate) + initial=get_now, widget=DatePicker) reception_date = forms.DateField( - label=_(u"Reception date"), initial=get_now, widget=widgets.JQueryDate) + label=_(u"Reception date"), initial=get_now, widget=DatePicker) TYPES = [ FieldType('file_type', models.FileType), @@ -403,7 +404,7 @@ class FileFormPlanningService(CustomForm, forms.Form): ) -class FileFormInstruction(CustomForm, forms.Form): +class FileFormInstruction(CustomForm, IshtarForm): form_label = u"Instruction SRA" form_admin_name = _("Archaeological file - 050 - Instruction") form_slug = "file-050-instruction" @@ -428,7 +429,7 @@ class FileFormInstruction(CustomForm, forms.Form): validators=[valid_id(models.File)]) comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) - instruction_deadline = forms.DateField(widget=widgets.JQueryDate, + instruction_deadline = forms.DateField(widget=DatePicker, required=False) year = forms.IntegerField(label=_("Year"), validators=[validators.MinValueValidator(1000), @@ -436,7 +437,7 @@ class FileFormInstruction(CustomForm, forms.Form): numeric_reference = forms.IntegerField(label=_("Numeric reference"), required=False) numeric_reference_is_readonly = True - end_date = forms.DateField(widget=widgets.JQueryDate, required=False) + end_date = forms.DateField(widget=DatePicker, required=False) def __init__(self, *args, **kwargs): c_year = datetime.date.today().year |