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

2 files changed, 27 insertions, 25 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 001c10052..458a3baa8 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -41,11 +41,12 @@ import models
 
 from ishtar_common.forms import FormSet, FloatField, \
     get_form_selection, reverse_lazy, TableSelect, get_now, FinalForm, \
-    ManageOldType, FieldType
+    ManageOldType, FieldType, IshtarForm
 
 from ishtar_common.forms_common import get_town_field, SourceSelect, CustomForm
 from ishtar_common.utils import convert_coordinates_to_point
 from ishtar_common import widgets
+from bootstrap_datepicker.widgets import DatePicker
 from archaeological_operations.widgets import OAWidget
 
 from archaeological_warehouse.models import Warehouse
@@ -126,7 +127,7 @@ class RecordFormSelection(CustomForm, forms.Form):
             cr.operation.pk)
 
 
-class FindForm(CustomForm, ManageOldType, forms.Form):
+class FindForm(CustomForm, ManageOldType):
     file_upload = True
     form_label = _("Find")
     form_admin_name = _(u"Find - 020 - General")
@@ -147,7 +148,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
     description = forms.CharField(label=_("Description"),
                                   widget=forms.Textarea, required=False)
     get_first_base_find__discovery_date = forms.DateField(
-        label=_(u"Discovery date"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Discovery date"), widget=DatePicker, required=False)
     get_first_base_find__batch = forms.ChoiceField(
         label=_(u"Batch/object"), choices=[],
         required=False)
@@ -196,7 +197,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
     mark = forms.CharField(label=_(u"Mark"), required=False)
     checked = forms.ChoiceField(label=_(u"Check"))
     check_date = forms.DateField(
-        initial=get_now, label=_(u"Check date"), widget=widgets.JQueryDate)
+        initial=get_now, label=_(u"Check date"), widget=DatePicker)
     comment = forms.CharField(label=_(u"Comment"), required=False,
                               widget=forms.Textarea)
     dating_comment = forms.CharField(
@@ -268,7 +269,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
         return self.cleaned_data
 
 
-class PreservationForm(CustomForm, ManageOldType, forms.Form):
+class PreservationForm(CustomForm, ManageOldType):
     form_label = _("Preservation")
     form_admin_name = _(u"Find - 030 - Preservation")
     form_slug = "find-030-preservation"
@@ -295,7 +296,7 @@ class PreservationForm(CustomForm, ManageOldType, forms.Form):
                                             choices=[], required=False)
     insurance_value = FloatField(label=_(u"Insurance value"), required=False)
     appraisal_date = forms.DateField(
-        label=_(u"Appraisal date"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Appraisal date"), widget=DatePicker, required=False)
     conservatory_comment = forms.CharField(
         label=_(u"Conservatory comment"), required=False,
         widget=forms.Textarea)
@@ -729,7 +730,7 @@ class NewFindBasketForm(forms.ModelForm):
         return super(NewFindBasketForm, self).save(commit)
 
 
-class SelectFindBasketForm(forms.Form):
+class SelectFindBasketForm(IshtarForm):
     form_label = _(u"Basket")
     associated_models = {'basket': models.FindBasket}
     need_user_for_initialization = True
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index a1cb4a8b5..47826390f 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -37,10 +37,11 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \
     AdministrativeActOpeFormSelection, AdministrativeActModifForm
 
 from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \
-    ManageOldType, get_form_selection, CustomForm, FieldType
+    ManageOldType, get_form_selection, CustomForm, FieldType, IshtarForm
 from ishtar_common.forms_common import SourceSelect
 
 from ishtar_common import widgets
+from bootstrap_datepicker.widgets import DatePicker
 
 logger = logging.getLogger(__name__)
 
@@ -75,7 +76,7 @@ class TreatmentFormSelection(forms.Form):
         validators=[valid_id(models.Treatment)])
 
 
-class BaseTreatmentForm(CustomForm, ManageOldType, forms.Form):
+class BaseTreatmentForm(CustomForm, ManageOldType):
     form_label = _(u"Base treatment")
     form_admin_name = _(u"Treatment - 020 - General")
     form_slug = "treatment-020-general"
@@ -137,9 +138,9 @@ class BaseTreatmentForm(CustomForm, ManageOldType, forms.Form):
     comment = forms.CharField(label=_(u"Comment"),
                               widget=forms.Textarea, required=False)
     start_date = forms.DateField(label=_(u"Start date"), required=False,
-                                 widget=widgets.JQueryDate)
+                                 widget=DatePicker)
     end_date = forms.DateField(label=_(u"Closing date"), required=False,
-                               widget=widgets.JQueryDate)
+                               widget=DatePicker)
     estimated_cost = forms.FloatField(label=_(u"Estimated cost ({currency})"),
                                       required=False)
     quoted_cost = forms.FloatField(label=_(u"Quoted cost ({currency})"),
@@ -287,7 +288,7 @@ SLICING = (("month", _(u"months")), ('year', _(u"years")),)
 DATE_SOURCE = (("start", _(u"Start date")), ("end", _(u"Closing date")),)
 
 
-class DashboardForm(forms.Form):
+class DashboardForm(IshtarForm):
     slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING,
                                 required=False)
     date_source = forms.ChoiceField(
@@ -295,9 +296,9 @@ class DashboardForm(forms.Form):
     treatment_type = forms.ChoiceField(label=_("Treatment type"), 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)
 
     def __init__(self, *args, **kwargs):
         if 'prefix' not in kwargs:
@@ -338,9 +339,9 @@ class AdministrativeActTreatmentSelect(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)
     treatment__name = forms.CharField(
         label=_(u"Treatment name"), max_length=200)
     treatment__year = forms.IntegerField(label=_(u"Treatment year"))
@@ -441,7 +442,7 @@ class TreatmentFileFormSelection(forms.Form):
         validators=[valid_id(models.TreatmentFile)])
 
 
