Changeset 936

Timestamp:

24 Nov 2006, 17:33:09 (18 years ago)

Author:

joachim

Message:

some late modifications

Location:

WAeUP_SRP/trunk

Files:

• Accommodation.py (modified) (2 diffs)
• profiles/default/schemas/acco_hall.xml (modified) (1 diff)
• profiles/default/vocabularies/acco_special_handling.xml (modified) (1 diff)

WAeUP_SRP/trunk/Accommodation.py

@@ -63 +63 @@
                             if (block,room_nr) in reserved:
                                 bt = "reserved"
-                            elif h.special_handling != "no":
+                            elif not h.special_handling.startswith("no"):
                                 bt = h.special_handling
                             elif bed in h.beds_for_fresh:
@@ -71 +71 @@
                             elif bed in h.beds_for_final:
                                 bt = 'fi'
+                            if h.special_handling.startswith("no_"):
+                                bt += h.special_handling[3:]
                             bt = "%(sex)s_%(bt)s" % vars()
                             uid = '%s_%s_%d_%s' % (hall.getId(),block,room_nr,bed)

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

@@ -20 +20 @@
   </field>
  <field name="special_handling" meta_type="CPS String Field"/>
- <field name="study_courses" meta_type="CPS String List Field"/>
  <field name="text" meta_type="CPS String Field">
   <property name="is_searchabletext">False</property>

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>
+ <item key="no_ekenhuan" msgid="">Ekenhuan Campus</item>
 </object>