Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/batching.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/batching.py (modified) (18 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/batching.py

@@ -26 +26 @@
 import grok
 import csv
-from time import time
 from zope.interface import Interface
 from zope.schema import getFields
@@ -43 +42 @@
     IStudentOnlinePayment, IStudentVerdictUpdate)
 from waeup.kofa.students.workflow import  (
-    IMPORTABLE_STATES, IMPORTABLE_TRANSITIONS,
-    FORBIDDEN_POSTGRAD_TRANS, FORBIDDEN_POSTGRAD_STATES)
+    IMPORTABLE_STATES, IMPORTABLE_TRANSITIONS)
 from waeup.kofa.utils.batching import BatchProcessor
 
@@ -172 +170 @@
             if transition not in allowed_transitions:
                 return 'Transition not allowed.'
-            if transition in FORBIDDEN_POSTGRAD_TRANS and \
-                obj.is_postgrad:
-                return 'Transition not allowed (pg student).'
-        state = row.get('state', IGNORE_MARKER)
-        if state not in (IGNORE_MARKER, ''):
-            if state in FORBIDDEN_POSTGRAD_STATES and \
-                obj.is_postgrad:
-                return 'State not allowed (pg student).'
         return None
 
@@ -193 +183 @@
 
         # Update password
-        # XXX: Tale DELETION_MARKER into consideration
         if row.has_key('password'):
             passwd = row.get('password', IGNORE_MARKER)
@@ -233 +222 @@
         parent = self.getParent(row, site)
         if hasattr(obj,'student_id'):
-            # Update mode: the student exists and we can get the student_id.
-            # Create mode: the record contains the student_id
+            # Update mode: the student exists and we can get the student_id
             parent.logger.info(
                 '%s - Student record updated: %s'
@@ -271 +259 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name, mode=mode)
-        if row.has_key('transition'):
-            if row['transition'] not in IMPORTABLE_TRANSITIONS:
-                if row['transition'] not in (IGNORE_MARKER, ''):
-                    errs.append(('transition','not allowed'))
-        if row.has_key('state'):
-            if row['state'] not in IMPORTABLE_STATES:
-                if row['state'] not in (IGNORE_MARKER, ''):
-                    errs.append(('state','not allowed'))
-                else:
-                    # State is an attribute of Student and must not
-                    # be changed if empty.
-                    conv_dict['state'] = IGNORE_MARKER
+        if row.has_key('transition') and \
+            not row['transition'] in IMPORTABLE_TRANSITIONS:
+            if row['transition'] not in (IGNORE_MARKER, ''):
+                errs.append(('transition','not allowed'))
+        if row.has_key('state') and \
+            not row['state'] in IMPORTABLE_STATES:
+            if row['state'] not in (IGNORE_MARKER, ''):
+                errs.append(('state','not allowed'))
+            else:
+                # state is an attribute of Student and must not
+                # be changed if empty
+                conv_dict['state'] = IGNORE_MARKER
+
         try:
             # Correct stud_id counter. As the IConverter for students
@@ -302 +291 @@
     grok.baseclass()
 
-    # additional available  fields
-    # beside 'student_id', 'reg_number' and 'matric_number'
+    #: required fields beside 'student_id', 'reg_number' and 'matric_number'
     additional_fields = []
 
-    #: header fields additionally required
+    #: header fields additional required
     additional_headers = []
 
@@ -373 +361 @@
         return errs, inv_errs, conv_dict
 
-    def getMapping(self, path, headerfields, mode):
-        """Get a mapping from CSV file headerfields to actually used fieldnames.
-        """
-        result = dict()
-        reader = csv.reader(open(path, 'rb'))
-        raw_header = reader.next()
-        for num, field in enumerate(headerfields):
-            if field not in ['student_id', 'reg_number', 'matric_number',
-                             'p_id', 'code', 'level'
-                             ] and mode == 'remove':
-                continue
-            if field == u'--IGNORE--':
-                # Skip ignored columns in failed and finished data files.
-                continue
-            result[raw_header[num]] = field
-        return result
-
 
 class StudentStudyCourseProcessor(StudentProcessorBase):
@@ -435 +406 @@
             StudentStudyCourseProcessor, self).checkConversion(row, mode=mode)
         # We have to check if current_level is in range of certificate.
