Changeset 8170

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

Files:

• applicants/browser.py (modified) (4 diffs)
• payments/interfaces.py (modified) (3 diffs)
• students/browser.py (modified) (4 diffs)
• students/interfaces.py (modified) (2 diffs)

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 FriendlyDateDisplayWidget
+from waeup.kofa.widgets.datewidget import (
+    FriendlyDateDisplayWidget, FriendlyDateDisplayWidget,
+    FriendlyDatetimeDisplayWidget)
 from waeup.kofa.widgets.phonewidget import PhoneWidget
 from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
@@ -489 +491 @@
     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
 
@@ -494 +500 @@
     def label(self):
         return _('${a}: Online Payment Ticket ${b}', mapping = {
-            'a':self.context.__parent__.display_fullname, 'b':self.context.p_id})
+            'a':self.context.__parent__.display_fullname,
+            'b':self.context.p_id})
 
 class OnlinePaymentCallbackPage(UtilityView, grok.View):
@@ -534 +541 @@
     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'
 

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

@@ -20 +20 @@
 from waeup.kofa.interfaces import IKofaObject, SimpleKofaVocabulary
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.schema import FormattedDatetime
 
 payment_states = SimpleKofaVocabulary(
@@ -69 +68 @@
         )
 
-    creation_date = FormattedDatetime(
+    creation_date = schema.Datetime(
         title = _(u'Ticket Creation Date'),
         readonly = False,
         )
 
-    payment_date = FormattedDatetime(
+    payment_date = schema.Datetime(
         title = _(u'Payment Date'),
         required = False,
@@ -188 +187 @@
         readonly = False,
         )
-
-

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,