Changeset 17835 for main

Timestamp:

8 Jul 2024, 16:05:10 (2 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)
• interfaces.py (modified) (2 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -1095 +1095 @@
             'nysc_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
         form_fields['nysc'].custom_widget = CustomBooleanRadioWidget
-        form_fields['nysc_senate_info'].field.description = u'Sample: Meeting Date: 10TH MAY 2023. DEG CLASS: FIRST CLASS. S/NO: 01'
+        form_fields['nysc_processed'].for_display = True
         #form_fields['nysc_senate_info'].field.description = u''
         return form_fields
@@ -1119 +1119 @@
         form_fields['nysc'].field.description = u''
         form_fields['nysc'].field.title = u'NYSC requested'
-        form_fields['nysc_senate_info'].field.description = u'Sample: Meeting Date: 10TH MAY 2023. DEG CLASS: FIRST CLASS. S/NO: 01'
         form_fields[
             'nysc_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')

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

@@ -210 +210 @@
         'nysc_date_of_graduation',
         'nysc_updated',
+        'nysc_processed',
         ) + year_range_tuple
     title = u'NYSC Indication'
@@ -216 +217 @@
         students = list()
         for student in x:
-            if student.nysc == True:
+            if student.nysc == True and student.nysc_processed == False:
                 students.append(student)
         return students

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

@@ -226 +226 @@
         )
 
+    nysc_processed = schema.Bool(
+        title = u'NYSC processed',
+        default = False,
+        required = True,
+        )
+
     nysc_updated = schema.Datetime(
         title = _(u'NYSC request data last updated by student'),
@@ -239 +245 @@
         title = _(u'Senate Info'),
         required = False,
+        description = u'Sample: Meeting Date: 10TH MAY 2023. DEG CLASS: FIRST CLASS. S/NO: 01',
         )
 

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.nysc_processed = False
         self.student.lga = u'xyz_abc'
         exporter = NYSCExporter()
@@ -187 +188 @@
             'depcode,current_level,current_session,current_verdict,'
             'entry_session,faccode,depcode,certcode,'
-            'nysc_senate_info,nysc_date_of_graduation,nysc_updated,%s\r\n'
+            'nysc_senate_info,nysc_date_of_graduation,nysc_updated,nysc_processed,%s\r\n'
             '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,
+            'CERT1,NA,NA,200,2012,0,2010,NA,NA,CERT1,,,,0,,,,,,12.12,,,,,,\r\n' % year_range_str,
             result
             )