Changeset 10044 for main

Timestamp:

22 Mar 2013, 12:59:13 (12 years ago)

Author:

Henrik Bettermann

Message:

Extend get_students_by_course and return school fee paid in that session.

Location:

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

Files:

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

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

@@ -171 +171 @@
         self.assertEqual(result, None)
         result = server.get_students_by_course('CRS1', '2012')
-        self.assertEqual(result, [['K1000000', '234', 'my adviser'],])
+        self.assertEqual(result, [['K1000000', '234', 'my adviser', 0],])
         result = server.get_students_by_course('CRS1')
-        self.assertEqual(result, [['K1000000', '234', 'my adviser'],])
+        self.assertEqual(result, [['K1000000', '234', 'my adviser', 0],])
+        payment = StudentOnlinePayment()
+        payment.p_id = 'my-id'
+        payment.p_session = 2012
+        payment.amount_auth = 12.12
+        payment.p_state = u'paid'
+        self.student['payments']['my-payment'] = payment
+        result = server.get_students_by_course('CRS1')
+        self.assertEqual(result, [['K1000000', '234', 'my adviser', 12.12],])
         REQUEST_XML="""\
 <?xml version="1.0"?>
@@ -195 +203 @@
 <value><string>234</string></value>
 <value><string>my adviser</string></value>
+<value><double>12.12</double></value>
 </data></array></value>
 </data></array></value>

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

@@ -109 +109 @@
     def get_students_by_course(self, course=None, session=None):
         """2. What STUDENTS registered (student id / matric no)
-        for course Z in session Y?
+        for course Z in session Y and did they pay school fee?
 
         """
@@ -130 +130 @@
             return None
         hitlist = []
-        for ticket in coursetickets:
+        for c_ticket in coursetickets:
+            amount = 0
+            for p_ticket in c_ticket.student['payments'].values():
+                if p_ticket.p_state == 'paid' and \
+                    p_ticket.p_category == 'schoolfee' and \
+                    p_ticket.p_session == c_ticket.__parent__.level_session:
+                    amount = p_ticket.amount_auth
             hitlist.append((
-                ticket.student.student_id,
-                ticket.student.matric_number,
-                ticket.__parent__.validated_by))
+                c_ticket.student.student_id,
+                c_ticket.student.matric_number,
+                c_ticket.__parent__.validated_by,
+                amount
+                ))
         return list(set(hitlist))