Changeset 9315 for main/waeup.kofa/trunk/src/waeup

Timestamp:

8 Oct 2012, 11:35:26 (12 years ago)

Author:

Henrik Bettermann

Message:

Default for ticket credits and passmark is 0.

credits is a required field of courses.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• students/batching.py (modified) (1 diff)
• students/studylevel.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)
• university/interfaces.py (modified) (2 diffs)

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

@@ -545 +545 @@
 
     location_fields = []
-    additional_fields = ['level', 'code']
+    additional_fields = ['level', 'code', 'credits']
     additional_headers = ['level', 'code']
 

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

@@ -124 +124 @@
         self.fcode = None
         self.dcode = None
-        self.credits = None
-        self.passmark = None
+        self.credits = 0
+        self.passmark = 0
         self.semester = None
         return

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

@@ -293 +293 @@
             '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,,,,0,0,0,,,,\r\n'
             )
         return

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

@@ -152 +152 @@
         title = _(u'Credits'),
         default = 0,
-        required = False,
+        required = True,
         )
 
@@ -158 +158 @@
         title = _(u'Passmark'),
         default = 40,
-        required = False,
+        required = True,
         )