Changeset 8184 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

16 Apr 2012, 22:24:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Use FormattedDate?.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• browser.py (modified) (5 diffs)
• interfaces.py (modified) (8 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py

@@ -19 +19 @@
 from zope.formlib.textwidgets import BytesDisplayWidget
 from zope.component import getUtility
-from waeup.kofa.widgets.datewidget import (
-    FriendlyDateWidget, FriendlyDateDisplayWidget
-    )
 from waeup.kofa.interfaces import IExtFileStore
 from waeup.kofa.students.browser import (
@@ -88 +85 @@
         if cm is not None and cm.startswith('pg'):
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
-            form_fields['emp_start'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp_end'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp2_start'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp2_end'].custom_widget = FriendlyDateDisplayWidget('le')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['fst_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['alr_date'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -111 +99 @@
         if cm is not None and cm.startswith('pg'):
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
-            form_fields['emp_start'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp_end'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp2_start'].custom_widget = FriendlyDateDisplayWidget('le')
-            form_fields['emp2_end'].custom_widget = FriendlyDateDisplayWidget('le')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['fst_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateDisplayWidget('le')
-        form_fields['alr_date'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -134 +113 @@
         if cm is not None and cm.startswith('pg'):
             form_fields = grok.AutoFields(IPGStudentClearance)
-            form_fields['emp_start'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp_end'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp2_start'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp2_end'].custom_widget = FriendlyDateWidget('le-year')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance)
-        form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['fst_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['alr_date'].custom_widget = FriendlyDateWidget('le-year')
-
-
         return form_fields
 
@@ -159 +127 @@
         if cm is not None and cm.startswith('pg'):
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
-            form_fields['emp_start'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp_end'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp2_start'].custom_widget = FriendlyDateWidget('le-year')
-            form_fields['emp2_end'].custom_widget = FriendlyDateWidget('le-year')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['fst_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['scd_sit_date'].custom_widget = FriendlyDateWidget('le-year')
-        form_fields['alr_date'].custom_widget = FriendlyDateWidget('le-year')
         return form_fields
 

main/waeup.uniben/trunk/src/waeup/uniben/students/interfaces.py

@@ -19 +19 @@
 from waeup.kofa.schema import TextLineChoice
 from waeup.kofa.interfaces import SimpleKofaVocabulary
+from waeup.kofa.schema import FormattedDate
 from waeup.kofa.schoolgrades import ResultEntryField
 from waeup.kofa.students.vocabularies import nats_vocab
@@ -61 +62 @@
 
     """
-    date_of_birth = schema.Date(
+    date_of_birth = FormattedDate(
         title = _(u'Date of Birth'),
         required = False,
@@ -95 +96 @@
         )
 
-    fst_sit_date = schema.Date(
+    fst_sit_date = FormattedDate(
         title = _(u'Exam Date'),
         required = False,
@@ -127 +128 @@
         )
 
-    scd_sit_date = schema.Date(
+    scd_sit_date = FormattedDate(
         title = _(u'Exam Date'),
         required = False,
@@ -159 +160 @@
         )
 
-    alr_date = schema.Date(
+    alr_date = FormattedDate(
         title = _(u'Exam Date'),
         required = False,
@@ -279 +280 @@
         )
 
-    emp_start = schema.Date(
+    emp_start = FormattedDate(
         title = _(u'Start Date'),
         required = False,
@@ -285 +286 @@
         )
 
-    emp_end = schema.Date(
+    emp_end = FormattedDate(
         title = _(u'End Date'),
         required = False,
@@ -309 +310 @@
         )
 
-    emp2_start = schema.Date(
+    emp2_start = FormattedDate(
         title = _(u'Start Date'),
         required = False,
         readonly = False,
         )
-    emp2_end = schema.Date(
+    emp2_end = FormattedDate(
         title = _(u'End Date'),
         required = False,