Changeset 6359

Timestamp:

12 Jun 2011, 12:00:19 (13 years ago)

Author:

uli

Message:

PIN stuff.

Location:

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

Files:

• accesscodes/__init__.py (modified) (1 diff)
• accesscodes/accesscodes.py (modified) (7 diffs)
• accesscodes/tests (added)
• accesscodes/tests/__init__.py (added)
• accesscodes/tests/test_accesscodes.py (added)
• accesscodes/workflow.py (added)
• applicants/browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/__init__.py

@@ -1 +1 @@
 # Make this a package.
-from waeup.sirp.accesscodes.accesscodes import get_access_code
+from waeup.sirp.accesscodes.accesscodes import (
+    get_access_code, invalidate_accesscode)
 
 # Public API of this submodule
 __all__ = [
-    get_access_code
+    get_access_code,
+    invalidate_accesscode,
     ]
 

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -6 +6 @@
 from BTrees.OIBTree import OIBTree
 from datetime import datetime
+from hurry.workflow.interfaces import IWorkflowInfo
 from random import SystemRandom as random
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
@@ -11 +12 @@
     IAccessCode, IAccessCodeBatch, IAccessCodeBatchContainer
     )
+from waeup.sirp.accesscodes.workflow import DISABLED
 
 class ManageACBatches(grok.Permission):
     grok.name('waeup.manageACBatches')
 
-class AccessCode(grok.Context):
+class AccessCode(grok.Model):
     grok.implements(IAccessCode)
 
@@ -25 +27 @@
         self.student_id = student_id
         self._disabled = disabled
+        IWorkflowInfo(self).fireTransition('init')
 
     @property
@@ -155 +158 @@
         self.invalidated_num += 1
 
-    def disable(self, ac_id, user_id):
+    def disable(self, ac_id, user_id=None):
         """Disable the AC with ID ``ac_id``.
 
@@ -389 +392 @@
         return
 
+    def invalidate(self, ac_id):
+        """Invalidate the AC with ID ``ac_id``.
+        """
+        ac = self.getAccessCode(ac_id)
+        if ac is None:
+            return
+        ac.__parent__.invalidate(ac_id)
+        return
+
 
 class AccessCodePlugin(grok.GlobalUtility):
@@ -430 +442 @@
     if batch is None:
         return None
-
     try:
         code = batch.getAccessCode(access_code)
@@ -436 +447 @@
         return None
     return code
+
+def invalidate_accesscode(access_code):
+    ac = get_access_code(access_code)
+    info = IWorkflowInfo(ac)
+    info.fireTransition('use')
+    return
+
+def disable_accesscode(access_code):
+    ac = get_access_code(access_code)
+    info = IWorkflowInfo(ac)
+    info.fireTransitionToward(DISABLED)
+    return
+
+def reenable_accesscode(access_code):
+    ac = get_access_code(access_code)
+    info = IWorkflowInfo(ac)
+    info.fireTransition('reenable')
+    return

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

@@ -32 +32 @@
 
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
-
 from reportlab.pdfgen import canvas
 
+from waeup.sirp.accesscodes import invalidate_accesscode
 from waeup.sirp.browser import (
     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage)
@@ -415 +415 @@
             return
         pin = self.request.principal.access_code
-        if pin not in self.context.keys():
-            # Create applicant record
-            applicant = Applicant()
-            applicant.access_code = pin
-            self.context[pin] = applicant
+        if pin in self.context.keys():
+            self.redirect(self.url(self.context[pin], 'edit'))
+            return
+
+        # Mark pin as used
+        invalidate_accesscode(pin)
+
+        # Create applicant record
+        applicant = Applicant()
+        applicant.access_code = pin
+        self.context[pin] = applicant
+
         # Assign current principal the owner role on created applicant
         # record