Changeset 13968 for main

Timestamp:

22 Jun 2016, 04:39:50 (9 years ago)

Author:

Henrik Bettermann

Message:

Make provision against storing other objects than applicant payments in applicant containers.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• applicant.py (modified) (2 diffs)
• browser_templates/applicantdisplaypage.pt (modified) (1 diff)
• browser_templates/applicanteditpage.pt (modified) (1 diff)
• export.py (modified) (2 diffs)
• tests/test_applicant.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• tests/test_export.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -41 +41 @@
     IApplicant, IApplicantEdit, ISpecialApplicant)
 from waeup.kofa.applicants.workflow import application_states_dict
+from waeup.kofa.applicants.payment import ApplicantOnlinePayment
 
 def search(query=None, searchtype=None, view=None):
@@ -71 +72 @@
         self.applicant_id = None
         return
+
+    @property
+    def payments(self):
+        payments = [value for value in self.values()
+            if isinstance(value, ApplicantOnlinePayment)]
+        return payments
 
     def writeLogMessage(self, view, message):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

@@ -54 +54 @@
     </thead>
     <tbody>
-      <tr tal:repeat="value context/values">
+      <tr tal:repeat="value context/payments">
         <td> <a tal:attributes="href python:view.url(value)">
         <span tal:content="value/p_id">PID</span></a></td>

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

@@ -106 +106 @@
       </thead>
       <tbody>
-        <tr tal:repeat="cl context/values">
+        <tr tal:repeat="cl context/payments">
            <td>
             <input type="checkbox"

main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py

@@ -201 +201 @@
         payments = []
         for applicant in used:
-            for payment in applicant.values():
+            for payment in applicant.payments:
                 if payment.p_state == 'paid':
                     payments.append(payment)
@@ -215 +215 @@
         payments = []
         for applicant in used:
-            for payment in applicant.values():
+            for payment in applicant.payments:
                 if payment.p_state == 'paid':
                     payments.append(payment)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py

@@ -34 +34 @@
     )
 from waeup.kofa.applicants.interfaces import IApplicant
+from waeup.kofa.applicants.payment import ApplicantOnlinePayment
 from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer
 
@@ -205 +206 @@
         return
 
+    def test_payments(self):
+        payment = ApplicantOnlinePayment()
+        no_payment = object()
+        self.applicant['pid'] = payment
+        self.applicant['nopid'] = no_payment
+        self.assertEqual(len(self.applicant.values()),2)
+        self.assertEqual(len(self.applicant.payments),1)
+        self.assertEqual(self.applicant.payments[0],payment)
+        return
+
 class ApplicantFactoryTest(FunctionalTestCase):
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -1079 +1079 @@
         self.assertEqual(len(self.special_applicant.keys()), 1)
         # The applicant's workflow state is paid ...
-        self.special_applicant.values()[0].approveApplicantPayment()
+        self.special_applicant.payments[0].approveApplicantPayment()
         self.assertEqual(self.special_applicant.state, 'paid')
         self.browser.open(applicant_path + '/edit')
@@ -1094 +1094 @@
         self.assertEqual(len(self.special_applicant.keys()), 2)
         # Second payment can also be approved wthout error message
-        flashtype, msg, log = self.special_applicant.values()[1].approveApplicantPayment()
+        flashtype, msg, log = self.special_applicant.payments[1].approveApplicantPayment()
         self.assertEqual(flashtype, 'success')
         self.assertEqual(msg, 'Payment approved')

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

@@ -283 +283 @@
         applicant = self.setup_applicant(self.applicant)
         exporter = ApplicantPaymentExporter()
-        exporter.export(applicant.values(), self.outfile)
+        exporter.export(applicant.payments, self.outfile)
         result = open(self.outfile, 'rb').read()
         cdate = str('%s#' % self.applicant['p120'].creation_date)