Changeset 8160 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

15 Apr 2012, 06:40:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Use new date and datetime widgets everywhere in base package.

Use standard datetime widgets for imports. I don't know if this is really necessary.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser.py (modified) (7 diffs)
• interfaces.py (modified) (1 diff)

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

@@ -52 +52 @@
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.utils.helpers import string_from_bytes, file_size
-from waeup.kofa.widgets.datewidget import (
-    FriendlyDateWidget, FriendlyDateDisplayWidget,
-    FriendlyDatetimeDisplayWidget)
+from waeup.kofa.widgets.datewidget import FriendlyDateDisplayWidget
 from waeup.kofa.widgets.phonewidget import PhoneWidget
 from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
@@ -153 +151 @@
     form_fields = grok.AutoFields(
         IApplicantsContainerAdd).omit('code').omit('title')
-    form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
-    form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
 
     def update(self):
@@ -226 +222 @@
 
     form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
-    form_fields['startdate'].custom_widget = FriendlyDateDisplayWidget('le')
-    form_fields['enddate'].custom_widget = FriendlyDateDisplayWidget('le')
     form_fields['description'].custom_widget = ReSTDisplayWidget
 
@@ -257 +251 @@
     tabthreeactions2 = [_('Add local role')]
     # Use friendlier date widget...
-    form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
-    form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
     grok.require('waeup.manageApplication')
 
@@ -497 +489 @@
     grok.require('waeup.viewApplication')
     form_fields = grok.AutoFields(IApplicantOnlinePayment)
-    form_fields[
-        'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-    form_fields[
-        'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     pnav = 3
 
@@ -546 +534 @@
     grok.require('waeup.viewApplication')
     form_fields = grok.AutoFields(IApplicantOnlinePayment)
-    form_fields['creation_date'].custom_widget = FriendlyDateDisplayWidget('le')
-    form_fields['payment_date'].custom_widget = FriendlyDateDisplayWidget('le')
+    #form_fields['creation_date'].custom_widget = FriendlyDateDisplayWidget('le')
+    #form_fields['payment_date'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
 
@@ -754 +742 @@
         'screening_score',
         )
-    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     form_fields['phone'].custom_widget = PhoneWidget
     form_fields['applicant_id'].for_display = True

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -221 +221 @@
         """Content as language dictionary with values in HTML format.""")
 
-    startdate = schema.Date(
+    startdate = FormattedDate(
         title = _(u'Application Start Date'),
         required = False,
-        )
-
-    enddate = schema.Date(
+        show_year = False,
+        )
+
+    enddate = FormattedDate(
         title = _(u'Application Closing Date'),
         required = False,
+        show_year = False,
         )