Changeset 14124

Timestamp:

24 Aug 2016, 10:14:06 (8 years ago)

Author:

Henrik Bettermann

Message:

Underline mandatory (core) courses.

If one mandatory course has been failed, the final remark is 'FRNS'.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students/reports

Files:

• level_report.py (modified) (3 diffs)
• tests/test_level_report.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -62 +62 @@
         certificate = getattr(stud['studycourse'],'certificate',None)
         end_level = certificate.end_level
+        # This is a very special column requested by AAUE, Nigeria.
+        # The 'remark' column remains empty in base package.
         if stud.current_level >= end_level:
             remark = getattr(level_obj, 'final_remark', None)
+            if '_m' in failed_courses:
+                remark = 'FRNS'
         else:
             remark = getattr(level_obj, 'remark', None)
@@ -90 +94 @@
 from waeup.kofa.reports import Report
 from waeup.kofa.browser.interfaces import IPDFCreator
+from waeup.kofa.browser.pdf import SMALL_PARA_STYLE
 
 STYLE = getSampleStyleSheet()
@@ -127 +132 @@
     sn = 1
     for line in data:
+        # Underline mandatory (core) courses
+        failed_courses = Paragraph(
+            line[5].replace('m_', '<u>').replace('_m', '</u>'), SMALL_PARA_STYLE)
+        line = line[:5] + (failed_courses,) + line[6:]
+        import pdb; pdb.set_trace()
         line = (sn,) + line
         table.append(line)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_level_report.py

@@ -2 +2 @@
 from zc.async.testing import wait_for_result
 from zope.interface.verify import verifyClass, verifyObject
-from zope.component import getUtility
+from zope.component import getUtility, createObject
 from waeup.kofa.interfaces import IJobManager
 from waeup.kofa.students.reports.level_report import (
@@ -24 +24 @@
 
     def test_get_students(self):
+        ticket = createObject('waeup.CourseTicket')
+        ticket.code = 'Course2'
+        ticket.credits = 30
+        ticket.score = 30
+        ticket.mandatory = True
+        ticket.passmark = 40
+        self.student['studycourse']['100']['Course2'] = ticket
+        ticket = createObject('waeup.CourseTicket')
+        ticket.code = 'Course3'
+        ticket.credits = 30
+        ticket.score = 30
+        ticket.mandatory = False
+        ticket.passmark = 40
+        self.student['studycourse']['100']['Course3'] = ticket
         # we can get a table with one student
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', 30, 30, 5.0, '', 30, 30, 5.0, None)])
+            [(u'1234', u'Bob Tester', 90, 30, 1.667, 'm_Course2_m Course3',
+              90, 30, 1.667, None)])
         return
 
     def test_create_pdf(self):
+        ticket = createObject('waeup.CourseTicket')
+        ticket.code = 'Course2'
+        ticket.credits = 30
+        ticket.score = 30
+        ticket.mandatory = True
+        ticket.passmark = 40
+        self.student['studycourse']['100']['Course2'] = ticket
+        ticket = createObject('waeup.CourseTicket')
+        ticket.code = 'Course3'
+        ticket.credits = 30
+        ticket.score = 30
+        ticket.mandatory = False
+        ticket.passmark = 40
+        self.student['studycourse']['100']['Course3'] = ticket
         report = LevelReport('fac1', 'dep1', 2010, 100)
         result = report.create_pdf()