Changeset 7003 for main

Timestamp:

4 Nov 2011, 21:26:33 (13 years ago)

Author:

Henrik Bettermann

Message:

We have to call notify(grok.ObjectModifiedEvent?(self)) to update the catalog when only an attribute is changed.

Only one bed per student is allowed.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• hostels/hostel.py (modified) (3 diffs)
• hostels/tests.py (modified) (2 diffs)
• students/browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py

@@ -18 +18 @@
 """
 import grok
+from zope.event import notify
 from datetime import datetime
 from grok import index
@@ -130 +131 @@
         if self.owner == NOT_OCCUPIED:
             self.owner = student_id
+            notify(grok.ObjectModifiedEvent(self))
             return None
         else:
@@ -135 +137 @@
 
     def switchReservation(self):
-        """Reserves a bed or unreserve bed respectively.
+        """Reserves or unreserve bed respectively.
         """
         sh, sex, bt = self.bed_type.split('_')

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

@@ -19 +19 @@
 import shutil
 import tempfile
+import grok
+from zope.event import notify
+
 from zope.interface.verify import verifyClass, verifyObject
 from zope.component.hooks import setSite, clearSite
@@ -130 +133 @@
         # We can find a certain bed
         cat = queryUtility(ICatalog, name='beds_catalog')
-        results = cat.searchResults(bed_type=('abc', 'abc'))
+        results = cat.searchResults(bed_type=(u'abc', u'abc'))
+        results = [x for x in results] # Turn results generator into list
+        assert len(results) == 1
+        assert results[0] is self.app['hostels']['hall-x']['xyz']
+
+    def test_search_by_owner(self):
+        # We can find a certain bed
+        myobj = self.app['hostels']['hall-x']['xyz']
+        myobj.owner = u'abc'
+        notify(grok.ObjectModifiedEvent(myobj))
+        cat = queryUtility(ICatalog, name='beds_catalog')
+        results = cat.searchResults(owner=(u'abc', u'abc'))
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -1108 +1108 @@
             self.flash('Activation code is invalid.')
             return
-        # Search a bed and exit if no bed is found
+        # Search a bed and exit if no bed is found or if the student
+        # has already booked a bed
         cat = queryUtility(ICatalog, name='beds_catalog', default=None)
         entries = cat.searchResults(
@@ -1117 +1118 @@
             self.flash('There is no free bed in your category %s.'
                         % acc_details['bt'])
+            return
+        entries = cat.searchResults(
+            owner=(student.student_id,student.student_id))
+        if len(entries):
+            bed = [entry for entry in entries][0]
+            self.flash('You already booked bed %s.'
+                        % bed.bed_id)
             return
         # Mark pin as used (this also fires a pin related transition)