Changeset 933

Timestamp:

24 Nov 2006, 16:04:52 (18 years ago)

Author:

joachim

Message:

added a students directory,
students are now put in this directory
all other members remain in members
waeup_stacking_dir handles this

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSStackingDirectoryStorageAdapter.py (added)
• __init__.py (modified) (1 diff)
• profiles/default/directories (added)
• profiles/default/directories.xml (added)
• profiles/default/directories/students.xml (added)
• profiles/default/directories/waeup_stacking_dir.xml (added)
• profiles/default/layouts/acco_hall.xml (modified) (4 diffs)
• profiles/default/schemas/acco_hall.xml (modified) (1 diff)
• profiles/default/users.xml (added)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/waeup_block_letters.xml (added)
• skins/waeup_custom/logged_in.py (modified) (2 diffs)

WAeUP_SRP/trunk/__init__.py

@@ -16 +16 @@
 import PatchCPSMembershipTool
 import PatchCPSUserFolderUserFolder
-import PatchZODBDirectory_searchEntries
+import PatchCPSStackingDirectoryStorageAdapter
 import PatchBasicWidgetsCPSStringWidget
 # Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.

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

@@ -79 +79 @@
     <property name="max_value">5</property>
  </widget>
+<widget name="blocks_for_female" meta_type="MultiSelect Widget">
+ <property name="title">Blocks for Female</property>
+ <property name="fields">
+  <element value="blocks_for_female"/>
+ </property>
+ <property name="is_required">False</property>
+ <property name="label">Blocks for Female</property>
+ <property name="label_edit">Blocks for Female</property>
+ <property name="readonly_layout_modes"/>
+ <property name="hidden_layout_modes"/>
+ <property name="hidden_readonly_layout_modes"/>
+<property name="vocabulary">waeup_block_letters</property>
+</widget>
  <widget name="reserved_rooms" meta_type="WAeUPReservedRooms Widget">
   <property name="title">Reserved Rooms</property>
@@ -115 +128 @@
   <property name="width">72</property>
  </widget>
- <widget name="which_sex" meta_type="Boolean Widget">
-  <property name="fields">
-   <element value="which_sex"/>
-  </property>
-  <property name="label">Sex</property>
-  <property name="label_edit">Sex</property>
-  <property name="label_false">male</property>
-  <property name="label_true">female</property>
- </widget>
-<widget name="special_handling" meta_type="Select Widget">
- <property name="title">Maintenance Fee Prefix</property>
+ <widget name="special_handling" meta_type="Select Widget">
+ <property name="title">Special Handling code</property>
  <property name="fields">
   <element value="special_handling"/>
@@ -137 +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>
@@ -161 +178 @@
   </row>
   <row>
+   <cell name="study_courses"/>
+  </row>
+  <row>
    <cell name="text"/>
   </row>
   <row>
-   <cell name="which_sex"/>
+   <cell name="blocks_for_female"/>
   </row>
   <row>

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>
  </field>
- <field name="which_sex" meta_type="CPS Boolean Field">
+ <field name="blocks_for_female" meta_type="CPS String List Field">
   </field>
    <field name="maintenance_code" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -10 +10 @@
  <object name="get_faculties_voc" meta_type="CPS Method Vocabulary"/>
  <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>
+ <object name="waeup_block_letters" meta_type="CPS Vocabulary"/>
  <object name="nigerian_states" meta_type="CPS Vocabulary"/>
  <object name="semester_voc" meta_type="CPS Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -91 +91 @@
 
 if to_waeup_student_home:
-    member.setProperties(last_login_time=current,login_time=current)
+    #member.setProperties(last_login_time=current,login_time=current)
     if info['review_state'] == "application_pin_entered":
         return response.redirect("%s/application_edit" % student.absolute_url())
@@ -123 +123 @@
 first_time = (str(login_time) == '2000/01/01')
 
-if first_time and member.has_role('Member'):
+if first_time and member.has_role('Member') and not member.has_role('Student'):
     mtool.createMemberArea()
     now = context.ZopeTime()