Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/hostels/hostel.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/hostel.py (modified) (6 diffs)

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

@@ -22 +22 @@
 from zope.event import notify
 from zope.component import getUtility
-from zope.component.interfaces import IFactory
 from datetime import datetime
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -41 +40 @@
         target = self.__name__
         return grok.getSite()['hostels'].logger_info(ob_class,target,comment)
-
-    @property
-    def bed_statistics(self):
-        total = len(self.keys())
-        booked = 0
-        for value in self.values():
-            if value.owner != NOT_OCCUPIED:
-                booked += 1
-        return {'booked':booked, 'total':total}
-
-    def clearHostel(self):
-        """Remove all beds
-        """
-        keys = [i for i in self.keys()] # create deep copy
-        for bed in keys:
-            del self[bed]
-        return
 
     def addBed(self, bed):
@@ -146 +128 @@
     grok.provides(IBed)
 
-    @property
-    def coordinates(self):
+    def getBedCoordinates(self):
         """Determine the coordinates from the bed_id.
         """
         return self.bed_id.split('_')
-
-    # The following property attributes are only needed
-    # for the exporter to ease evaluation with  Excel.
-
-    @property
-    def hall(self):
-        return self.coordinates[0]
-
-    @property
-    def block(self):
-        return self.coordinates[1]
-
-    @property
-    def room(self):
-        return self.coordinates[2]
-
-    @property
-    def bed(self):
-        return self.coordinates[3]
-
-    @property
-    def special_handling(self):
-        return self.bed_type.split('_')[0]
-
-    @property
-    def sex(self):
-        return self.bed_type.split('_')[1]
-
-    @property
-    def bt(self):
-        return self.bed_type.split('_')[2]
-
 
     def bookBed(self, student_id):
@@ -196 +145 @@
         """
         sh, sex, bt = self.bed_type.split('_')
-        hostel_id, block, room_nr, bed = self.coordinates
+        hostel_id, block, room_nr, bed = self.getBedCoordinates()
         hostel = self.__parent__
         beds_for_fresh = getattr(hostel,'beds_for_fresh',[])
@@ -272 +221 @@
 Bed = attrs_to_fields(Bed)
 
-class HostelFactory(grok.GlobalUtility):
-    """A factory for hostels.
-
-    We need this factory for the hostel processor.
-    """
-    grok.implements(IFactory)
-    grok.name(u'waeup.Hostel')
-    title = u"Create a new hostel.",
-    description = u"This factory instantiates new hostel instances."
-
-    def __call__(self, *args, **kw):
-        return Hostel()
-
-    def getInterfaces(self):
-        return implementedBy(Hostel)
-
-
 @grok.subscribe(IBedTicket, grok.IObjectRemovedEvent)
 def handle_bedticket_removed(bedticket, event):
@@ -297 +229 @@
         bedticket.bed.owner = NOT_OCCUPIED
         notify(grok.ObjectModifiedEvent(bedticket.bed))
-