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

Timestamp:

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

Author:

Henrik Bettermann

Message:

Use FormattedDate?.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (6 diffs)
• interfaces.py (modified) (3 diffs)

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

@@ -19 +19 @@
 """
 import grok
-from waeup.kofa.widgets.datewidget import (
-    FriendlyDateWidget, FriendlyDateDisplayWidget,
-    FriendlyDatetimeDisplayWidget)
 from waeup.uniben.widgets.phonewidget import PhoneWidget
 from waeup.kofa.applicants.interfaces import (
@@ -59 +56 @@
             form_fields = grok.AutoFields(IUGApplicant).omit(
                 'locked', 'course_admitted')
-        form_fields[
-            'date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -84 +79 @@
             form_fields = grok.AutoFields(IUGApplicant).omit(
                 'locked', 'course_admitted', 'password')
-        form_fields[
-            'date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -97 +90 @@
         if target is not None and target.startswith('pg'):
             form_fields = grok.AutoFields(IPGApplicant)
-            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(IUGApplicant)
-        form_fields[
-            'date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
         form_fields['phone'].custom_widget = PhoneWidget
         form_fields['student_id'].for_display = True
@@ -126 +109 @@
                 'screening_score', 'screening_venue'
                 )
-            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(IUGApplicantEdit).omit(
@@ -139 +114 @@
                 '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.uniben/trunk/src/waeup/uniben/applicants/interfaces.py

@@ -25 +25 @@
 from waeup.kofa.schoolgrades import ResultEntryField
 from waeup.kofa.interfaces import SimpleKofaVocabulary
+from waeup.kofa.schema import FormattedDate
 from waeup.kofa.students.vocabularies import nats_vocab
 from waeup.uniben.interfaces import (
     lgas_vocab, high_qual, high_grade, exam_types)
 from waeup.uniben.interfaces import MessageFactory as _
+
 
 class IUGApplicant(IApplicantBaseData):
@@ -150 +152 @@
         readonly = False,
         )
-    emp_start = schema.Date(
+    emp_start = FormattedDate(
         title = _(u'Start Date'),
         required = False,
         readonly = False,
         )
-    emp_end = schema.Date(
+    emp_end = FormattedDate(
         title = _(u'End Date'),
         required = False,
@@ -175 +177 @@
         readonly = False,
         )
-    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,