Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/interfaces.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/hostels/interfaces.py (modified) (6 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/interfaces.py

@@ -17 +17 @@
 ##
 from datetime import datetime
-from zope.interface import invariant, Invalid, Attribute
+from zope.interface import invariant, Invalid
 from zope import schema
 from waeup.kofa.interfaces import (
@@ -58 +58 @@
         )
 
-    def clearAllHostels():
-        """Clear all hostels.
-        """
-
 class IHostel(IKofaObject):
     """A base representation of hostels.
@@ -67 +63 @@
     """
 
-    bed_statistics = Attribute('Number of booked and total beds')
-
     def loggerInfo(ob_class, comment):
         """Adds an INFO message to the log file
-        """
-
-    def clearHostel():
-        """Remove all beds.
         """
 
@@ -135 +125 @@
         )
 
-    beds_for_pre= schema.List(
-        title = _(u'Beds for Pre-Study Students'),
-        value_type = schema.Choice(
-            vocabulary = bed_letters
-            ),
-        )
-
     beds_for_fresh = schema.List(
         title = _(u'Beds for Fresh Students'),
@@ -189 +172 @@
                 hostel.beds_for_returning +
                 hostel.beds_for_final +
-                hostel.beds_for_pre +
                 hostel.beds_for_all)
         if len(beds) != len(set(beds)):
@@ -199 +181 @@
     """
 
-    coordinates = Attribute('The coordinates of the bed from bed_id')
-
     def loggerInfo(ob_class, comment):
         """Adds an INFO message to the log file
         """
 
+    def getBedCoordinates():
+        """Determine the coordinates from bed_id.
+        """
     def bookBed(student_id):
         """Book a bed for a student.