UI: adapt each form to use the new date widget. Force localization of format.

1 files changed, 10 insertions, 9 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index ee5815506..d72791ac0 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -37,12 +37,13 @@ from archaeological_operations.models import ActType, AdministrativeAct, \
 import models
 
 from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \
-    ManageOldType, CustomForm, FieldType
+    ManageOldType, CustomForm, FieldType, IshtarForm
 from ishtar_common.forms_common import get_town_field
 from archaeological_operations.forms import AdministrativeActOpeForm, \
     AdministrativeActOpeFormSelection, \
     ParcelField, SLICING, AdministrativeActModifForm, ParcelForm, ParcelFormSet
 from ishtar_common import widgets
+from bootstrap_datepicker.widgets import DatePicker
 
 
 class FileSelect(TableSelect):
@@ -145,7 +146,7 @@ DATE_SOURCE = (('creation', _(u"Creation date")),
                ("reception", _(u"Reception date")))
 
 
-class DashboardForm(forms.Form):
+class DashboardForm(IshtarForm):
     slicing = forms.ChoiceField(
         label=_("Slicing"), choices=SLICING, required=False)
     department_detail = forms.BooleanField(
@@ -157,9 +158,9 @@ class DashboardForm(forms.Form):
     saisine_type = forms.ChoiceField(
         label=_("Saisine type"), choices=[], required=False)
     after = forms.DateField(
-        label=_(u"Date after"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Date after"), widget=DatePicker, required=False)
     before = forms.DateField(
-        label=_(u"Date before"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Date before"), widget=DatePicker, required=False)
 
     def __init__(self, *args, **kwargs):
         if 'prefix' not in kwargs:
@@ -195,7 +196,7 @@ class DashboardForm(forms.Form):
         return fltr
 
 
-class FileFormGeneral(ManageOldType, forms.Form):
+class FileFormGeneral(ManageOldType):
     form_label = _("General")
     associated_models = {'in_charge': Person,
                          'related_file': models.File,
@@ -219,7 +220,7 @@ class FileFormGeneral(ManageOldType, forms.Form):
         label=_(u"Other reference"), max_length=60, required=False)
     name = forms.CharField(label=_(u"Name"), required=False, max_length=100)
     creation_date = forms.DateField(label=_(u"Creation date"),
-                                    initial=get_now, widget=widgets.JQueryDate)
+                                    initial=get_now, widget=DatePicker)
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
     related_file = forms.IntegerField(
         label=_("Related file"), required=False,
@@ -323,7 +324,7 @@ class FileFormPreventive(ManageOldType, forms.Form):
         saisine_type = forms.ChoiceField(label=_(u"Saisine type"),
                                          choices=[])
     reception_date = forms.DateField(
-        label=_(u"Reception date"), initial=get_now, widget=widgets.JQueryDate)
+        label=_(u"Reception date"), initial=get_now, widget=DatePicker)
 
     def __init__(self, *args, **kwargs):
         super(FileFormPreventive, self).__init__(*args, **kwargs)
@@ -445,9 +446,9 @@ class AdministrativeActFileSelect(TableSelect):
                                  max_length=300)
 
     signature_date_after = forms.DateField(
-        label=_(u"Signature date after"), widget=widgets.JQueryDate)
+        label=_(u"Signature date after"), widget=DatePicker)
     signature_date_before = forms.DateField(
-        label=_(u"Signature date before"), widget=widgets.JQueryDate)
+        label=_(u"Signature date before"), widget=DatePicker)
     associated_file__name = forms.CharField(
         label=_(u"File name"), max_length=200)
     associated_file__general_contractor = forms.IntegerField(