Changeset 9316

Timestamp:

8 Oct 2012, 13:19:14 (12 years ago)

Author:

Henrik Bettermann

Message:

We need to import credits and passmark of course tickets in order to repair them. Let's use the form field validation for import.

Both passmark and credits must not be edited via the UI.

Location:

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

Files:

• batching.py (modified) (2 diffs)
• browser.py (modified) (3 diffs)
• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• studylevel.py (modified) (1 diff)
• tests/test_export.py (modified) (1 diff)

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

@@ -545 +545 @@
 
     location_fields = []
-    additional_fields = ['level', 'code', 'credits']
+    additional_fields = ['level', 'code']
     additional_headers = ['level', 'code']
 
@@ -579 +579 @@
         obj.dcode = entries[0].__parent__.__parent__.code
         obj.title = entries[0].title
-        obj.credits = entries[0].credits
-        obj.passmark = entries[0].passmark
+        if getattr(obj, 'credits', None) is None:
+            obj.credits = entries[0].credits
+        if getattr(obj, 'passmark', None) is None:
+            obj.passmark = entries[0].passmark
         obj.semester = entries[0].semester
         parent[row['code']] = obj

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

@@ -1120 +1120 @@
     label = _('Add course ticket')
     form_fields = grok.AutoFields(ICourseTicketAdd).omit(
-        'score', 'automatic', 'carry_over')
+        'score', 'automatic', 'carry_over', 'credits', 'passmark')
     pnav = 4
 
@@ -1172 +1172 @@
     grok.name('manage')
     grok.require('waeup.manageStudent')
-    form_fields = grok.AutoFields(ICourseTicket)
+    form_fields = grok.AutoFields(ICourseTicket).omit('credits', 'passmark')
     grok.template('courseticketmanagepage')
     pnav = 4
@@ -2107 +2107 @@
     grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(ICourseTicketAdd).omit(
-        'score', 'mandatory', 'automatic', 'carry_over')
+        'score', 'mandatory', 'automatic', 'carry_over', 'credits', 'passmark')
 
     def update(self):

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

@@ -210 +210 @@
     #: Fieldnames considered by this exporter
     fields = tuple(sorted(iface_names(ICourseTicket) +
-        ['level', 'code', 'title', 'credits',
-        'passmark', 'semester', 'fcode', 'dcode'])) + ('student_id', 'certcode')
+        ['level', 'code', 'title',
+        'semester', 'fcode', 'dcode'])) + ('student_id', 'certcode')
 
     #: The title under which this exporter will be displayed

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

@@ -512 +512 @@
         )
 
+    credits = schema.Int(
+        title = _(u'Credits'),
+        required = False,
+        )
+
+    passmark = schema.Int(
+        title = _(u'Passmark'),
+        required = False,
+        )
+
     def getLevel():
         """Returns the id of the level the ticket has been added to.

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

@@ -124 +124 @@
         self.fcode = None
         self.dcode = 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,0,0,,,,\r\n'
+            '0,0,,,,,,0,,0,,,,\r\n'
             )
         return