Changeset 9684

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

Files:

• browser.py (modified) (1 diff)
• browser_templates/courseticketpage.pt (added)
• interfaces.py (modified) (3 diffs)
• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• tests/test_export.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1286 +1286 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(ICourseTicket)
+    grok.template('courseticketpage')
     pnav = 4
 

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -522 +522 @@
     code = Attribute('code of the original course')
     certcode = Attribute('certificate code of the study course')
+    grade = Attribute('grade calculated from score')
+    weight = Attribute('weight calculated from score')
 
     title = schema.TextLine(
@@ -562 +564 @@
     score = schema.Int(
         title = _(u'Score'),
-        default = 0,
+        default = None,
         required = False,
         )
@@ -578 +580 @@
         )
 
-
     def getLevel():
         """Returns the id of the level the ticket has been added to.

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

@@ -29 +29 @@
 from waeup.kofa.students.vocabularies import StudyLevelSource
 
+def getGradeWeightFromScore(score):
+    if score is None:
+        return (None, None)
+    if score >= 70:
+        return ('A',5)
+    if score >= 60:
+        return ('B',4)
+    if score >= 50:
+        return ('C',3)
+    if score >= 45:
+        return ('D',2)
+    if score >= 40:
+        return ('E',1)
+    return ('F',0)
+
 class StudentStudyLevel(grok.Container):
     """This is a container for course tickets.
@@ -183 +198 @@
             return None
 
+    @property
+    def grade(self):
+        """Returns the grade calculated from score.
+        """
+        return getGradeWeightFromScore(self.score)[0]
+
+    @property
+    def weight(self):
+        """Returns the weight calculated from score.
+        """
+        return getGradeWeightFromScore(self.score)[1]
 
 CourseTicket = attrs_to_fields(CourseTicket)

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