Changeset 8643

Timestamp:

7 Jun 2012, 13:02:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Use applicants_catalog for statistics.

Location:

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

Files:

• browser_templates/applicantcontainerstatistics.pt (modified) (1 diff)
• container.py (modified) (3 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantcontainerstatistics.pt

@@ -17 +17 @@
     </tbody>
   </table>
-  <table class="span8">
+  <table class="span8" tal:condition="python: stats[1]">
     <thead>
       <tr>

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

@@ -21 +21 @@
 from random import SystemRandom as r
 import grok
+from zope.component import getUtility
 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 (
@@ -98 +100 @@
 
     @property
-    def statistics(self):
+    def unused_statistics(self):
         state_stats = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
             ADMITTED:0, NOT_ADMITTED:0, CREATED:0}
@@ -111 +113 @@
                 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
 
 ApplicantsContainer = attrs_to_fields(ApplicantsContainer)

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

@@ -381 +381 @@
             {'not admitted': 0, 'started': 0, 'created': 0,
             'admitted': 0, 'submitted': 0, 'initialized': 1, 'paid': 0})
-        self.assertEqual(self.applicantscontainer.statistics[1],
-            {u'fac1': 0})
+        #self.assertEqual(self.applicantscontainer.statistics[1],
+        #    {u'fac1': 0})
         IWorkflowState(self.applicant).setState('submitted')
+        notify(grok.ObjectModifiedEvent(self.applicant))
         self.assertEqual(self.applicantscontainer.statistics[0],
             {'not admitted': 0, 'started': 0, 'created': 0,
             'admitted': 0, 'submitted': 1, 'initialized': 0, 'paid': 0})
-        self.assertEqual(self.applicantscontainer.statistics[1],
-            {u'fac1': 1})
+        #self.assertEqual(self.applicantscontainer.statistics[1],
+        #    {u'fac1': 1})
         return