Changeset 14082

Timestamp:

16 Aug 2016, 11:14:45 (8 years ago)

Author:

Henrik Bettermann

Message:

Add two property attributes: remark and final_remark.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• reports/tests/test_level_report.py (modified) (1 diff)
• reports/tests/test_raw_score_report.py (modified) (1 diff)
• studylevel.py (modified) (1 diff)

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

@@ -25 +25 @@
     def test_get_students(self):
         # we can get a table with one student
+        self.student['studycourse']['100']['Course1'].ca = 0
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'TESTER, Bob', 30, 30, 5.0, '', 30, 30, 5.0)])
+            [(u'1234', u'TESTER, Bob', 30, 30, 5.0, '', 30, 30, 5.0, 'Proceed')])
         return
 
     def test_create_pdf(self):
+        self.student['studycourse']['100']['Course1'].ca = 0
         report = LevelReport('fac1', 'dep1', 2010, 100)
         result = report.create_pdf()

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

@@ -42 +42 @@
     def test_get_students(self):
         # we can get a table with one student
+        self.student['studycourse']['100']['Course1'].ca = 0
         course_codes = get_courses('fac1', 'dep1', 2010, 100)
         result = get_students('fac1', 'dep1', 2010, 100, course_codes)

main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

@@ -116 +116 @@
         return False
 
+    # only AAUE
+    @property
+    def remark(self):
+        if self.cumulative_params[0] < 1.5:
+            return 'Probation'
+        if self.cumulative_params[0] < 5.1:
+            return 'Proceed'
+        return 'N/A'
+
+    # only AAUE
+    @property
+    def final_remark(self):
+        if self.cumulative_params[0] < 1.5:
+            return 'Fail'
+        if self.cumulative_params[0] < 2.4:
+            return 'Third Class (Honours)'
+        if self.cumulative_params[0] < 3.5:
+            return 'Second Class (Honours) Lower Division'
+        if self.cumulative_params[0] < 4.5:
+            return 'Second Class (Honours) Upper Division'
+        if self.cumulative_params[0] < 5.1:
+            return 'First Class Honours'
+        return 'N/A'
+
     def addCourseTicket(self, ticket, course):
         """Add a course ticket object.