Changeset 13319 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

14 Oct 2015, 17:07:35 (9 years ago)

Author:

Henrik Bettermann

Message:

Add page to release all expired allocations.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• container.py (modified) (1 diff)
• tests.py (modified) (3 diffs)

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

@@ -24 +24 @@
 from waeup.kofa.browser.layout import (
     KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
-    NullValidator)
+    NullValidator, UtilityView)
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
 from waeup.kofa.browser.layout import default_primary_nav_template
@@ -164 +164 @@
         self.applyData(self.context, **data)
         self.flash(_('Settings have been saved.'))
+        return
+
+class ReleaseExpiredAllocationsPage(UtilityView, grok.View):
+    """Release all expired allocated beds.
+    """
+    grok.context(IHostelsContainer)
+    grok.name('releaseexpired')
+    grok.require('waeup.waeup.manageHostels')
+
+    def update(self, n=7):
+        released = self.context.releaseExpiredAllocations(n)
+        if len(released):
+            message = ', '.join(released)
+            self.context.writeLogMessage(self, 'released: %s' % message)
+            flash_msg = _('Successfully released beds: ${a}', mapping = {'a':message})
+        else:
+            flash_msg = _('No bed released.')
+        self.flash(flash_msg, type='success')
+        self.redirect(self.url(self.context))
+        return
+
+    def render(self):
         return
 

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

@@ -65 +65 @@
             if student_id:
                 released.append('%s (%s)' % (bed.bed_id,student_id))
-        if len(released):
-            message = ', '.join(released)
-            self.writeLogMessage(self, 'released: %s' % message)
         return released
 

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

@@ -180 +180 @@
 
     def test_release_expired_allocations(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         cat = queryUtility(ICatalog, name='beds_catalog')
         bedticket = BedTicket()
@@ -191 +192 @@
         results = cat.searchResults(owner=(self.student_id, self.student_id))
         self.assertEqual(len(results), 1)
-        released = self.app['hostels'].releaseExpiredAllocations(7)
-        self.assertEqual(released, [])
+        self.browser.open(self.container_path + '/releaseexpired')
+        self.assertTrue('No bed released' in self.browser.contents)
         delta = timedelta(days=10)
         bedticket.booking_date = datetime.utcnow() - delta
-        released = self.app['hostels'].releaseExpiredAllocations(7)
-        self.assertEqual(len(released), 1)
-        self.assertEqual(released, ['hall_block_room_bed (K1000000)'])
+        self.browser.open(self.container_path + '/releaseexpired')
+        self.assertTrue(
+            'Successfully released beds: hall_block_room_bed (K1000000)'
+            in self.browser.contents)
         results = cat.searchResults(owner=(self.student_id, self.student_id))
         self.assertEqual(len(results), 0)
@@ -208 +210 @@
         logcontent = open(self.logfile).read()
         self.assertTrue(
-            'hostels.container.HostelsContainer - hostels - '
+            'hostels.browser.ReleaseExpiredAllocationsPage - hostels - '
             'released: hall_block_room_bed (K1000000)'
             in logcontent)