-        if conv_dict.has_key('certificate') and \
-            conv_dict.has_key('current_level'):
-            cert = conv_dict['certificate']
-            level = conv_dict['current_level']
-            if level < cert.start_level or level > cert.end_level+120:
-                errs.append(('current_level','not in range'))
+        if conv_dict.has_key('certificate'):
+          cert = conv_dict['certificate']
+          if conv_dict['current_level'] < cert.start_level or \
+              conv_dict['current_level'] > cert.end_level+120:
+              errs.append(('current_level','not in range'))
         return errs, inv_errs, conv_dict
-
-    def checkUpdateRequirements(self, obj, row, site):
-        """Checks requirements the object must fulfill when being updated.
-
-        Returns error messages as strings in case of requirement
-        problems.
-        """
-        current_level = row.get('current_level', None)
-        if current_level == 999 and \
-            obj.__parent__.state in FORBIDDEN_POSTGRAD_STATES:
-            return 'Not a pg student.'
-        return None
 
 class StudentStudyLevelProcessor(StudentProcessorBase):
@@ -469 +427 @@
 
     location_fields = []
-
     additional_fields = ['level']
     additional_headers = ['level']
@@ -552 +509 @@
         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))
+            '%s - Course ticket updated: %s'
+            % (student.student_id, items_changed))
         return
 
@@ -572 +528 @@
         return
 
-    def delEntry(self, row, site):
-        ticket = self.getEntry(row, site)
-        parent = self.getParent(row, site)
-        if ticket is not None:
-            student = self._getStudent(row, site)
-            student.__parent__.logger.info('%s - Course ticket in %s removed: %s'
-                % (student.student_id, parent.level, ticket.code))
-            del parent[ticket.code]
-        return
-
     def checkConversion(self, row, mode='ignore'):
         """Validates all values in row.
@@ -606 +552 @@
     grok.name(util_name)
 
-    name = u'Student Payment Processor'
+    name = u'Payment Processor'
     iface = IStudentOnlinePayment
     factory_name = 'waeup.StudentOnlinePayment'
@@ -612 +558 @@
     location_fields = []
     additional_fields = ['p_id']
-    additional_headers = []
-
-    def checkHeaders(self, headerfields, mode='ignore'):
-        super(StudentOnlinePaymentProcessor, self).checkHeaders(headerfields)
-        if mode in ('update', 'remove') and not 'p_id' in headerfields:
-            raise FatalCSVError(
-                "Need p_id for import in update and remove modes!")
-        return True
+    additional_headers = ['p_id']
 
     def parentsExist(self, row, site):
@@ -634 +573 @@
         if payments is None:
             return None
-        p_id = row.get('p_id', None)
-        if p_id is None:
-            return None
         # We can use the hash symbol at the end of p_id in import files
         # to avoid annoying automatic number transformation
         # by Excel or Calc
-        p_id = p_id.strip('#')
-        if not p_id.startswith('p'):
-            # For data migration from old SRP only
-            p_id = 'p' + p_id[7:] + '0'
-        entry = payments.get(p_id)
+        p_id = row['p_id'].strip('#')
+        if p_id.startswith('p'):
+            entry = payments.get(p_id)
+        else:
+            # For data migration from old SRP
+            entry = payments.get('p' + p_id[6:])
         return entry
 
@@ -663 +600 @@
         if not p_id.startswith('p'):
             # For data migration from old SRP
-            obj.p_id = 'p' + p_id[7:] + '0'
+            obj.p_id = 'p' + p_id[6:]
             parent[obj.p_id] = obj
         else:
@@ -669 +606 @@
         return
 
-    def delEntry(self, row, site):
-        payment = self.getEntry(row, site)
-        parent = self.getParent(row, site)
-        if payment is not None:
-            student = self._getStudent(row, site)
-            student.__parent__.logger.info('%s - Payment ticket removed: %s'
-                % (student.student_id, payment.p_id))
-            del parent[payment.p_id]
-        return
-
     def checkConversion(self, row, mode='ignore'):
         """Validates all values in row.
@@ -686 +613 @@
 
         # We have to check p_id.
-        p_id = row.get('p_id', None)
-        if not p_id:
-            timestamp = ("%d" % int(time()*10000))[1:]
-            p_id = "p%s" % timestamp
-            conv_dict['p_id'] = p_id
-            return errs, inv_errs, conv_dict
-        else:
-            p_id = p_id.strip('#')
+        p_id = row['p_id'].strip('#')
         if p_id.startswith('p'):
             if not len(p_id) == 14: