Changeset 6816

Timestamp:

22 Sep 2011, 12:30:15 (13 years ago)

Author:

Henrik Bettermann

Message:

Application is only allowed between start and end time. Show dates on login page and logout applicants if current time exceeds these limits.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/browser_templates/loginapplicant.pt (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (5 diffs)
• students/workflow.py (modified) (1 diff)

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

@@ -25 +25 @@
 import grok
 
-from datetime import datetime
+from datetime import datetime, date
+from zope.authentication.interfaces import ILogout, IAuthentication
+from zope.component import getUtility
 from zope.formlib.widget import CustomWidgetFactory
 from zope.formlib.form import setUpEditWidgets
@@ -412 +414 @@
         pin = self.request.principal.access_code
 
-        # Mark pin as used (this also fires a pin related transition)
+        # If application has not yet started,
+        # logout without marking AC as used
+        if self.context.startdate > date.today():
+            self.flash('Application has not yet started.')
+            auth = getUtility(IAuthentication)
+            ILogout(auth).logout(self.request)
+            self.redirect(self.url(self.context, 'login'))
+            return
+
+        # If application has ended and applicant record doesn't exist,
+        # logout without marking AC as used
+        if not pin in self.context.keys() and self.context.enddate < date.today():
+            self.flash('Application has ended.')
+            auth = getUtility(IAuthentication)
+            ILogout(auth).logout(self.request)
+            self.redirect(self.url(self.context, 'login'))
+            return
+
+        # Mark AC as used (this also fires a pin related transition)
         if get_access_code(pin).state == USED:
             pass

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/loginapplicant.pt

@@ -50 +50 @@
   </ul>
 </div>
-<div tal:on-error="nothing">
-  <div class="error" tal:content="view/getDeadline">
-    The deadline is NOW
-  </div>
+<br />
+<div>
+  Start date of application:
+  <span tal:replace="python: context.startdate.strftime('%d/%m/%Y') ">STARTDATE</span>
 </div>
+<div>
+  Closing date of application:
+  <span tal:replace="python: context.enddate.strftime('%d/%m/%Y')">ENDDATE</span>
+</div>
+<br />
+<div tal:condition="context/strict_deadline">
+  No application after deadline!
+</div>

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

@@ -26 +26 @@
 import tempfile
 from StringIO import StringIO
-from datetime import datetime
+from datetime import datetime, date, timedelta
 from mechanize import LinkNotFoundError
 from zope.component import createObject
@@ -83 +83 @@
         applicantscontainer.year = 2009
         applicantscontainer.application_category = 'basic'
+        delta = timedelta(days=10)
+        applicantscontainer.startdate = date.today() - delta
+        applicantscontainer.enddate = date.today() + delta
         self.app['applicants']['app2009'] = applicantscontainer
 
@@ -350 +353 @@
         appl = appl[pin]
         passp = appl.passport
-        #import pdb; pdb.set_trace()
         passp_len = len(passp.file.read())
         self.assertEqual(passp_len, PH_LEN)
@@ -456 +458 @@
         applicantscontainer = ApplicantsContainer()
         applicantscontainer.ac_prefix = 'APP'
+        delta = timedelta(days=10)
+        applicantscontainer.startdate = date.today() - delta
+        applicantscontainer.enddate = date.today() + delta
         app['applicants']['testapplicants'] = applicantscontainer
 
@@ -629 +634 @@
     def test_after_login_default_browsable(self):
         # After login we see the placeholder image in the edit view
+        #import pdb; pdb.set_trace()
         self.login()
         self.assertEqual(self.browser.url, self.edit_path)

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

@@ -2 +2 @@
 """
 import grok
-from datetime import datetime
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent