Changeset 13992 for main

Timestamp:

26 Jun 2016, 05:35:30 (9 years ago)

Author:

Henrik Bettermann

Message:

Delete mandate after report creation.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• browser_templates/refereereportpage.pt (added)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -1508 +1508 @@
 class RefereeReportAddFormPage(KofaAddFormPage):
     """Add-form to add an referee report. This form
-    is protected by a mandate. (not yet ready)
+    is protected by a mandate.
     """
     grok.context(IApplicant)
@@ -1515 +1515 @@
     form_fields = grok.AutoFields(
         IApplicantRefereeReport).omit('creation_date')
+    grok.template('refereereportpage')
     label = _('Add referee report')
     pnav = 3
@@ -1529 +1530 @@
         # Check mandate
         form = self.request.form
-        mandate_id = form.get('mandate_id', None)
-        mandates = grok.getSite()['mandates']
-        mandate = mandates.get(mandate_id, None)
+        self.mandate_id = form.get('mandate_id', None)
+        self.mandates = grok.getSite()['mandates']
+        mandate = self.mandates.get(self.mandate_id, None)
         if mandate is None and not self.request.form.get('form.actions.submit'):
             self.flash(_('No mandate.'), type='warning')
@@ -1558 +1559 @@
         self.flash(_('Referee report has been saved. Thank you!'))
         self.context.writeLogMessage(self, 'added: %s' % report.r_id)
-        # XXX: Delete mandate
-        # XXX: Send email
+        # Delete mandate
+        del self.mandates[self.mandate_id]
         self.redirect(self.application_url())
         return

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

@@ -1570 +1570 @@
                 container_name_1, self.applicant.application_number)
         self.app['mandates'].addMandate(mandate)
+        self.assertEqual(len(self.app['mandates'].keys()), 1)
         # Let's open the add form page via the mandate view
         self.browser.open('http://localhost/app/mandate?mandate_id=%s'
             % mandate.mandate_id)
+        self.assertTrue('Joan None' in self.browser.contents)
+        # Report can't be saved without required fields
+        self.browser.getControl(name="form.email").value = ''
+        self.browser.getControl("Submit").click()
+        self.assertTrue('Required input is missing' in self.browser.contents)
+        self.browser.getControl(name="form.email").value = 'bb@bb.bb'
         self.browser.getControl("Submit").click()
         self.assertTrue('Referee report has been saved' in self.browser.contents)
@@ -1595 +1602 @@
             in logcontent
             )
+        # Mandate is deleted
+        self.assertEqual(len(self.app['mandates'].keys()), 0)