Changeset 9400 for main

Timestamp:

24 Oct 2012, 05:16:32 (12 years ago)

Author:

Henrik Bettermann

Message:

Make special handling of beds more easily customizable.

Location:

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

Files:

• hostels/interfaces.py (modified) (2 diffs)
• hostels/vocabularies.py (modified) (3 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -23 +23 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.hostels.vocabularies import (
-    bed_letters, blocks, special_handling, StudentSource)
+    bed_letters, blocks, SpecialHandlingSource, StudentSource)
 
 class IHostelsContainer(IKofaObject):
@@ -172 +172 @@
     special_handling = schema.Choice(
         title = _(u'Special Handling'),
-        vocabulary = special_handling,
+        source = SpecialHandlingSource(),
         required = True,
         default = u'regular',

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

@@ -24 +24 @@
 from waeup.kofa.interfaces import SimpleKofaVocabulary
 from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.university.vocabularies import ContextualDictSourceFactoryBase
 
 NOT_OCCUPIED = u'not occupied'
@@ -53 +54 @@
     def getTitle(self, context, value):
         return "%s - %s" % (value, self.acco_students(context)[value])
+
+class SpecialHandlingSource(ContextualDictSourceFactoryBase):
+    """A application category source delivers all special handling categories
+    provided for accommodation booking.
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'SPECIAL_HANDLING_DICT'
 
 bed_letters = SimpleKofaVocabulary(
@@ -87 +95 @@
     (_('Block Q'),'Q'),
     )
-
-special_handling = SimpleKofaVocabulary(
-    (_('Regular Hostel'),'regular'),
-    (_('Blocked Hostel'),'blocked'),
-    (_('Postgraduate Hostel'),'pg'),
-    )

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

@@ -143 +143 @@
         3: 'Combined',
         9: 'N/A'
+        }
+
+    SPECIAL_HANDLING_DICT = {
+        'regular': 'Regular Hostel',
+        'blocked': 'Blocked Hostel',
+        'pd': 'Postgraduate Hostel'
         }