Changeset 14532 for main/waeup.aaue/trunk/src/waeup/aaue/students/reports

Timestamp:

10 Feb 2017, 17:03:20 (8 years ago)

Author:

Henrik Bettermann

Message:

If ticket.score is set to '-1', total_score will be 0 and the grade is '-'.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py (modified) (3 diffs)

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

@@ -37 +37 @@
         # we can get a list with one course code
         result = get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
-        self.assertEqual(result, [(u'Course1')])
+        self.assertEqual(result, [u'Course1'])
         return
 
@@ -54 +54 @@
 
     def test_create_pdf(self):
-        self.course = createObject('waeup.Course')
-        self.course.code = 'Course2'
-        self.course.credits = 30
+        self.course2 = createObject('waeup.Course')
+        self.course2.code = 'Course2'
+        self.course2.credits = 30
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
-            self.course)
+            self.course2)
         self.app['faculties']['fac1']['dep1'].certificates[
-            'CERT1'].addCertCourse(self.course, level=100)
+            'CERT1'].addCertCourse(self.course2, level=100)
+        self.course3 = createObject('waeup.Course')
+        self.course3.code = 'Course3'
+        self.course3.credits = 30
+        self.app['faculties']['fac1']['dep1'].courses.addCourse(
+            self.course3)
+        self.app['faculties']['fac1']['dep1'].certificates[
+            'CERT1'].addCertCourse(self.course3, level=100)
         self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
         self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
@@ -73 +80 @@
         ticket.ca = 10
         self.student['studycourse']['200']['Course2'] = ticket
+        ticket = createObject('waeup.CourseTicket')
+        ticket.code = 'Course3'
+        ticket.credits = 30
+        # core course, no result available
+        ticket.score = -1
+        ticket.ca = 0
+        self.student['studycourse']['200']['Course3'] = ticket
+        self.assertEqual(ticket.grade, '-')
         self.student.firstname = u'Osahenokese Tessy'
         self.student.lastname = u'Emwinyomwanru'