Changeset 13484 for main

Timestamp:

19 Nov 2015, 11:34:48 (9 years ago)

Author:

Henrik Bettermann

Message:

Add bed statistics view components.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• docs/source/userdocs/students/workflow.rst (modified) (1 diff)
• src/waeup/kofa/hostels/browser.py (modified) (2 diffs)
• src/waeup/kofa/hostels/browser_templates/containerstatistics.pt (added)
• src/waeup/kofa/hostels/tests.py (modified) (3 diffs)
• src/waeup/kofa/hostels/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.3.4.dev0 (unreleased)
 =======================
+
+* Add bed statistics components.
 
 * Add option which allows students to select a desired hostel before

main/waeup.kofa/trunk/docs/source/userdocs/students/workflow.rst

@@ -6 +6 @@
 Studying at a higher education institution means following
 orchestrated and repeatable patterns of activities or, in other
-words, following a workflow prescribed by the school regulations.
-This process starts with application for studying a programme
-offered by the school, and may end with de-registration of a
-student. But even after de-registration, former students can be kept
-in the system as alumni so that they can still access their records
-or can apply for official transcripts.
+words, following a process workflow prescribed by the school
+regulations. This process starts with application for studying a
+programme offered by the school, and may end with de-registration of
+a student. But even after de-registration, former students can be
+kept in the system as alumni so that they can still access their
+records or can apply for official transcripts.
 
 Kofa divides these 'repeatable patterns of activities' into two
-different and strictly seperated workflows: an application and a
-student registration workflow. The latter, which presupposes the
-admission of the student, will be described here.
+different and strictly seperated process workflows: an application
+and a student registration workflow. The latter, which presupposes
+the admission of the student, will be described here.
 
 A worflow defines states and transitions between the states. The

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser.py

@@ -115 +115 @@
     text = _('Manage accommodation section')
 
+class HostelsStatisticsActionButton(ManageActionButton):
+    grok.order(2)
+    grok.context(IHostelsContainer)
+    grok.view(HostelsContainerPage)
+    grok.require('waeup.manageHostels')
+    icon = 'actionicon_statistics.png'
+    text = _('Bed statistics')
+    target = 'statistics'
+
 class HostelsContainerManagePage(KofaEditFormPage):
     """The manage page for hostel containers.
@@ -196 +205 @@
     def render(self):
         return
+
+class HostelsStatisticsPage(KofaDisplayFormPage):
+    """Some statistics about beds in hostels.
+    """
+    grok.context(IHostelsContainer)
+    grok.name('statistics')
+    grok.require('waeup.manageHostels')
+    grok.template('containerstatistics')
+    label = _('Bed Statistics')
 
 class HostelAddFormPage(KofaAddFormPage):

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -238 +238 @@
         stats = utils.getBedStatistics()
         self.assertEqual(stats,
-            {'regular_male_fr': (1, 1),
-             'regular_female_fi': (0, 0),
-             'regular_male_re': (0, 0),
-             'regular_female_fr': (0, 0),
-             'regular_female_all': (0, 0),
-             'regular_female_re': (0, 0),
-             'regular_male_fi': (0, 0),
-             'regular_male_all': (0, 0)}
+            {'regular_male_fr': (0, 1, 1),
+             'regular_female_fi': (0, 0, 0),
+             'regular_male_re': (0, 0, 0),
+             'regular_female_fr': (0, 0, 0),
+             'regular_female_all': (0, 0, 0),
+             'regular_female_re': (0, 0, 0),
+             'regular_female_reserved': (0, 0, 0),
+             'regular_male_reserved': (0, 0, 0),
+             'regular_male_fi': (0, 0, 0),
+             'regular_male_all': (0, 0, 0)}
              )
         self.app[
@@ -253 +255 @@
         stats = utils.getBedStatistics()
         self.assertEqual(stats,
-            {'regular_male_fr': (0, 1),
-             'regular_female_fi': (0, 0),
-             'regular_male_re': (0, 0),
-             'regular_female_fr': (0, 0),
-             'regular_female_all': (0, 0),
-             'regular_female_re': (0, 0),
-             'regular_male_fi': (0, 0),
-             'regular_male_all': (0, 0)}
+            {'regular_male_fr': (1, 0, 1),
+             'regular_female_fi': (0, 0, 0),
+             'regular_male_re': (0, 0, 0),
+             'regular_female_fr': (0, 0, 0),
+             'regular_female_all': (0, 0, 0),
+             'regular_female_re': (0, 0, 0),
+             'regular_female_reserved': (0, 0, 0),
+             'regular_male_reserved': (0, 0, 0),
+             'regular_male_fi': (0, 0, 0),
+             'regular_male_all': (0, 0, 0)}
              )
 
@@ -478 +482 @@
         self.assertTrue('2 of 10' in self.browser.contents)
         bedticket.bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        # Managers can open the bed statistics page
+        self.browser.getLink("Bed statistics").click()
+        self.assertTrue('Bed Statistics</h1>' in self.browser.contents)
         # Remove entire hostel.
         self.browser.open(self.manage_container_path)

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

@@ -39 +39 @@
             'regular_female_fi',
             'regular_female_all',
+            'regular_female_reserved',
             'regular_male_fr',
             'regular_male_re',
             'regular_male_fi',
-            'regular_male_all',)
+            'regular_male_all',
+            'regular_male_reserved',)
         for bed_type in bed_types:
-            no = cat.searchResults(
+            free = cat.searchResults(
                 bed_type=(bed_type, bed_type),
                 owner=(NOT_OCCUPIED, NOT_OCCUPIED))
             all = cat.searchResults(
                 bed_type=(bed_type, bed_type))
-            stats[bed_type] = (len(no), len(all))
+            free = len(free)
+            total = len(all)
+            occ = total - free
+            stats[bed_type] = (occ, free, total)
         return stats