Changeset 9684 for main/waeup.kofa/trunk/src/waeup/kofa/students/tests

Timestamp:

19 Nov 2012, 11:16:54 (12 years ago)

Author:

Henrik Bettermann

Message:

Calculate grade and weight from score and show on courseticketpage only if score attribute is set.

Location:

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

Files:

• test_browser.py (modified) (2 diffs)
• test_export.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -752 +752 @@
         self.browser.getLink("COURSE1").click()
         self.browser.getLink("Manage").click()
-        self.browser.getControl(name="form.score").value = '10'
+        #self.browser.getControl(name="form.score").value = '10'
         self.browser.getControl("Save").click()
         self.assertTrue('Form has been saved' in self.browser.contents)
+        # Grade and weight have been determined
+        self.browser.open(self.studycourse_path + '/100/COURSE1')
+        self.assertFalse('Grade' in self.browser.contents)
+        self.assertFalse('Weight' in self.browser.contents)
+        self.student['studycourse']['100']['COURSE1'].score = 55
+        self.browser.open(self.studycourse_path + '/100/COURSE1')
+        self.assertTrue('Grade' in self.browser.contents)
+        self.assertTrue('Weight' in self.browser.contents)
+        self.assertEqual(self.student['studycourse']['100']['COURSE1'].grade, 'C')
+        self.assertEqual(self.student['studycourse']['100']['COURSE1'].weight, 3)
         # Carry-over courses will be collected when next level is created
         self.browser.open(self.student_path + '/studycourse/manage')
         # Add next level
+        self.student['studycourse']['100']['COURSE1'].score = 10
         self.browser.getControl(name="addlevel").value = ['200']
         self.browser.getControl(name="level_session").value = ['2005']
@@ -764 +775 @@
         self.assertMatches(
             '...: Study Level 200 (Year 2)...', self.browser.contents)
-        # COURSE1 has score 0 and thus will become a carry-over course
+        # If COURSE1 has score 10 it becomes a carry-over course
         # in level 200
         self.assertEqual(

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -303 +303 @@
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
             'passmark,score,semester,title,student_id,certcode\r\n'
-            '0,0,,,,,,0,,0,,,,\r\n'
+            '0,0,,,,,,0,,,,,,\r\n'
             )
         return
@@ -321 +321 @@
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
             'passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,,2,Course 1,A111111,CERT1\r\n'
             )
         return
@@ -336 +336 @@
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
             'passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,,2,Course 1,A111111,CERT1\r\n'
             )
         return
@@ -350 +350 @@
             'automatic,carry_over,code,credits,dcode,fcode,level,mandatory,'
             'passmark,score,semester,title,student_id,certcode\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,0,100,0,2,Course 1,A111111,CERT1\r\n'
+            '1,1,CRS1,100,DEP1,FAC1,100,0,100,,2,Course 1,A111111,CERT1\r\n'
             )
         return