Changeset 8160

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

Files:

• accesscodes/interfaces.py (modified) (2 diffs)
• applicants/browser.py (modified) (7 diffs)
• applicants/interfaces.py (modified) (1 diff)
• payments/interfaces.py (modified) (3 diffs)
• students/batching.py (modified) (2 diffs)
• students/browser.py (modified) (9 diffs)
• students/export.py (modified) (1 diff)
• students/interfaces.py (modified) (4 diffs)
• students/tests/sample_payment_data.csv (modified) (1 diff)

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

@@ -22 +22 @@
 from waeup.kofa.interfaces import IKofaObject
 from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.schema import FormattedDate
 
 class IAccessCode(IKofaObject):
@@ -60 +61 @@
     """A factory for batches of access codes.
     """
-    creation_date = schema.Date(
+    creation_date = FormattedDate(
         title = _(u'Creation date'),
         )

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,
         )
 

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(
@@ -68 +69 @@
         )
 
-    creation_date = schema.Datetime(
+    creation_date = FormattedDatetime(
         title = _(u'Ticket Creation Date'),
         readonly = False,
         )
 
-    payment_date = schema.Datetime(
+    payment_date = FormattedDatetime(
         title = _(u'Payment Date'),
         required = False,
@@ -171 +172 @@
         readonly = False,
         )
+
+class IOnlinePaymentImportExport(IOnlinePayment):
+    """A base representation of payments.
+
+    """
+
+    creation_date = schema.Datetime(
+        title = _(u'Ticket Creation Date'),
+        readonly = False,
+        )
+
+    payment_date = schema.Datetime(
+        title = _(u'Payment Date'),
+        required = False,
+        readonly = False,
+        )
+
+

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

@@ -40 +40 @@
     IStudentUpdateByRegNo, IStudentUpdateByMatricNo,
     IStudentStudyLevel, ICourseTicket,
-    IStudentOnlinePayment, IStudentVerdictUpdate)
+    IStudentOnlinePaymentImportExport, IStudentVerdictUpdate)
 from waeup.kofa.students.workflow import  IMPORTABLE_STATES
 from waeup.kofa.utils.batching import BatchProcessor
@@ -539 +539 @@
 
     name = u'Payment Processor'
-    iface = IStudentOnlinePayment
+    iface = IStudentOnlinePaymentImportExport
     factory_name = 'waeup.StudentOnlinePayment'
 

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 (
-    FriendlyDateWidget, FriendlyDateDisplayWidget,
-    FriendlyDatetimeDisplayWidget)
+from waeup.kofa.widgets.datewidget import FriendlyDateDisplayWidget
 from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
 from waeup.kofa.widgets.phonewidget import PhoneWidget
@@ -419 +417 @@
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -442 +439 @@
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
         return form_fields
 
@@ -487 +483 @@
         else:
             form_fields = grok.AutoFields(IUGStudentClearance)
-        form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
         return form_fields
 
@@ -1119 +1114 @@
     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
 
@@ -1189 +1180 @@
     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'
@@ -1376 +1367 @@
     grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IBedTicket)
-    form_fields[
-        'booking_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     pnav = 4
 
@@ -1392 +1381 @@
     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'
 
@@ -1643 +1632 @@
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
-        form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
         return form_fields
 

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

@@ -29 +29 @@
 
 class StudentsExporter(grok.GlobalUtility, ExporterBase):
-    """Exporter for Applicants.
+    """Exporter for Students.
     """
     grok.implements(ICSVExporter)

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
+from waeup.kofa.schema import TextLineChoice, FormattedDate, FormattedDatetime
 from waeup.kofa.students.vocabularies import (
     StudyLevelSource, contextual_reg_num_source, contextual_mat_num_source,
     GenderSource, nats_vocab,
     )
-from waeup.kofa.payments.interfaces import IPaymentsContainer, IOnlinePayment
+from waeup.kofa.payments.interfaces import (
+    IPaymentsContainer, IOnlinePayment, IOnlinePaymentImportExport)
 from waeup.kofa.university.vocabularies import (
     CourseSource, StudyModeSource, CertificateSource)
@@ -215 +216 @@
 
     """
-    date_of_birth = schema.Date(
+    date_of_birth = FormattedDate(
         title = _(u'Date of Birth'),
         required = True,
+        show_year = True,
         )
 
@@ -465 +467 @@
         )
 
-    booking_date = schema.Datetime(
+    booking_date = FormattedDatetime(
         title = _(u'Booking Date'),
         required = False,
@@ -500 +502 @@
     'p_item'].order
 
+
+class IStudentOnlinePaymentImportExport(IOnlinePaymentImportExport):
+    """A student payment for import and export.
+
+    """
+    p_session = schema.Choice(
+        title = _(u'Payment Session'),
+        source = academic_sessions_vocab,
+        required = False,
+        )
+
 class IStudentChangePassword(IKofaObject):
     """Interface needed for change pasword page.
 
     """
-
     reg_number = schema.TextLine(
         title = _(u'Registration Number'),

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_payment_data.csv

@@ -1 +1 @@
 p_state,p_category,r_pay_reference,r_desc,p_id,reg_number,session_id,r_amount_approved,p_item,amount_auth,r_card_num,r_code,creation_date,type,surcharge_1
 paid,schoolfee,GTB|WEB|FUT|26-11-2010|002295,Approved Successful,3816951290797973744#,1,2010,19500,BTECHBDT,19500,0942,00,2010/11/26 19:59:33.744 GMT+1,online,0
-unpaid,schoolfee,GTB|WEB|FUT|25-11-2010|,Transaction status unconfirmed,3816951290712593757,2,2010,0,BTECHBDT,19500,0942,Z0,2010/11/25 20:16:33.757 GMT+1,online,0
-paid,schoolfee,UBA|WEB|FUT|15-02-2010|000517,Approved Successful,p1266236341955,3,2009,19500,BTECHBDT,19500,0615,00,2010/02/15 13:19:01.955 GMT+1,online,0
+unpaid,schoolfee,GTB|WEB|FUT|25-11-2010|,Transaction status unconfirmed,3816951290712593757,2,2010,0,BTECHBDT,19500,0942,Z0,2010-11-25 20:16:33.757 GMT+1,online,0
+paid,schoolfee,UBA|WEB|FUT|15-02-2010|000517,Approved Successful,p1266236341955,3,2009,19500,BTECHBDT,19500,0615,00,2010/02/15 13:19:01,online,0