-class TreatmentFileForm(ManageOldType, forms.Form):
+class TreatmentFileForm(ManageOldType):
     form_label = _(u"Treatment request")
     base_models = ['treatment_type_type']
     associated_models = {
@@ -482,13 +483,13 @@ class TreatmentFileForm(ManageOldType, forms.Form):
     comment = forms.CharField(label=_(u"Comment"),
                               widget=forms.Textarea, required=False)
     creation_date = forms.DateField(label=_(u"Start date"), required=False,
-                                    widget=widgets.JQueryDate,
+                                    widget=DatePicker,
                                     initial=lambda: datetime.datetime.now())
     reception_date = forms.DateField(
-        label=_(u"Reception date"), required=False, widget=widgets.JQueryDate,
+        label=_(u"Reception date"), required=False, widget=DatePicker,
         initial=lambda: datetime.datetime.now())
     end_date = forms.DateField(label=_(u"Closing date"), required=False,
-                               widget=widgets.JQueryDate)
+                               widget=DatePicker)
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
@@ -542,7 +543,7 @@ DATE_SOURCE_FILE = (
     ("end", _(u"Closing date")),)
 
 
-class DashboardTreatmentFileForm(forms.Form):
+class DashboardTreatmentFileForm(IshtarForm):
     slicing = forms.ChoiceField(label=_("Slicing"), choices=SLICING,
                                 required=False)
     date_source = forms.ChoiceField(
@@ -550,9 +551,9 @@ class DashboardTreatmentFileForm(forms.Form):
     treatmentfile_type = forms.ChoiceField(label=_("Treatment request type"),
                                            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)
 
     def __init__(self, *args, **kwargs):
         if 'prefix' not in kwargs:
@@ -591,9 +592,9 @@ class AdministrativeActTreatmentFileSelect(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)
     treatment_file__name = forms.CharField(
         label=_(u"Treatment request name"), max_length=200)
     treatment_file__year = forms.IntegerField(