Changeset 6425

Timestamp:

20 Jun 2011, 16:04:14 (13 years ago)

Author:

uli

Message:

Support batch-local counters for used/disabled pins. This time we only set a simple attribute and remove the enable(), disable(), ... methods that have no purpose any more.

Location:

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

Files:

• accesscodes.py (modified) (2 diffs)
• browser.txt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• workflow.py (modified) (4 diffs)

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

@@ -81 +81 @@
         self.num = num
         self.invalidated_num = 0
+        self.used_num = 0
         self.disabled_num = 0
 
@@ -134 +135 @@
         return
 
-    def invalidate(self, ac_id, student_id=None):
-        """Invalidate the AC with ID ``ac_id``.
-        """
-        self.invalidated_num += 1
-
-    def disable(self, ac_id, user_id=None):
-        """Disable the AC with ID ``ac_id``.
-
-        ``user_id`` is the user ID of the user triggering the
-        process. Already disabled ACs are left untouched.
-        """
-        num = self._acids[ac_id]
-        ac = self.getAccessCode(ac_id)
-        if ac._disabled == True:
-            return
-        self.disabled_num += 1
-
-    def enable(self, ac_id):
-        """(Re-)enable the AC with ID ``ac_id``.
-
-        This leaves the given AC in state ``unused``. Already enabled
-        ACs are left untouched.
-        """
+    #def invalidate(self, ac_id, student_id=None):
+    #    """Invalidate the AC with ID ``ac_id``.
+    #    """
+    #    self.invalidated_num += 1
+
+    #def disable(self, ac_id, user_id=None):
+    #    """Disable the AC with ID ``ac_id``.
+    #
+    #    ``user_id`` is the user ID of the user triggering the
+    #    process. Already disabled ACs are left untouched.
+    #    """
+    #    num = self._acids[ac_id]
+    #    ac = self.getAccessCode(ac_id)
+    #    if ac._disabled == True:
+    #        return
+    #    self.disabled_num += 1
+
+    #def enable(self, ac_id):
+    #    """(Re-)enable the AC with ID ``ac_id``.
+    #
+    #    This leaves the given AC in state ``unused``. Already enabled
+    #    ACs are left untouched.
+    #    """
 
     def createCSVLogFile(self):

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt

@@ -140 +140 @@
     >>> browser.getControl('Create batch').click()
 
-We also invalidate one entry:
-
-    >>> batch = getRootFolder()['myuniversity']['accesscodes']['BLA-1']
-    >>> ac = list(batch.entries())[0]
-    >>> batch.invalidate(ac.representation)
 
 Creating Archive Files

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

@@ -67 +67 @@
         default = 0.0, min = 0.0,
         )
+    disabled_num = schema.Int(
+        title = u'Number of disabled access codes inside the batch',
+        default = 0,
+        readonly = True,
+        )
+    used_num = schema.Int(
+        title = u'Number of used access codes inside the batch',
+        default = 0,
+        readonly = True,
+        )
 
 class IAccessCodeBatchContainer(IWAeUPObject):

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

@@ -39 +39 @@
     if batch is None:
         return
-    pin = context.representation
-    batch.invalidate(pin)
+    batch.used_num += 1
     return
 
-def disable_action(wf, context):
-    #batch = getattr(context, '__parent__', None)
-    #if batch is None:
-    #    return
-    #pin = context.representation
-    #batch.disable(pin)
+def disable_used_action(wf, context):
+    batch = getattr(context, '__parent__', None)
+    if batch is None:
+        return
+    batch.used_num -= 1
+    batch.disabled_num += 1
+
+def disable_unused_action(wf, context):
+    batch = getattr(context, '__parent__', None)
+    if batch is None:
+        return
+    batch.disabled_num += 1
     return
 
@@ -55 +60 @@
     if batch is None:
         return
-    pin = context.representation
-    batch.enable(pin)
+    batch.disabled_num -= 1
     return
 
@@ -79 +83 @@
         source = INITIALIZED,
         destination = DISABLED,
-        action = disable_action),
+        action = disable_unused_action),
 
     Transition(
@@ -86 +90 @@
         source = USED,
         destination = DISABLED,
-        action = disable_action),
+        action = disable_used_action),
 
     Transition(