Changeset 10578

Timestamp:

2 Sep 2013, 07:39:50 (11 years ago)

Author:

Henrik Bettermann

Message:

Print gpa class above each table.

Location:

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

Files:

• reports/session_results_presentation.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -140 +140 @@
                     STYLE["Normal"]),
                     Spacer(1, 12),]
-
-        for table in self.data:
+        students_utils = getUtility(IStudentsUtils)
+
+
+        gpa_class = 0
+        for table in self.data[:-1]:
+            pdf_data.append(Spacer(1, 20))
+            gpa_class_name = students_utils.gpa_boundaries[gpa_class][1]
+            pdf_data += [Paragraph('<strong>%s</strong>' % gpa_class_name,
+                         STYLE["Normal"])]
             table_data = [('Student Id', 'Matric No.', 'Name')] + table
+            pdf_data += [Table(table_data, style=TABLE_STYLE)]    #, colWidths=col_widths)]
+            gpa_class += 1
+
+        # XXX: Not yet supported by by generator page
+        if self.data[-1]:
+            pdf_data.append(Spacer(1, 20))
             pdf_data += [
-                Table(table_data, style=TABLE_STYLE)]    #, colWidths=col_widths)]
+                Paragraph('<strong>Erroneous Data</strong>', STYLE["Normal"])]
+            table_data = [('Student Id', 'Matric No.', 'Name')] + self.data[-1]
+            pdf_data += [Table(table_data, style=TABLE_STYLE)]
+
         doc_title = 'Presentation of Session Results'
-
         pdf_data.append(Spacer(1, 40))
-        signatures = ['Ag. Head of Department', 'External Examiner', 'Dean of Faculty']
+        signatures = ['Ag. Head of Department',
+                      'External Examiner', 'Dean of Faculty']
         signaturetables = get_signature_tables(signatures)
         pdf_data.append(signaturetables[0])

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

@@ -663 +663 @@
         return pdf_stream
 
-    gpa_boundaries = (1, 1.5, 2.4, 3.5, 4.5, 5)
+    gpa_boundaries = ((1, 'Fail'),
+                      (1.5, 'Pass'),
+                      (2.4, '3rd Class'),
+                      (3.5, '2nd Class Lower'),
+                      (4.5, '2nd Class Upper'),
+                      (5, '1st Class'))
 
     def getClassFromCGPA(self, gpa):
-        if gpa < self.gpa_boundaries[0]:
-            return 0, 'Fail'
-        if gpa < self.gpa_boundaries[1]:
-            return 1, 'Pass'
-        if gpa < self.gpa_boundaries[2]:
-            return 2, '3rd Class'
-        if gpa < self.gpa_boundaries[3]:
-            return 3, '2nd Class Lower'
-        if gpa < self.gpa_boundaries[4]:
-            return 4, '2nd Class Upper'
-        if gpa <= self.gpa_boundaries[5]:
-            return 5, '1st Class'
-        return 999, 'N/A'
+        if gpa < self.gpa_boundaries[0][0]:
+            return 0, self.gpa_boundaries[0][1]
+        if gpa < self.gpa_boundaries[1][0]:
+            return 1, self.gpa_boundaries[1][1]
+        if gpa < self.gpa_boundaries[2][0]:
+            return 2, self.gpa_boundaries[2][1]
+        if gpa < self.gpa_boundaries[3][0]:
+            return 3, self.gpa_boundaries[3][1]
+        if gpa < self.gpa_boundaries[4][0]:
+            return 4, self.gpa_boundaries[4][1]
+        if gpa <= self.gpa_boundaries[5][0]:
+            return 5, self.gpa_boundaries[5][1]
+        return 'N/A'
 
     def renderPDFTranscript(self, view, filename='transcript.pdf',