Changeset 8664

Timestamp:

9 Jun 2012, 15:43:07 (12 years ago)

Author:

Henrik Bettermann

Message:

Use strict_deadline attribute.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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

@@ -964 +964 @@
             self.flash(_('The form cannot be submitted. Wrong state!'))
             return
-        if not self.context.__parent__.enddate or (
-            self.context.__parent__.enddate < datetime.now(pytz.utc)):
+        cond1 = self.context.__parent__.strict_deadline
+        cond2 = self.context.__parent__.enddate
+        cond3 = self.context.__parent__.enddate < datetime.now(pytz.utc)
+        if cond1 and (not cond2 or cond3):
             self.flash(
                 _('The form cannot be submitted. Application period has expired!'))

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

@@ -90 +90 @@
         applicantscontainer.application_category = 'basic'
         applicantscontainer.mode = 'create'
+        applicantscontainer.strict_deadline = True
         delta = timedelta(days=10)
         applicantscontainer.startdate = datetime.now(pytz.utc) - delta
@@ -792 +793 @@
         self.assertTrue(
             'Application period has expired' in self.browser.contents)
+        # We can either postpone the enddate ...
         self.applicantscontainer.enddate = datetime.now(
             pytz.utc) + timedelta(days=10)
+        self.browser.getControl(name="confirm_passport").value = True
+        self.browser.getControl("Final Submit").click()
+        self.assertTrue(
+            '... submitted ...' in self.browser.contents)
+        # ... or allow submission after deadline.
+        IWorkflowState(self.applicant).setState('paid')
+        self.applicant.locked = False
+        self.applicantscontainer.strict_deadline = False
+        self.browser.open(self.edit_path)
         self.browser.getControl(name="confirm_passport").value = True
         self.browser.getControl("Final Submit").click()

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

@@ -62 +62 @@
         return None
 
-    def getApplicantsStatistics(self,container):
+    def getApplicantsStatistics(self, container):
         state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
             ADMITTED:0, NOT_ADMITTED:0, CREATED:0}