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

Timestamp:

2 Oct 2011, 09:45:29 (13 years ago)

Author:

Henrik Bettermann

Message:

Enable locating students by reg_number or matric_number for update and removal.

Allow adding students by pre-selecting the student_id and bypassing the random student_id generator. This is important for the migration of student data.

Further tests are needed and will follow!

Location:

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

Files:

• batching.py (modified) (5 diffs)
• tests/test_batching.py (modified) (1 diff)

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'):
-            return row['student_id'] in site['students'].keys()
+        if not 'students' in site.keys():
+            return False
+        if 'student_id' in row.keys() and row['student_id']:
+            if row['student_id'] in site['students']:
+                student = site['students'][row['student_id']]
+                return student
+        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]
         return False
 
@@ -57 +75 @@
 
     def getEntry(self, row, site):
-        if not self.entryExists(row, site):
-            return None
-        parent = self.getParent(row, site)
-        return parent.get(row['student_id'])
+        return self.entryExists(row, site)
 
     def addEntry(self, obj, row, site):
@@ -68 +83 @@
 
     def delEntry(self, row, site):
-        parent = self.getParent(row, site)
-        del parent[row['student_id']]
+        student = self.entryExists(row, site)
+        if student:
+            parent = self.getParent(row, site)
+            del parent[student.student_id]
         pass
 
@@ -107 +124 @@
 
     def parentsExist(self, row, site):
-        if not 'students' in site.keys() and row['student_id']:
+        if not 'students' in site.keys():
             return False
-        if 'student_id' in row.keys():
+        if 'student_id' in row.keys() and row['student_id']:
             if row['student_id'] in site['students']:
                 student = site['students'][row['student_id']]
@@ -121 +138 @@
                 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')

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

@@ -107 +107 @@
         assert self.importer.entryExists(
             dict(student_id='ID_NONE'), self.app) is False
-        assert self.importer.entryExists(
-            dict(student_id=self.student.student_id), self.app) is True
+        student = dict(student_id=self.student.student_id), self.app)
+        self.assertEqual(student.reg_number, u'123')
 
     def test_getParent(self):