Changeset 16268 for main/waeup.kofa/trunk/src/waeup

Timestamp:

5 Oct 2020, 09:48:55 (4 years ago)

Author:

Henrik Bettermann

Message:

Add p_session to get_bursary_data webservice parameters.

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

@@ -578 +578 @@
         self.student['payments']['my-payment2'] = payment2
         server = ServerProxy('http://mgr:mgrpw@localhost/app', allow_none=True)
-        result = server.get_bursary_data(None,None,None,None,'dep1')
+        result = server.get_bursary_data(None,None,None,None,'dep1',2012)
         self.assertEqual(
             result,[

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

@@ -367 +367 @@
     def get_bursary_data(self,
             current_session=None, current_level=None, certcode=None,
-            current_mode=None, depcode=None):
+            current_mode=None, depcode=None, p_session=None):
         """Returns bursary data of a subset of students.
         """
@@ -393 +393 @@
         tz = getUtility(IKofaUtils).tzinfo
         for payment in payments:
-            hitlist.append(dict(
-                student_id=payment.student.student_id,
-                matric_number=payment.student.matric_number,
-                reg_number=payment.student.reg_number,
-                firstname=payment.student.firstname,
-                middlename=payment.student.middlename,
-                lastname=payment.student.lastname,
-                state=payment.student.state,
-                current_session=payment.student.current_session,
-                entry_session=payment.student.entry_session,
-                entry_mode=payment.student.entry_mode,
-                faccode=payment.student.faccode,
-                depcode=payment.student.depcode,
-                certcode=payment.student.certcode,
-                p_id=payment.p_id,
-                amount_auth=payment.amount_auth,
-                p_category=payment.p_category,
-                display_item=payment.display_item,
-                p_session=payment.p_session,
-                p_state=payment.p_state,
-                creation_date=str('%s#' % to_timezone(payment.creation_date, tz)),
-                payment_date=str('%s#' % to_timezone(payment.payment_date, tz)),
-                )
-              )
+            if not p_session or payment.p_session == p_session:
+                hitlist.append(dict(
+                    student_id=payment.student.student_id,
+                    matric_number=payment.student.matric_number,
+                    reg_number=payment.student.reg_number,
+                    firstname=payment.student.firstname,
+                    middlename=payment.student.middlename,
+                    lastname=payment.student.lastname,
+                    state=payment.student.state,
+                    current_session=payment.student.current_session,
+                    entry_session=payment.student.entry_session,
+                    entry_mode=payment.student.entry_mode,
+                    faccode=payment.student.faccode,
+                    depcode=payment.student.depcode,
+                    certcode=payment.student.certcode,
+                    p_id=payment.p_id,
+                    amount_auth=payment.amount_auth,
+                    p_category=payment.p_category,
+                    display_item=payment.display_item,
+                    p_session=payment.p_session,
+                    p_state=payment.p_state,
+                    creation_date=str('%s#' % to_timezone(
+                        payment.creation_date, tz)),
+                    payment_date=str('%s#' % to_timezone(
+                        payment.payment_date, tz)),
+                    )
+                  )
         return hitlist