Changeset 10036

Timestamp:

18 Mar 2013, 09:51:12 (12 years ago)

Author:

Henrik Bettermann

Message:

Add web service method which gets the course tickets registered by a student in a certain session.

Location:

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

Files:

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

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

@@ -1 +1 @@
 # Tests for webservices
 import xmlrpclib
-import httplib
-import urllib
-import base64
 from zope.app.testing.xmlrpc import ServerProxy
 from zope.component import createObject
@@ -11 +8 @@
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
 
 class XMLRPCTests(StudentsFullSetup):
@@ -16 +14 @@
 
     layer = FunctionalLayer
+
+    def setup_student(self, student):
+        study_level = StudentStudyLevel()
+        study_level.level_session = 2012
+        study_level.level_verdict = "A"
+        study_level.level = 100
+        student['studycourse'].addStudentStudyLevel(
+            self.certificate, study_level)
+
+        ticket = CourseTicket()
+        ticket.automatic = True
+        ticket.carry_over = True
+        ticket.code = u'CRS1'
+        ticket.title = u'Course 1'
+        ticket.fcode = u'FAC1'
+        ticket.dcode = u'DEP1'
+        ticket.credits = 100
+        ticket.passmark = 100
+        ticket.semester = 2
+        study_level[ticket.code] = ticket
 
     def test_get_student_id_no_match(self):
@@ -76 +94 @@
             'text/xml; charset=utf-8')
         self.assertEqual(self.browser.contents, self.RESPONSE_XML)
+
+    def test_get_courses_by_session(self):
+        server = ServerProxy('http://mgr:mgrpw@localhost/app')
+        result = server.get_courses_by_session('K1000000')
+        self.assertEqual(result, None)
+        self.setup_student(self.student)
+        result = server.get_courses_by_session('K1000000', '2010')
+        self.assertEqual(result, None)
+        result = server.get_courses_by_session('K1000000', '2012')
+        self.assertEqual(result,
+            {'100|CRS1': 'Course 1', '100|COURSE1': 'Unnamed Course'})
+        result = server.get_courses_by_session('K1000000')
+        self.assertEqual(result,
+            {'100|CRS1': 'Course 1', '100|COURSE1': 'Unnamed Course'})
+        return

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

@@ -59 +59 @@
             return result[0].student_id
         return None
+
+    @grok.require('waeup.xmlrpc')
+    def get_courses_by_session(self, student_id=None, session=None):
+        """Get the course tickets registered by a student in a certain session.
+
+        """
+        if student_id is None:
+            return None
+        student = self.context['students'].get(student_id, None)
+        if student is None:
+            return  None
+        try:
+            session = int(session)
+        except (TypeError, ValueError):
+            pass
+        sessionsearch = True
+        if session in (None, ''):
+            sessionsearch = False
+        studycourse = student['studycourse']
+        coursetickets = {}
+        for level in studycourse.values():
+            if sessionsearch and level.level_session != session:
+                continue
+            for ct in level.values():
+                coursetickets.update(
+                    {"%s|%s" % (level.level, ct.code): ct.title})
+        if not coursetickets:
+            return None
+        return coursetickets