Changeset 10615

Timestamp:

11 Sep 2013, 05:47:55 (11 years ago)

Author:

Henrik Bettermann

Message:

Sort on matric number and replace student id be serial number.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py (modified) (5 diffs)

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

@@ -56 +56 @@
             continue
         passed_params = level_obj.passed_params
-        line = (stud.student_id,
+        line = (
+                #stud.student_id,
                 stud.matric_number,
                 stud.display_fullname,
@@ -65 +66 @@
                 )
         table.append(line)
-    return table
+    return sorted(table, key=lambda value:value[1])
 
 from reportlab.lib import colors
@@ -97 +98 @@
 def tbl_data_to_table(data):
     result = []
-    col_names = ('Student Id', 'Matric No.', 'Name',
-                     TTR('Total Credits'), TTR('Total Credits Passed'),
-                     TTR('GPA'), 'Courses Failed')
+    col_names = (
+            #'Student Id',
+            'S/N',
+            'Matric No.',
+            'Name',
+            TTR('Total Credits'),
+            TTR('Total Credits Passed'),
+            TTR('GPA'),
+            'Courses Failed')
     table = [col_names]
+    sn = 1
     for line in data:
+        line = (sn,) + line
         table.append(line)
+        sn += 1
     return table
 
@@ -112 +122 @@
     #('FONT', (-1,0), (-1,-1), 'Helvetica-Bold', 8), # last column
     ('ALIGN', (3,1), (-1,-1), 'RIGHT'),
-    #('ALIGN', (1,0), (1,-1), 'LEFT'),
-    #('ALIGN', (2,0), (2,-1), 'LEFT'),
+    ('ALIGN', (0,0), (0,-1), 'RIGHT'),
     ('ALIGN', (6,0), (6,-1), 'LEFT'),
     ('INNERGRID', (0,1), (-1,-1), 0.25, colors.black),
@@ -148 +157 @@
         table_data = tbl_data_to_table(self.data)
         #col_widths = [3.5*cm] * len(self.data[0])
-        col_widths = [2*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm, 6*cm, ]
+        col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm, 6*cm, ]
         pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
                               STYLE["Normal"]),