Changeset 8885

Timestamp:

3 Jul 2012, 09:47:27 (12 years ago)

Author:

Henrik Bettermann

Message:

Add delEntry method to StudentOnlinePaymentProcessor?.

Location:

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

Files:

• batching.py (modified) (4 diffs)
• browser.py (modified) (1 diff)

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

@@ -363 +363 @@
         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'
+                             ] 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):
@@ -564 +580 @@
     def checkHeaders(self, headerfields, mode='ignore'):
         super(StudentOnlinePaymentProcessor, self).checkHeaders(headerfields)
-        if mode == 'update' and not 'p_id' in headerfields:
+        if mode in ('update', 'remove') and not 'p_id' in headerfields:
             raise FatalCSVError(
-                "Need p_id for import in update mode!")
+                "Need p_id for import in update and remove modes!")
         return True
 
@@ -602 +618 @@
         student = self.getParent(row, site).__parent__
         student.__parent__.logger.info(
-            '%s - Payment ticket updated: %s'
-            % (student.student_id, items_changed))
+            '%s - %s - updated: %s'
+            % (student.student_id, obj.p_id, items_changed))
         return
 
@@ -616 +632 @@
             parent[p_id] = obj
         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 - removed: %s'
+                % (student.student_id, payment.p_id))
+            del parent[payment.p_id]
+        pass
 
     def checkConversion(self, row, mode='ignore'):

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

@@ -1030 +1030 @@
                 mapping = {'a': ', '.join(deleted)}))
             self.context.writeLogMessage(
-                self,'removed: % s' % ', '.join(deleted))
+                self,'removed: %s' % ', '.join(deleted))
         self.redirect(self.url(self.context))
         return