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

Timestamp:

7 Jul 2016, 06:18:06 (8 years ago)

Author:

Henrik Bettermann

Message:

Inform applicant how many emails were sent.

Location:

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

Files:

• applicants/browser.py (modified) (5 diffs)
• applicants/tests/test_browser.py (modified) (2 diffs)
• tests/test_smtp.py (modified) (1 diff)

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

@@ -1176 +1176 @@
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         failed = ''
+        emails_sent = 0
         for referee in self.context.referees:
             if referee.email_sent:
@@ -1193 +1194 @@
             success = kofa_utils.inviteReferee(referee, self.context, url_info)
             if success:
+                emails_sent += 1
                 self.context.writeLogMessage(
                     self, 'email sent: %s' % referee.email)
@@ -1198 +1200 @@
             else:
                 failed += '%s ' % referee.email
-        return failed
+        return failed, emails_sent
 
     @action(_('Finally Submit'), warning=WARNING)
@@ -1218 +1220 @@
         # Create mandates and send emails to referees
         if getattr(self.context, 'referees', None):
-            failed = self.informReferees()
+            failed, emails_sent = self.informReferees()
             if failed:
                 self.flash(
@@ -1225 +1227 @@
                 return
             msg = _('Form has been successfully submitted and '
-                    'all invitation emails were sent.')
+                    '${a} invitation emails were sent.',
+                    mapping = {'a':  emails_sent})
         IWorkflowInfo(self.context).fireTransition('submit')
         # application_date is used in export files for sorting.

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

@@ -1677 +1677 @@
         self.assertTrue(
             'Application submitted' in self.browser.contents)
+        self.assertTrue(
+            'Form has been successfully submitted and 2 '
+            'invitation emails were sent.' in self.browser.contents)
         logfile = os.path.join(
             self.app['datacenter'].storage, 'logs', 'applicants.log')
@@ -1687 +1690 @@
         self.assertTrue(referee1.email_sent)
         self.assertTrue(referee2.email_sent)
-        return
+        # If the form is being resubmitted, no more emails will be sent
+        IWorkflowState(self.applicant).setState('paid')
+        self.applicant.locked = False
+        self.browser.open(self.edit_path)
+        self.browser.getControl(name="confirm_passport").value = True
+        self.browser.getControl("Finally Submit").click()
+        self.assertTrue(
+            'Form has been successfully submitted and 0 '
+            'invitation emails were sent.' in self.browser.contents)
+        return

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py

@@ -61 +61 @@
         myself = __file__
         if myself.endswith('.pyc'):
-            myself = myself[:-2]
+            myself = myself[:-1]
         print "WARNING: external mail tests are skipped!"
         print "WARNING: edit %s to enable them." % myself