Changeset 16393

Timestamp:

4 Feb 2021, 09:14:47 (4 years ago)

Author:

Henrik Bettermann

Message:

Improve wevservice.

Location:

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

Files:

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

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

@@ -241 +241 @@
         result = server.get_students_by_department('fac1','dep1', '2012', '100')
         self.assertEqual(
-            result, {'K1000000': ['234', 'Anna Tester', ['COURSE1', 'COURSE2']]})
+            result, {'K1000000': [
+            '234', 'Anna Tester', 2004, 100, ['COURSE1', 'COURSE2']]})
+        result = server.get_students_by_department('fac1','dep1', '0', '100')
+        self.assertEqual(
+            result, {'K1000000': [
+            '234', 'Anna Tester', 2004, 100, ['COURSE1', 'COURSE2']]})
         result = server.get_students_by_department('fac1','dep1')
         self.assertEqual(
-            result, {'K1000000': ['234', 'Anna Tester', ['COURSE1', 'COURSE2']]})
+            result, {'K1000000': [
+            '234', 'Anna Tester', 2004, 100, ['COURSE1', 'COURSE2']]})
         result = server.get_students_by_department('fac1','dep2')
         self.assertEqual(result, None)
@@ -255 +261 @@
 <value><string>fac1</string></value>
 <value><string>dep1</string></value>
+<value><int>0</int></value>
+<value><int>100</int></value>
 </param>
 </params>
@@ -269 +277 @@
 <value><string>234</string></value>
 <value><string>Anna Tester</string></value>
+<value><int>2004</int></value>
+<value><int>100</int></value>
 <value><array><data>
 <value><string>COURSE1</string></value>

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

@@ -165 +165 @@
         except (TypeError, ValueError):
             pass
-        if session in (None, ''):
+        if session in (None, '',0):
             session= None
-        if level in (None, ''):
+        if level in (None, '',0):
             level= None
         try:
@@ -186 +186 @@
                         c_ticket.student.matric_number,
                         c_ticket.student.display_fullname,
+                        c_ticket.student.current_session,
+                        c_ticket.student.current_level,
                         [c_ticket.code,])
                 else:
-                    hitdict[c_ticket.student.student_id][2].append(
+                    hitdict[c_ticket.student.student_id][4].append(
                         c_ticket.code,)
         return hitdict