Changeset 6843 for main/waeup.sirp/trunk/src/waeup

Timestamp:

2 Oct 2011, 07:57:57 (13 years ago)

Author:

Henrik Bettermann

Message:

Use matric_number for location of studycourses as well.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

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

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

@@ -47 +47 @@
 
     # The entry never exists in create mode.
+    # To do: Use reg_number and matric_number for locating as well.
     def entryExists(self, row, site):
         if row.has_key('student_id'):
@@ -90 +91 @@
         result = []
         return sorted(list(set(
-            ['student_id','reg_number'] + getFields(self.iface).keys())))
+            ['student_id','reg_number','matric_number'] + getFields(
+                self.iface).keys())))
 
     def checkHeaders(self, headerfields, mode='ignore'):
-        if not 'reg_number' in headerfields and not 'student_id' in headerfields:
+        if not 'reg_number' in headerfields and not 'student_id' in headerfields and not 'matric_number' in headerfields:
             raise FatalCSVError(
-                "Need at least columns student_id or reg_number for import!")
+                "Need at least columns student_id or reg_number or matric_number for import!")
         # Check for fields to be ignored...
         not_ignored_fields = [x for x in headerfields
@@ -105 +107 @@
 
     def parentsExist(self, row, site):
-        if not 'students' in site.keys():
+        if not 'students' in site.keys() and row['student_id']:
             return False
         if 'student_id' in row.keys():
@@ -111 +113 @@
                 student = site['students'][row['student_id']]
                 return student
-        else:
-            # Here we know that the reg_number is in row
+        elif 'reg_number' in row.keys() and row['reg_number']:
             reg_number = row['reg_number']
             cat = queryUtility(ICatalog, name='students_catalog')
             results = list(
                 cat.searchResults(reg_number=(reg_number, reg_number)))
+            if results:
+                return results[0]
+        elif 'matric_number' in row.keys() and row['matric_number']:
+            #import pdb; pdb.set_trace()
+            matric_number = row['matric_number']
+            cat = queryUtility(ICatalog, name='students_catalog')
+            results = list(
+                cat.searchResults(matric_number=(matric_number, matric_number)))
             if results:
                 return results[0]

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

@@ -133 +133 @@
         num, num_warns, fin_file, fail_file = self.importer.doImport(
             self.csv_file, STUDENT_HEADER_FIELDS)
+        self.assertEqual(num_warns,0)
         assert len(self.app['students'].keys()) == 4
         shutil.rmtree(os.path.dirname(fin_file))
@@ -203 +204 @@
             self.csv_file, STUDYCOURSE_HEADER_FIELDS,'update')
         studycourse = self.importer.getEntry(dict(reg_number='1'), self.app)
+        self.assertEqual(num_warns,0)
         self.assertEqual(studycourse.certificate.code, u'CERT1')
         shutil.rmtree(os.path.dirname(fin_file))