Changeset 8645

Timestamp:

7 Jun 2012, 18:28:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Move statistics method to ApplicantsUtils? in order to ease customization.

Location:

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

Files:

• container.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)

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

@@ -24 +24 @@
 from zope.component.factory import Factory
 from zope.component.interfaces import IFactory
-from zope.catalog.interfaces import ICatalog
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.applicants.interfaces import (
-    IApplicantsContainer, IApplicantsContainerAdd, IApplicant
-    )
+    IApplicantsContainer, IApplicantsContainerAdd, IApplicant,
+    IApplicantsUtils)
 from waeup.kofa.utils.helpers import attrs_to_fields
-from waeup.kofa.applicants.workflow import (INITIALIZED,
-    STARTED, PAID, ADMITTED, NOT_ADMITTED, SUBMITTED, CREATED)
+
 
 def generate_applicant_id(container=None):
@@ -100 +98 @@
 
     @property
-    def unused_statistics(self):
-        state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
-            ADMITTED:0, NOT_ADMITTED:0, CREATED:0}
-        faculty_keys = grok.getSite()['faculties'].keys()
-        fac_stats = dict([(i,0) for i in faculty_keys])
-        for key in self.keys():
-            state = self[key].state
-            state_stats[state] += 1
-            cert = getattr(self[key],'course1',None)
-            if  cert is not None and state == SUBMITTED:
-                faculty = cert.__parent__.__parent__.__parent__
-                fac_stats[faculty.__name__] += 1
-        return state_stats, fac_stats
-
-    @property
     def statistics(self):
-        state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
-            ADMITTED:0, NOT_ADMITTED:0, CREATED:0}
-        cat = getUtility(ICatalog, name='applicants_catalog')
-        code = self.code
-        year = int(code[-4:])
-        target = code[:-4]
-        mxcode = target + str(year + 1)
-        for state in state_stats:
-            state_stats[state] = len(cat.searchResults(
-                state=(state, state),
-                applicant_id=(code, mxcode)))
-        return state_stats, None
+        return getUtility(IApplicantsUtils).getApplicantsStatistics(self)
 
 ApplicantsContainer = attrs_to_fields(ApplicantsContainer)

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

@@ -21 +21 @@
 from time import time
 import grok
+from zope.component import getUtility
+from zope.catalog.interfaces import ICatalog
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.applicants.interfaces import IApplicantsUtils
-from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.applicants.workflow import (INITIALIZED,
+    STARTED, PAID, ADMITTED, NOT_ADMITTED, SUBMITTED, CREATED)
 
 class ApplicantsUtils(grok.GlobalUtility):
@@ -57 +61 @@
         payment.p_category = 'application'
         return None
+
+    def getApplicantsStatistics(self,container):
+        state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
+            ADMITTED:0, NOT_ADMITTED:0, CREATED:0}
+        cat = getUtility(ICatalog, name='applicants_catalog')
+        code = container.code
+        year = int(code[-4:])
+        target = code[:-4]
+        mxcode = target + str(year + 1)
+        for state in state_stats:
+            state_stats[state] = len(cat.searchResults(
+                state=(state, state),
+                applicant_id=(code, mxcode)))
+        return state_stats, None