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

Timestamp:

26 Sep 2016, 10:38:29 (8 years ago)

Author:

Henrik Bettermann

Message:

Make 'title', 'credits', 'passmark' and 'semester' importable.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (3 diffs)

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

@@ -632 +632 @@
     In create mode `fcode`, `dcode`, `title`, `credits`, `passmark` and
     `semester` are taken from the course found in the academic section.
-    These attributes can nevermore be changed, neither via the user interface
-    nor by import.
+    `fcode` and `dcode` can nevermore be changed, neither via the user interface
+    nor by import. 'title', 'credits', 'passmark' and 'semester' can be
+    overwritten by import.
     """
     grok.implements(IBatchProcessor)
@@ -653 +654 @@
             'student_id','reg_number','matric_number',
             'mandatory', 'score', 'carry_over', 'automatic',
-            'level_session'
+            'level_session',
+            'title', 'credits', 'passmark', 'semester'
             ] + self.additional_fields
         return sorted(fields)
@@ -687 +689 @@
         obj.fcode = entries[0].__parent__.__parent__.__parent__.code
         obj.dcode = entries[0].__parent__.__parent__.code
-        obj.title = entries[0].title
-        #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
+        if getattr(obj, 'title', None) is None:
+            obj.title = entries[0].title
+        if getattr(obj, 'credits', None) is None:
+            obj.credits = entries[0].credits
+        if getattr(obj, 'passmark', None) is None:
+            obj.passmark = entries[0].passmark
+        if getattr(obj, 'semester', None) is None:
+            obj.semester = entries[0].semester
         parent[row['code']] = obj
         return