Changeset 6054

Timestamp:

11 May 2011, 23:48:42 (13 years ago)

Author:

uli

Message:

Enable new Friendly Date Widgets and remove trash from here.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (8 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

@@ -48 +48 @@
     PassportWidget, PassportDisplayWidget
     )
+from waeup.sirp.widgets.datewidget import (
+    FriendlyDateWidget, FriendlyDateDisplayWidget)
+
 #from zope.formlib.objectwidget import ObjectWidget
 from zope.formlib.sequencewidget import ListSequenceWidget, SequenceDisplayWidget
@@ -74 +77 @@
 list_results_display_widget = CustomWidgetFactory(
     MultiListDisplayWidget, subwidget=results_display_widget)
-
-#: A date widget that renders with CSS class `datepicker` thus
-#  enabling : the jQuery datepicker for this field if the form loaded
-#  the jQuery code.
-FriendlyDateWidget = CustomWidgetFactory(
-    DateWidget, cssClass='datepicker')
 
 class ApplicationsPage(WAeUPPage):
@@ -226 +223 @@
         return self.view.application_url('applicants')
 
-from waeup.sirp.widgets.datewidget import (
-    FormattedDateWidget, FormattedDateDisplayWidget,)
-
-FriendlyDateWidget = CustomWidgetFactory(
-    FormattedDateWidget,
-    cssClass='datepicker-le-year',
-    date_format='%d/%m/%Y')
-FriendlyDateDisplayWidget = CustomWidgetFactory(
-    FormattedDateDisplayWidget,
-    date_format='%d/%m/%Y')
-
 class ApplicantsContainerPage(WAeUPDisplayFormPage):
     """The standard view for regular applicant containers.
@@ -247 +233 @@
     form_fields = grok.AutoFields(IApplicantsContainer)
     # Use friendlier date widget...
-    form_fields['startdate'].custom_widget = FriendlyDateDisplayWidget
-    form_fields['enddate'].custom_widget = FriendlyDateDisplayWidget
+    form_fields['startdate'].custom_widget = FriendlyDateDisplayWidget('le')
+    form_fields['enddate'].custom_widget = FriendlyDateDisplayWidget('le')
 
     @property
@@ -277 +263 @@
     form_fields = grok.AutoFields(IApplicantsContainer)
     # Use friendlier date widget...
-    form_fields['startdate'].custom_widget = FriendlyDateWidget
-    form_fields['enddate'].custom_widget = FriendlyDateWidget
+    form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
+    form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
 
     @property
@@ -382 +368 @@
     form_fields['fst_sit_results'].custom_widget = list_results_display_widget
     form_fields['passport'].custom_widget = ThumbnailWidget
+    form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = 'Applicant'
     title = 'Applicant'
@@ -394 +381 @@
     form_fields = grok.AutoFields(IApplicantPDEEditData).omit('locked')
     form_fields['passport'].custom_widget = EncodingImageFileWidget
-    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget
+    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     grok.template('form_edit_pde')
 
@@ -462 +449 @@
     form_fields = grok.AutoFields(IApplicantPDEEditData).omit('locked')
     form_fields['passport'].custom_widget = EncodingImageFileWidget
-    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget
+    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     grok.template('form_edit_full')