Changeset 14382 for main/waeup.kofa/trunk/src/waeup/kofa/students/reports

Timestamp:

10 Jan 2017, 18:33:30 (8 years ago)

Author:

Henrik Bettermann

Message:

Exchange level and session on report slips.

Use sting formatting for displaying GPA values.

Location:

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

Files:

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

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

@@ -71 +71 @@
                 passed_params[2],
                 passed_params[5],
-                level_obj.gpa,
+                '%.2f' % (int(100*level_obj.gpa)/100.0),
                 failed_courses,
                 level_obj.cumulative_params[1],
                 level_obj.cumulative_params[4],
-                level_obj.cumulative_params[0],
+                '%.3f' % (int(1000*level_obj.cumulative_params[0])/1000.0),
                 remark,
                 )
@@ -115 +115 @@
             'S/N',
             'Matric No.',
-            'Name',
+            translate(_('Student Name')),
             TTR(translate(_('Total Credits Taken'))),
             TTR(translate(_('Total Credits Passed'))),
@@ -197 +197 @@
         pdf_data += [Paragraph(
                     translate(
-                        '${a}<br />${b}<br />Level: ${c}<br />Session: ${d}',
+                        '${a}<br />${b}<br />Session: ${c}<br />Level: ${d}',
                         mapping = {'a':self.factitle,
                                    'b':self.deptitle,
-                                   'c':self.level,
-                                   'd':self.session, }),
+                                   'c':self.session,
+                                   'd':self.level,
+                                   }),
                     STYLE["Normal"]),
                     Spacer(1, 12),]

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

@@ -150 +150 @@
                               STYLE["Normal"]),
                     Spacer(1, 12),]
-        pdf_data += [Paragraph('%s<br />%s<br />Level: %s<br />Session: %s' % (
-                    self.factitle, self.deptitle, self.level, self.session),
+        pdf_data += [Paragraph('%s<br />%s<br />Session: %s<br />Level: %s' % (
+                    self.factitle, self.deptitle, self.session, self.level),
                     STYLE["Normal"]),
                     Spacer(1, 12),]
@@ -175 +175 @@
         pdf_data += [Paragraph('<strong>Summary</strong>', STYLE["Normal"])]
         pdf_data.append(Spacer(1, 10))
+        total_count = 0
         for gpa_class in range(len(students_utils.gpa_boundaries)-1,-1,-1):
             gpa_class_name = students_utils.gpa_boundaries[gpa_class][1]
             gpa_count = len(self.data[gpa_class])
+            total_count += gpa_count
             pdf_data += [Paragraph('%s: %s'
                          % (gpa_class_name, gpa_count), STYLE["Normal"])]
             pass
+        pdf_data += [Paragraph('Total: %s' % (total_count), STYLE["Normal"])]
 
         doc_title = translate(_('Presentation of Session Results'))

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

@@ -41 +41 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', 90, 30, 0, 1.667, 'm_Course2_m Course3',
-              90, 30, 1.667, '')])
+            [(u'1234', u'Bob Tester', 90, 30, 0, '1.66',
+            'm_Course2_m Course3', 90, 30, '1.666', '')])
         return