Changeset 9420 for main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

Timestamp:

25 Oct 2012, 21:52:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Reorganize ICourseTicket. Add ICourseTicketImport which validates a new field called level_session.

Customize checkConversion of CourseTicketProcessor?:
If level_session is provided in row the importer checks if
the parent studylevel exists and if its level_session
attribute corresponds with the expected value in row. The error message
then tells us why course result import fails.

File:

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

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

@@ -43 +43 @@
     IStudent, IStudentStudyCourse,
     IStudentUpdateByRegNo, IStudentUpdateByMatricNo,
-    IStudentStudyLevel, ICourseTicket,
+    IStudentStudyLevel, ICourseTicketImport,
     IStudentOnlinePayment, IStudentVerdictUpdate)
 from waeup.kofa.students.workflow import  (
@@ -305 +305 @@
     grok.baseclass()
 
-    # additional available  fields
+    # additional available fields
     # beside 'student_id', 'reg_number' and 'matric_number'
     additional_fields = []
@@ -541 +541 @@
 
     name = u'CourseTicket Processor'
-    iface = ICourseTicket
+    iface = ICourseTicketImport
     factory_name = 'waeup.CourseTicket'
 
@@ -547 +547 @@
     additional_fields = ['level', 'code']
     additional_headers = ['level', 'code']
+
+    @property
+    def available_fields(self):
+        fields = [
+            'student_id','reg_number','matric_number',
+            'mandatory', 'score', 'carry_over', 'automatic',
+            'level_session'
+            ] + self.additional_fields
+        return sorted(fields)
 
     def getParent(self, row, site):
@@ -579 +588 @@
         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
+        #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
@@ -602 +611 @@
         errs, inv_errs, conv_dict = super(
             CourseTicketProcessor, self).checkConversion(row, mode=mode)
-
-        # We have to check if course really exists.
+        if mode == 'remove':
+            return errs, inv_errs, conv_dict
+        # In update and create mode we have to check if course really exists.
         # This is not done by the converter.
         catalog = getUtility(ICatalog, name='courses_catalog')
@@ -610 +620 @@
             errs.append(('code','non-existent'))
             return errs, inv_errs, conv_dict
+        # If level_session is provided in row we have to check if
+        # the parent studylevel exists and if its level_session
+        # attribute corresponds with the expected value in row.
+        level_session = row.get('level_session', IGNORE_MARKER)
+        if level_session not in (IGNORE_MARKER, ''):
+            site = grok.getSite()
+            studylevel = self.getParent(row, site)
+            if studylevel is not None:
+                if studylevel.level_session != level_session:
+                    errs.append(('level_session','does not match %s'
+                        % studylevel.level_session))
+            else:
+                errs.append(('level','does not exist'))
         return errs, inv_errs, conv_dict
 
@@ -793 +816 @@
         notify(grok.ObjectModifiedEvent(obj.__parent__))
         return
-
-class CourseResultProcessor(CourseTicketProcessor):
-    """A special batch processor for course results objects.
-
-    Import course results, compares session and creates study level.
-    """
-    grok.implements(IBatchProcessor)
-    grok.provides(IBatchProcessor)
-    grok.context(Interface)
-    util_name = 'courseresultprocessor'
-    grok.name(util_name)
-
-    name = u'Course Result Processor (special processor)'
-    iface = ICourseTicket
-    factory_name = 'waeup.CourseTicket'
-
-    location_fields = []
-    additional_fields = ['level', 'code']
-    additional_headers = ['level', 'code']
-
-    def getParent(self, row, site):
-        student = self._getStudent(row, site)
-        if student is None:
-            return None
-        return student['studycourse'].get(row['level'])
-
-    def getEntry(self, row, site):
-        level = self.getParent(row, site)
-        if level is None:
-            return None
-        return level.get(row['code'])
-
-    def updateEntry(self, obj, row, site):
-        """Update obj to the values given in row.
-        """
-        items_changed = super(CourseTicketProcessor, self).updateEntry(
-            obj, row, site)
-        parent = self.getParent(row, site)
-        student = self.getParent(row, site).__parent__.__parent__
-        student.__parent__.logger.info(
-            '%s - Course ticket in %s updated: %s'
-            % (student.student_id,  parent.level, items_changed))
-        return
-
-    def addEntry(self, obj, row, site):
-        parent = self.getParent(row, site)
-        catalog = getUtility(ICatalog, name='courses_catalog')
-        entries = list(catalog.searchResults(code=(row['code'],row['code'])))
-        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
-        parent[row['code']] = obj
-        return
-
-    def delEntry(self, row, site):
-        raise NotImplementedError('method not implemented')
-
-    def checkConversion(self, row, mode='ignore'):
-        """Validates all values in row.
-        """
-        errs, inv_errs, conv_dict = super(
-            CourseTicketProcessor, self).checkConversion(row, mode=mode)
-
-        # We have to check if course really exists.
-        # This is not done by the converter.
-        catalog = getUtility(ICatalog, name='courses_catalog')
-        entries = catalog.searchResults(code=(row['code'],row['code']))
-        if len(entries) == 0:
-            errs.append(('code','non-existent'))
-            return errs, inv_errs, conv_dict
-        return errs, inv_errs, conv_dict