Changeset 10041

Timestamp:

21 Mar 2013, 10:57:48 (12 years ago)

Author:

Henrik Bettermann

Message:

Also matric or reg numbers can be used as student identifiers.

Location:

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

Files:

• tests/test_webservices.py (modified) (1 diff)
• webservices.py (modified) (2 diffs)

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

@@ -109 +109 @@
         self.assertEqual(result,
             {'100|CRS1': 'Course 1', '100|COURSE1': 'Unnamed Course'})
+        # Also matric_number ...
+        result = server.get_courses_by_session('234')
+        self.assertEqual(result,
+            {'100|CRS1': 'Course 1', '100|COURSE1': 'Unnamed Course'})
+        # ... or reg_number can be used.
+        result = server.get_courses_by_session('123')
+        self.assertEqual(result,
+            {'100|CRS1': 'Course 1', '100|COURSE1': 'Unnamed Course'})
+        result = server.get_courses_by_session('Nonsense')
+        self.assertEqual(result, None)
         REQUEST_XML="""\
 <?xml version="1.0"?>

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

@@ -22 +22 @@
 from waeup.kofa.interfaces import IUniversity
 
+def get_student(students, identifier):
+    if identifier is None:
+        return None
+    student = students.get(identifier, None)
+    if student is None:
+        cat = queryUtility(ICatalog, name='students_catalog')
+        results = list(
+            cat.searchResults(matric_number=(identifier, identifier)))
+        if len(results) == 1:
+            student = results[0]
+        else:
+            results = list(
+                cat.searchResults(reg_number=(identifier, identifier)))
+            if len(results) == 1:
+                student = results[0]
+    return student
 
 #class XMLRPCPermission(grok.Permission):
@@ -61 +77 @@
 
     @grok.require('waeup.xmlrpc')
-    def get_courses_by_session(self, student_id=None, session=None):
+    def get_courses_by_session(self, identifier=None, session=None):
         """What COURSES are registered by student X in session Y?
 
         """
-        if student_id is None:
+        students = self.context['students']
+        student = get_student(students, identifier)
+        if student is None:
             return None
-        student = self.context['students'].get(student_id, None)
-        if student is None:
-            return  None
         try:
             session = int(session)