Changeset 12107 for main/kofacustom.nigeria/trunk/src/kofacustom

Timestamp:

1 Dec 2014, 16:13:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Add date_of_invitation field.

Add ClearanceRequestedStudentExporter?. This exports students in state 'clearance_requested' and is mainly meant for reimporting invitation dates.

Tests will follow.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

• browser.py (modified) (1 diff)
• export.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• tests/test_export.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py

@@ -154 +154 @@
         if self.context.is_postgrad:
             form_fields = grok.AutoFields(INigeriaPGStudentClearance).omit(
-            'clearance_locked', 'nysc_location', 'clr_code', 'officer_comment')
+            'clearance_locked', 'nysc_location', 'clr_code', 'officer_comment',
+            'date_of_invitation')
         else:
             form_fields = grok.AutoFields(INigeriaUGStudentClearance).omit(
-            'clearance_locked', 'clr_code', 'officer_comment')
+            'clearance_locked', 'clr_code', 'officer_comment',
+            'date_of_invitation')
         return form_fields
 

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/export.py

@@ -18 +18 @@
 """Exporters for student related stuff.
 """
+import grok
+from waeup.kofa.interfaces import REQUESTED
 from kofacustom.nigeria.students.interfaces import (
     INigeriaStudent,
@@ -31 +33 @@
     StudentPaymentsExporter)
 from waeup.kofa.utils.helpers import iface_names
+from kofacustom.nigeria.interfaces import MessageFactory as _
 
 class NigeriaStudentExporter(StudentExporter):
@@ -84 +87 @@
             omit=['display_item']))) + (
             'student_id','state','current_session')
+
+class ClearanceRequestedStudentExporter(StudentExporter):
+    """Exporter of data used to assign dates of invitation
+    """
+
+    grok.name('clearancerequested')
+
+    fields = ('student_id', 'reg_number', 'display_fullname',
+              'state', 'current_session', 'history', 'date_of_invitation')
+
+    title = _(u'Clearance Invitation Data')
+
+    def filter_func(self, x, **kw):
+        # We use this method to post-filter students in state
+        # 'clearance_requested'
+        return [student for student in x if student.state == REQUESTED]
+
+    def mangle_value(self, value, name, context=None):
+        if name == 'history':
+            # Only show last mesage
+            value = value.messages[-1]
+        return super(
+            StudentExporter, self).mangle_value(
+            value, name, context=context)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/interfaces.py

@@ -68 +68 @@
         )
 
+    date_of_invitation= schema.TextLine(
+        title = _(u"Date of Invitation"),
+        required = False,
+        )
+
     clearance_locked = schema.Bool(
         title = _(u'Clearance form locked'),

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -48 +48 @@
         self.assertMatches(
             'adm_code,alr_date,alr_fname,alr_no,alr_results,clearance_locked,'
-            'clr_code,date_of_birth,def_adm,disabled,email,emp2_end,'
+            'clr_code,date_of_birth,date_of_invitation,def_adm,disabled,email,emp2_end,'
             'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
             'emp_reason,emp_start,employer,employer2,firstname,former_matric,'
@@ -63 +63 @@
             'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
             'current_level,current_session\r\nmy adm code,,,,'
-            '"[(\'accounts\', \'A\')]",0,my clr code,1981-02-04#,,,'
+            '"[(\'accounts\', \'A\')]",0,my clr code,1981-02-04#,,,,'
             'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'accounts\', \'A\')]"'
             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/utils.py

@@ -65 +65 @@
         'form.former_matric': _(u'Former Student'),
         }
+
+    STUDENT_EXPORTER_NAMES = StudentsUtils().STUDENT_EXPORTER_NAMES + (
+            'clearancerequested',)