Changeset 15226

Timestamp:

9 Nov 2018, 13:35:24 (6 years ago)

Author:

Henrik Bettermann

Message:

Add imported_ts (total score) field and override total_score if imported.

Location:

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

Files:

• batching.py (modified) (1 diff)
• browser.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• studylevel.py (modified) (1 diff)
• tests/test_export.py (modified) (1 diff)

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

@@ -78 +78 @@
             'mandatory', 'score', 'ca', 'carry_over', 'automatic',
             'level_session', 'outstanding', 'course_category',
-            'title', 'credits', 'passmark', 'semester', 'ticket_session'
+            'title', 'credits', 'passmark', 'semester', 'ticket_session',
+            'imported_ts'
             ] + self.additional_fields
         return sorted(fields)

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

@@ -867 +867 @@
     form_fields['carry_over'].for_display = True
     form_fields['ticket_session'].for_display = True
+    form_fields['imported_ts'].for_display = True
 
 class CustomEditScoresPage(EditScoresPage):

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

@@ -592 +592 @@
         )
 
+    imported_ts = schema.Int(
+        title = _(u'Imported Total Score'),
+        default = None,
+        required = False,
+        missing_value = None,
+        max = 100,
+        )
+
 class ICustomCourseTicketImport(ICustomCourseTicket):
     """An interface for importing course results and nothing more.

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

@@ -408 +408 @@
         """Returns ca + score.
         """
+        # Override total_score if value has been imported
+        if getattr(self, 'imported_ts', None):
+            return self.imported_ts
         if self.score == -1:
             return 0

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

@@ -192 +192 @@
         self.assertEqual(
             result,
-            'automatic,ca,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
+            'automatic,ca,carry_over,code,course_category,credits,dcode,fcode,imported_ts,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,ticket_session,title,student_id,certcode,'
             'display_fullname,matric_number\r\n'
-            '1,,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,,Course 1,A111111,CERT1,'
+            '1,,1,CRS1,,100,DEP1,FAC1,,100,2012,0,0,100,,2,,Course 1,A111111,CERT1,'
             '"TESTER, Anna M.",234\r\n'
             )