Changeset 16239

Timestamp:

17 Sep 2020, 07:16:01 (4 years ago)

Author:

Henrik Bettermann

Message:

Revert changes of last revision.

Location:

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

Files:

• raw_score_report.py (modified) (4 diffs)
• tests/test_raw_score_report.py (modified) (1 diff)

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

@@ -65 +65 @@
         course = certcourse.course
         if certcourse.course_category:
-            col_names += (TTR('%s (%s)' % (
-                course.code, certcourse.course_category)),)
+            col_names += (TTR('%s (%s, %s)' % (
+                course.code, course.credits, certcourse.course_category)),)
         else:
-            col_names += (TTR('%s' % (course.code,)),)
+            col_names += (TTR('%s (%s)' % (course.code, course.credits)),)
     table = [col_names]
     sn = 1
@@ -79 +79 @@
                 scores += ('N/R',)
             else:
-                scores += ('%s %s (%s)' % (result[0], result[1], result[2]),)
+                scores += ('%s %s' % (result[0], result[1]),)
         composed_line += scores
         table.append(composed_line)
@@ -124 +124 @@
     @property
     def col_width(self):
-        return [1*cm, 4*cm, 5*cm] + [1.5*cm] * len(self.certcourses)
+        return [1*cm, 4*cm, 5*cm] + [1*cm] * len(self.certcourses)
 
     @property
@@ -188 +188 @@
                 if ticket.code in [i.course.code for i in certcourses]:
                     if ticket.total_score is not None:
-                        scores[ticket.code] = (ticket.total_score, ticket.grade,
-                                               ticket.credits)
+                        scores[ticket.code] = (ticket.total_score, ticket.grade)
                     else:
-                        scores[ticket.code] = ('Nil', '', '')
+                        scores[ticket.code] = ('Nil', '')
             fullname = textwrap.fill(stud.display_fullname, 26)
             line = (

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

@@ -52 +52 @@
             'fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', {'Course1': (70, 'A', 30)})])
+            [(u'1234', u'Bob Tester', {'Course1': (70, 'A')})])
         self.student['studycourse']['100']['Course1'].score = None
         result = rsr._get_students(
             'fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', {'Course1': ('Nil', '', '')})])
+            [(u'1234', u'Bob Tester', {'Course1': ('Nil', '')})])
         return