Changeset 934

Timestamp:

24 Nov 2006, 16:59:44 (18 years ago)

Author:

joachim

Message:

replace which_sex by blocks_for_female,
added a hack to support the undergraduate halls on Ekenhuan Campus
these halls have to get the special code Ekenhuan Campus.
todo use this special code in bed allocation.

Location:

WAeUP_SRP/trunk

Files:

• Accommodation.py (modified) (1 diff)
• profiles/default/layouts/acco_hall.xml (modified) (2 diffs)
• profiles/default/vocabularies/acco_special_handling.xml (modified) (1 diff)
• skins/waeup_accommodation/getBedTypeNames.py (modified) (1 diff)

WAeUP_SRP/trunk/Accommodation.py

@@ -51 +51 @@
             reserved = [(r.split('/')[0],int(r.split('/')[1])) for r in re.split(',|\.| ',h.reserved_rooms)
                                      if r]
-            sex = 'male'
-            if h.which_sex:
-                sex = 'female'
             #for block in range(1,int(h.nr_of_blocks)+1):
             for block in 'ABCDEFGHIJ'[:int(h.nr_of_blocks)]:
+                sex = 'male'
+                if block in h.blocks_for_female:
+                    sex = 'female'
                 for floor in range(1,int(h.nr_of_floors)+1):
                     for room in range(1,int(h.rooms_per_floor)+1):

WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml

@@ -141 +141 @@
 <property name="vocabulary">acco_special_handling</property>
 </widget>
-<widget name="study_courses" meta_type="Lines Widget">
- <property name="title">Studycourses</property>
- <property name="fields">
-  <element value="study_courses"/>
- </property>
- <property name="label">Studycourses</property>
- <property name="label_edit">Studycourses</property>
- <property name="readonly_layout_modes"/>
- <property name="hidden_layout_modes"/>
- <property name="hidden_readonly_layout_modes"/>
- <property name="width">20</property>
- <property name="height">3</property>
-</widget> 
 <widget name="maintenance_code" meta_type="Select Widget">
  <property name="title">Maintenance Fee Prefix</property>
@@ -176 +163 @@
   <row>
    <cell name="special_handling"/>
-  </row>
-  <row>
-   <cell name="study_courses"/>
   </row>
   <row>

WAeUP_SRP/trunk/profiles/default/vocabularies/acco_special_handling.xml

@@ -8 +8 @@
  <item key="pg" msgid="">Postgraduate</item>
  <item key="med" msgid="">Medical (Level 500/600)</item>
+ <item key="ekenhuan" msgid="">Ekenhuan Campus</item>
 </object>

WAeUP_SRP/trunk/skins/waeup_accommodation/getBedTypeNames.py

@@ -16 +16 @@
                  ]
 special = [item for item in context.portal_vocabularies.acco_special_handling.items()
-                            if item[0] != 'no']
+                            if not item[0].startswith('no')]
 type_suffixes.extend(special)
+type_suffixes.append(('ekenhuan','Ekenhuan Campus'))
 dict = {}
 for gender in ('female','male'):