Changeset 16392 for main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py

Timestamp:

3 Feb 2021, 21:26:18 (4 years ago)

Author:

Henrik Bettermann

Message:

Change webservice.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py (modified) (2 diffs)

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

@@ -155 +155 @@
 
     @grok.require('waeup.xmlrpc')
-    def get_students_by_department(self, faccode=None, depcode=None, session=None):
-        """A webservice to pull student's registered courses in a department.
+    def get_students_by_department(self, faccode=None, depcode=None,
+                                   session=None, level=None):
+        """A webservice to pull student's registered courses in a
+        department
         """
         try:
             session = int(session)
+            level = int(level)
         except (TypeError, ValueError):
             pass
-        sessionsearch = True
         if session in (None, ''):
-            sessionsearch = False
+            session= None
+        if level in (None, ''):
+            level= None
         try:
             department =self.context['faculties'][faccode][depcode]
@@ -171 +175 @@
         courses = department.courses.keys()
         cat = queryUtility(ICatalog, name='coursetickets_catalog')
-        hitlist = []
+        hitdict = {}
         for course in courses:
-            if sessionsearch:
-                coursetickets = cat.searchResults(
-                    session=(session, session),
-                    code=(course, course))
-            else:
-                coursetickets = cat.searchResults(
-                    code=(course, course))
+            coursetickets = cat.searchResults(
+                session=(session, session),
+                level=(level, level),
+                code=(course, course))
             for c_ticket in coursetickets:
-                hitlist.append((
-                    c_ticket.code,
-                    c_ticket.level,
-                    c_ticket.level_session,
-                    c_ticket.student.student_id,
-                    c_ticket.student.matric_number,
-                    c_ticket.student.display_fullname,
-                    ))
-        return list(set(hitlist))
+                if not c_ticket.student.student_id in hitdict.keys():
+                    hitdict[c_ticket.student.student_id] = (
+                        c_ticket.student.matric_number,
+                        c_ticket.student.display_fullname,
+                        [c_ticket.code,])
+                else:
+                    hitdict[c_ticket.student.student_id][2].append(
+                        c_ticket.code,)
+        return hitdict
 
     @grok.require('waeup.xmlrpc')