Changeset 8591

Timestamp:

1 Jun 2012, 11:25:22 (12 years ago)

Author:

Henrik Bettermann

Message:

Extend applicants statistics.

Location:

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

Files:

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

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

@@ -1 @@
-<h2 i18n:domain="waeup.kofa">Container Statistics</h2>
-
-<table i18n:domain="waeup.kofa">
-  <thead>
-    <tr>
-      <th i18n:translate="">Application State</th>
-      <th i18n:translate="">Number of Applicants</th>
-    </tr>
-  </thead>
-  <tbody tal:define="stats context/statistics">
-    <tr tal:repeat="state python:('initialized',
-        'started','paid','submitted','admitted','not admitted',
-        'created')">
-      <td tal:content="state">STATE</td>
-      <td tal:content="python: stats[state] ">NUMBER</td>
-    </tr>
-  </tbody>
-</table>
+<tal:statistics define="stats context/statistics" i18n:domain="waeup.kofa">
+  <h2 i18n:translate="">Container Statistics</h2>
+  <table class="span8">
+    <thead>
+      <tr>
+        <th i18n:translate="" width="40%">Application State</th>
+        <th i18n:translate="">Number of Applicants</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="state python:('initialized',
+          'started','paid','submitted','admitted','not admitted',
+          'created')">
+        <td tal:content="state">STATE</td>
+        <td tal:content="python: stats[0][state] ">NUMBER</td>
+      </tr>
+    </tbody>
+  </table>
+  <table class="span8">
+    <thead>
+      <tr>
+        <th i18n:translate="" width="40%">Faculty</th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="fac python:stats[1].keys()">
+        <td tal:content="fac">FAC</td>
+        <td tal:content="python: stats[1][fac] ">NUMBER</td>
+      </tr>
+    </tbody>
+  </table>
+</tal:statistics>

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

@@ -99 +99 @@
     @property
     def statistics(self):
-        statistics = {INITIALIZED:0, STARTED:0, PAID:0, SUBMITTED:0,
+        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():
-            statistics[self[key].state] += 1
-        return statistics
+            state_stats[self[key].state] += 1
+            cert = getattr(self[key],'course1',None)
+            if  cert is not None:
+                faculty = cert.__parent__.__parent__.__parent__
+                fac_stats[faculty.__name__] += 1
+        return state_stats, fac_stats
 
 ApplicantsContainer = attrs_to_fields(ApplicantsContainer)

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

@@ -131 +131 @@
         # because managers are allowed to edit this required field
         self.applicant.reg_number = u'1234'
+        self.applicant.course1 = certificate
         app['applicants']['app2009'].addApplicant(self.applicant)
         IUserAccount(
@@ -376 +377 @@
         self.assertTrue('<td>initialized</td>' in self.browser.contents)
         self.assertTrue('<td>1</td>' in self.browser.contents)
-        self.assertEqual(self.applicantscontainer.statistics,
+        self.assertEqual(self.applicantscontainer.statistics[0],
             {'not admitted': 0, 'started': 0, 'created': 0,
             'admitted': 0, 'submitted': 0, 'initialized': 1, 'paid': 0})
+        self.assertEqual(self.applicantscontainer.statistics[1],
+            {u'fac1': 1})
         return