summaryrefslogtreecommitdiff
path: root/archaeological_operations/forms.py
diff options
context:
space:
mode:
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
commit8b9880fb22e0f58d1cbde5720e173ad164cb5a1f (patch)
tree0b0e03536d5e20e14a13d7805ce1e75f1fca04ea /archaeological_operations/forms.py
parent1f374dd36b2901b35e4ab0bdbcfcbcbb93224f1a (diff)
downloadIshtar-8b9880fb22e0f58d1cbde5720e173ad164cb5a1f.tar.bz2
Ishtar-8b9880fb22e0f58d1cbde5720e173ad164cb5a1f.zip
UI: adapt each form to use the new date widget. Force localization of format.
Diffstat (limited to 'archaeological_operations/forms.py')
-rw-r--r--archaeological_operations/forms.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 2b6e2773e..00b99ea2b 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -529,11 +529,11 @@ class OperationSelect(TableSelect):
start_before = forms.DateField(label=_(u"Started before"),
widget=DatePicker)
start_after = forms.DateField(label=_(u"Started after"),
- widget=widgets.JQueryDate)
+ widget=DatePicker)
end_before = forms.DateField(label=_(u"Ended before"),
- widget=widgets.JQueryDate)
+ widget=DatePicker)
end_after = forms.DateField(label=_(u"Ended after"),
- widget=widgets.JQueryDate)
+ widget=DatePicker)
relation_types = forms.MultipleChoiceField(
label=_(u"Search within relations"), choices=[],
widget=forms.CheckboxSelectMultiple)
@@ -565,15 +565,15 @@ class OperationSelect(TableSelect):
associated_model=Person),
validators=[valid_id(Person)])
documentation_deadline_before = forms.DateField(
- label=_(u"Documentation deadline before"), widget=widgets.JQueryDate)
+ label=_(u"Documentation deadline before"), widget=DatePicker)
documentation_deadline_after = forms.DateField(
- label=_(u"Documentation deadline after"), widget=widgets.JQueryDate)
+ label=_(u"Documentation deadline after"), widget=DatePicker)
documentation_received = forms.NullBooleanField(
label=_(u"Documentation received"))
finds_deadline_before = forms.DateField(
- label=_(u"Finds deadline before"), widget=widgets.JQueryDate)
+ label=_(u"Finds deadline before"), widget=DatePicker)
finds_deadline_after = forms.DateField(
- label=_(u"Finds deadline after"), widget=widgets.JQueryDate)
+ label=_(u"Finds deadline after"), widget=DatePicker)
finds_received = forms.NullBooleanField(
label=_(u"Finds received"))
@@ -693,7 +693,7 @@ PREVENTIVE_RESARCH = (('all', _('All')),
('research', _(u"Research")),)
-class DashboardForm(forms.Form):
+class DashboardForm(IshtarForm):
slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING,
required=False)
department_detail = forms.BooleanField(
@@ -708,9 +708,9 @@ class DashboardForm(forms.Form):
operator = forms.ChoiceField(label=_("Operator"), choices=[],
required=False)
after = forms.DateField(label=_(u"Date after"),
- widget=widgets.JQueryDate, required=False)
+ widget=DatePicker, required=False)
before = forms.DateField(label=_(u"Date before"),
- widget=widgets.JQueryDate, required=False)
+ widget=DatePicker, required=False)
with_report = forms.BooleanField(label=_("With reports"), required=False)
with_finds = forms.BooleanField(label=_("With finds"), required=False)
@@ -833,18 +833,18 @@ class OperationFormGeneral(CustomForm, ManageOldType):
validators=[validators.MinValueValidator(0),
validators.MaxValueValidator(999999999)])
start_date = forms.DateField(
- label=_(u"Start date"), required=False, widget=widgets.JQueryDate)
+ label=_(u"Start date"), required=False, widget=DatePicker)
excavation_end_date = forms.DateField(
label=_(u"Excavation end date"), required=False,
- widget=widgets.JQueryDate)
+ widget=DatePicker)
report_delivery_date = forms.DateField(
label=_(u"Report delivery date"), required=False,
- widget=widgets.JQueryDate)
+ widget=DatePicker)
report_processing = forms.ChoiceField(label=_(u"Report processing"),
choices=[], required=False)
if settings.COUNTRY == 'fr':
cira_date = forms.DateField(label=u"Date avis CIRA", required=False,
- widget=widgets.JQueryDate)
+ widget=DatePicker)
negative_result = forms.NullBooleanField(
required=False, label=u"Résultat considéré comme négatif")
cira_rapporteur = forms.IntegerField(
@@ -861,12 +861,12 @@ class OperationFormGeneral(CustomForm, ManageOldType):
validators=[valid_id(Person)], required=False)
documentation_deadline = forms.DateField(
label=_(u"Deadline for submission of the documentation"),
- required=False, widget=widgets.JQueryDate)
+ required=False, widget=DatePicker)
documentation_received = forms.NullBooleanField(
required=False, label=_(u"Documentation received"))
finds_deadline = forms.DateField(
label=_(u"Deadline for submission of the finds"), required=False,
- widget=widgets.JQueryDate)
+ widget=DatePicker)
finds_received = forms.NullBooleanField(
required=False, label=_(u"Finds received"))
@@ -1422,7 +1422,7 @@ class AdministrativeActOpeForm(CustomForm, ManageOldType):
act_object = forms.CharField(label=_(u"Object"), max_length=300,
widget=forms.Textarea, required=False)
signature_date = forms.DateField(
- label=_(u"Signature date"), initial=get_now, widget=widgets.JQueryDate)
+ label=_(u"Signature date"), initial=get_now, widget=DatePicker)
if settings.COUNTRY == 'fr':
ref_sra = forms.CharField(label=u"Autre référence", max_length=15,
required=False)