Changeset 8888

Timestamp:

3 Jul 2012, 11:20:18 (13 years ago)

Author:

Henrik Bettermann

Message:

Add delEntry method to CourseTicketProcessor?.

Location:

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

Files:

• batching.py (modified) (3 diffs)
• tests/test_batching.py (modified) (2 diffs)

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

@@ -370 +370 @@
         raw_header = reader.next()
         for num, field in enumerate(headerfields):
-            if field not in ['student_id', 'reg_number', 'matric_number', 'p_id'
+            if field not in ['student_id', 'reg_number', 'matric_number',
+                             'p_id', 'code', 'level'
                              ] and mode == 'remove':
                 continue
@@ -527 +528 @@
         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 updated: %s'
-            % (student.student_id, items_changed))
+            '%s - Course ticket in %s updated: %s'
+            % (student.student_id,  parent.level, items_changed))
         return
 
@@ -544 +546 @@
         obj.semester = entries[0].semester
         parent[row['code']] = obj
+        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
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

@@ -762 +762 @@
         # Logging message from updateEntry,
         self.assertTrue(
-            'INFO - system - K1000000 - Course ticket updated: code=COURSE1, '
+            'INFO - system - K1000000 - Course ticket in 100 updated: code=COURSE1, '
             'mandatory=False, score=3'
             in logcontent)
@@ -776 +776 @@
         self.assertEqual(num_warns,2)
         shutil.rmtree(os.path.dirname(fin_file))
+
+    def test_import_remove(self):
+        # We perform the same import twice,
+        # the second time in remove mode. The number
+        # of warnings must be the same.
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, COURSETICKET_HEADER_FIELDS,'create')
+        assert self.processor.entryExists(
+            dict(reg_number='1', level='100', code='COURSE1'), self.app) is True
+        num, num_warns, fin_file, fail_file = self.processor.doImport(
+            self.csv_file, COURSETICKET_HEADER_FIELDS,'remove')
+        self.assertEqual(num_warns,2)
+        assert self.processor.entryExists(
+            dict(reg_number='1', level='100', code='COURSE1'), self.app) is False
+        shutil.rmtree(os.path.dirname(fin_file))
+        logcontent = open(self.logfile).read()
+        self.assertTrue(
+            'INFO - system - K1000000 - Course ticket in 100 removed: COURSE1'
+            in logcontent)
 
 class PaymentProcessorTest(StudentImportExportSetup):