Changeset 16269 for main

Timestamp:

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

Author:

Henrik Bettermann

Message:

Use the power of the get_payments function.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py (modified) (1 diff)

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

@@ -390 +390 @@
                 depcode=(depcode, depcode),
                 ))
-        payments = get_payments(results)
+        payments = get_payments(results, paysession=p_session)
         tz = getUtility(IKofaUtils).tzinfo
         for payment in payments:
-            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)),
-                    )
-                  )
+            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