Changeset 13859 for main/waeup.aaue/trunk

Timestamp:

11 May 2016, 07:26:30 (9 years ago)

Author:

Henrik Bettermann

Message:

Change table lines.

Catch error if current level is not in range.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/student_level_statistics.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/student_level_statistics.py

@@ -84 +84 @@
         row = paths.index(row_name)
         normalized_level = 100*(stud.current_level/100)
-        if stud.sex == 'f':
-            col = 2 * levels.index(normalized_level) + 1
-            total_col = -1
-        elif stud.sex == 'm':
-            col = 2 * levels.index(normalized_level)
-            total_col = -2
+        if stud.current_level and stud.current_level in range(100, 500, 10):
+            if stud.sex == 'f':
+                col = 2 * levels.index(normalized_level) + 1
+                total_col = -1
+            elif stud.sex == 'm':
+                col = 2 * levels.index(normalized_level)
+                total_col = -2
+            else:
+                continue
         else:
             continue
@@ -131 +134 @@
     ('FONT', (0,0), (-1,0), 'Helvetica-Bold', 8),
     ('FONT', (0,-1), (-1,-1), 'Helvetica-Bold', 8),
-    ('FONT', (-1,0), (-1,-1), 'Helvetica-Bold', 8),
+    #('FONT', (-1,0), (-1,-1), 'Helvetica-Bold', 8),
     ('ALIGN', (1,1), (-1,-1), 'RIGHT'),
     ('INNERGRID', (0,0), (-1,-1), 0.25, colors.black),
     ('LINEBELOW', (0,-1), (-1,-1), 0.25, colors.black),
-    ('LINEAFTER', (-1,0), (-1,-1), 0.25, colors.black),
-
+
+    ('LINEAFTER', (-1,0), (-1,-1), 1.0, colors.black),
     ('LINEBEFORE', (-2,0), (-2,-1), 1.0, colors.black),
+    ('LINEBEFORE', (-4,0), (-4,-1), 1.0, colors.black),
+    ('LINEBEFORE', (-6,0), (-6,-1), 1.0, colors.black),
+    ('LINEBEFORE', (-8,0), (-8,-1), 1.0, colors.black),
+    ('LINEBEFORE', (-10,0), (-10,-1), 1.0, colors.black),
+    ('LINEBEFORE', (-12,0), (-12,-1), 1.0, colors.black),
 
     ('LINEABOVE', (0,-1), (-1,-1), 1.0, colors.black),