Changeset 2421

Timestamp:

23 Oct 2007, 08:42:32 (17 years ago)

Author:

Henrik Bettermann

Message:

add 'Beds for PRE-NCE' category (displayed only for collgeges)

Location:

WAeUP_SRP

Files:

• base/Accommodation.py (modified) (1 diff)
• base/skins/waeup_accommodation/getAccommodationInfo.py (modified) (2 diffs)
• uniben/profiles/default/layouts/acco_hall.xml (modified) (1 diff)
• uniben/profiles/default/schemas/acco_hall.xml (modified) (1 diff)

WAeUP_SRP/base/Accommodation.py

@@ -69 +69 @@
                             elif bed in h.beds_for_fresh:
                                 bt = 'fr'
-                            #elif bed in h.beds_for_returning:
-                            #    bt = 're'
+                            elif bed in h.beds_for_pre:
+                                bt = 'pr'
                             elif bed in h.beds_for_final:
                                 bt = 'fi'

WAeUP_SRP/base/skins/waeup_accommodation/getAccommodationInfo.py

@@ -97 +97 @@
 elif int(s_brain.level) < 300:
     bt = 're'
+elif int(s_brain.level) < 100:
+    bt = 'pr'    
+elif s_brain.faculty in ('MED') and int(s_brain.level) >= 400:
+    bt = "med"
 else:
     res = context.portal_catalog(portal_type = "Certificate", id = s_brain.course)
@@ -122 +126 @@
 elif s_brain.course in pti_certificates:
     bt += "_pti"
-elif s_brain.faculty in ('MED') and int(s_brain.level) >= 400:
-    bt += "_med"
+
 
 info['sex']=d['sex']

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

@@ -8 +8 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
+
+ <widget name="beds_for_pre" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_pre"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Beds for PRE-NCE Students</property>
+  <property name="label_edit">Beds for PRE-NCE Students</property>
+  <property name="help">Name the bedspaces for PRE-NCE year students.
+                        Attention: The bed letters must not exceed the number of beds per room.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+
  <widget name="beds_for_final" meta_type="MultiSelect Widget">
   <property name="fields">

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

@@ -5 +5 @@
   <field name="beds_for_fresh" meta_type="CPS String List Field"/>
   <field name="beds_for_returning" meta_type="CPS String List Field"/>
+  <field name="beds_for_pre" meta_type="CPS String List Field"/>
   <field name="beds_per_room" meta_type="CPS Int Field">
     <property name="default_expr">python:6</property>