Changeset 6958

Timestamp:

26 Oct 2011, 15:49:21 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more hostel configuration fields.

Location:

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

Files:

• interfaces.py (modified) (5 diffs)
• vocabularies.py (added)

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

@@ -4 +4 @@
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.hostels.vocabularies import bed_letters, blocks
 
 class IHostelsContainer(IWAeUPObject):
@@ -18 +19 @@
         """Adds an INFO message to the log file
         """
-
-    #hostel_id = Attribute('Hostel Id')
 
     hostel_id = schema.TextLine(
@@ -45 +44 @@
 
     nr_of_floors = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Number of Floors',
         required = True,
         default = 3,
@@ -51 +50 @@
 
     rooms_per_floor = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Rooms per Floor',
         required = True,
         default = 20,
@@ -57 +56 @@
 
     beds_per_room = schema.Int(
-        title = u'Number of Blocks',
+        title = u'Beds per Room',
         required = True,
         default = 6,
         )
 
+    blocks_for_female = schema.List(
+        title = u'Blocks for Female Students',
+        value_type = schema.Choice(
+            vocabulary = blocks
+            ),
+        )
+
+    beds_for_fresh = schema.List(
+        title = u'Beds for Fresh Students',
+        value_type = schema.Choice(
+            vocabulary = bed_letters
+            ),
+        )
+
+    beds_for_final = schema.List(
+        title = u'Beds for Final Year Students',
+        value_type = schema.Choice(
+            vocabulary = bed_letters
+            ),
+        )