Changeset 17834

Timestamp:

8 Jul 2024, 15:48:12 (6 months ago)

Author:

Henrik Bettermann

Message:

Improve NYSCExporter.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• browser.py (modified) (2 diffs)
• export.py (modified) (2 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -1089 +1089 @@
         form_fields = grok.AutoFields(INYSC)
         form_fields['nysc_updated'].for_display = True
-        form_fields['nysc_senate_info'].for_display = True
+        #form_fields['nysc_senate_info'].for_display = True
         form_fields['nysc'].field.description = u'Ensure that all your school charges are paid up to date to your graduating session before making this nysc application.'
         form_fields['nysc'].field.title = u'Do you want to apply for NYSC?'
@@ -1095 +1095 @@
             'nysc_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
         form_fields['nysc'].custom_widget = CustomBooleanRadioWidget
-        form_fields['nysc_senate_info'].field.description = u''
+        form_fields['nysc_senate_info'].field.description = u'Sample: Meeting Date: 10TH MAY 2023. DEG CLASS: FIRST CLASS. S/NO: 01'
+        #form_fields['nysc_senate_info'].field.description = u''
         return form_fields
 

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

@@ -194 +194 @@
         'date_of_birth',
         'state',
+        'lg_state',
+        'lg_area',
         'current_mode',
         'certcode',
@@ -217 +219 @@
                 students.append(student)
         return students
+
+    def mangle_value(self, value, name, context=None):
+        if name == 'lg_state' and context.lga:
+            value = context.lga.split('_')[0]
+        if name == 'lg_area' and context.lga:
+            value = '-'.join(context.lga.split('_')[1:])
+        return super(
+            NYSCExporter, self).mangle_value(
+            value, name, context=context)

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py

@@ -178 +178 @@
         self.setup_student(self.student)
         self.student.nysc = True
+        self.student.lga = u'xyz_abc'
         exporter = NYSCExporter()
         exporter.export_all(self.app, self.outfile)
@@ -183 +184 @@
         self.assertMatches(
             'student_id,matric_number,reg_number,firstname,middlename,lastname,'
-            'sex,nationality,date_of_birth,state,current_mode,certcode,faccode,'
+            'sex,nationality,date_of_birth,state,lg_state,lg_area,current_mode,certcode,faccode,'
             'depcode,current_level,current_session,current_verdict,'
-            'entry_sessionfaccode,depcode,certcode,'
+            'entry_session,faccode,depcode,certcode,'
             'nysc_senate_info,nysc_date_of_graduation,nysc_updated,%s\r\n'
-            'A111111,234,123,Anna,M.,Tester,f,NG,1981-02-04#,created,ug_ft,'
-            'CERT1,NA,NA,200,2012,0,,NA,CERT1,,,,,,,,,12.12,,,,,,\r\n' % year_range_str,
+            'A111111,234,123,Anna,M.,Tester,f,NG,1981-02-04#,created,xyz,abc,ug_ft,'
+            'CERT1,NA,NA,200,2012,0,2010,NA,NA,CERT1,,,,,,,,,12.12,,,,,,\r\n' % year_range_str,
             result
             )