Changeset 8170 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

16 Apr 2012, 07:39:11 (13 years ago)

Author:

uli

Message:

Stamp FormattedDatetime? out completely.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (4 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -45 +45 @@
     IKofaUtils, IUniversity)
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.widgets.datewidget import FriendlyDateDisplayWidget
+from waeup.kofa.widgets.datewidget import (
+    FriendlyDateWidget, FriendlyDateDisplayWidget,
+    FriendlyDatetimeDisplayWidget)
 from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
 from waeup.kofa.widgets.phonewidget import PhoneWidget
@@ -1114 +1116 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentOnlinePayment)
+    form_fields[
+        'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    form_fields[
+        'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     pnav = 4
 
@@ -1180 +1186 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentOnlinePayment)
-    #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'
     title = 'Payment Data'
@@ -1381 +1387 @@
     grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IBedTicket)
-    #form_fields['booking_date'].custom_widget = FriendlyDateDisplayWidget('le')
+    form_fields['booking_date'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
 

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

@@ -24 +24 @@
     IKofaObject, academic_sessions_vocab, validate_email, IKofaUtils)
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.schema import TextLineChoice, FormattedDate, FormattedDatetime
+from waeup.kofa.schema import TextLineChoice, FormattedDate
 from waeup.kofa.students.vocabularies import (
     StudyLevelSource, contextual_reg_num_source, contextual_mat_num_source,
@@ -467 +467 @@
         )
 
-    booking_date = FormattedDatetime(
+    booking_date = schema.Datetime(
         title = _(u'Booking Date'),
         required = False,