Changeset 1669 for WAeUP_SRP/branches/joachim-event-branch/profiles/default

Timestamp:

4 Apr 2007, 06:31:52 (18 years ago)

Author:

joachim

Message:

merged up to 1664

Location:

WAeUP_SRP/branches/joachim-event-branch/profiles/default

Files:

• actions.xml (modified) (1 diff)
• layouts/student_change_password.xml (modified) (1 diff)
• online_payments_import.xml (copied) (copied from WAeUP_SRP/trunk/profiles/default/online_payments_import.xml)
• schemas/payment.xml (modified) (1 diff)
• schemas/student_study_level.xml (modified) (1 diff)
• students_catalog.xml (modified) (3 diffs)
• themes.xml (modified) (1 diff)
• toolset.xml (modified) (1 diff)
• workflows/waeup_student_subobject_wf/definition.xml (modified) (6 diffs)

WAeUP_SRP/branches/joachim-event-branch/profiles/default/actions.xml

@@ -177 +177 @@
   <action title="Change Password" action_id="change_password"
      category="student" condition_expr="member"
-     url_expr="string:${portal_url}/change_password" visible="True">
+     url_expr="string:${portal_url}/change_password" visible="False">
    <permission>View</permission>
   </action>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/layouts/student_change_password.xml

@@ -35 +35 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="password_widget"></property>
-    <property name="check_digit">False</property>
+    <property name="check_digit">True</property>
     <property name="size_min">6</property>
     <property name="size_max">10</property>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/schemas/payment.xml

@@ -6 +6 @@
   <field name="type_description" meta_type="CPS String Field" >
     <property name="is_searchabletext">True</property>
-  </field> <field name="order_id" meta_type="CPS String Field"/>
+  </field> 
   <field name="amount" meta_type="CPS String Field"/>
   <field name="resp_pay_reference" meta_type="CPS String Field"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/schemas/student_study_level.xml

@@ -4 +4 @@
  <field name="code" meta_type="CPS String Field"/>
  <field name="session" meta_type="CPS String Field"/>
- <field name="gpa" meta_type="CPS Float Field"/>
- <field name="status" meta_type="CPS String Field"/>
  <field name="verdict" meta_type="CPS String Field"/>
-  <field name="imported_gpa" meta_type="CPS Float Field"/>
+ <field name="validated_by" meta_type="CPS String Field"/>
+ <field name="validation_date" meta_type="CPS DateTime Field"/>
 </object>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/students_catalog.xml

@@ -32 +32 @@
  </index>
  <index name="jamb_reg_no" meta_type="FieldIndex">
-  <indexed_attr value="student_application:jamb_reg_no"/>
+  <indexed_attr value="jamb_reg_no"/>
  </index>
  <index name="matric_no" meta_type="FieldIndex">
-  <indexed_attr value="student_clearance:matric_no"/>
+  <indexed_attr value="matric_no"/>
  </index>
  <index name="faculty" meta_type="KeywordIndex">
@@ -41 +41 @@
  </index>
  <index name="entry_mode" meta_type="KeywordIndex">
-  <indexed_attr value="student_application:entry_mode"/>
+  <indexed_attr value="entry_mode"/>
  </index>
  <index name="entry_year" meta_type="KeywordIndex">
@@ -50 +50 @@
  </index>
  <index name="level" meta_type="KeywordIndex">
-  <indexed_attr value="student_study_course:current_level"/>
+  <indexed_attr value="current_level"/>
  </index>
  <index name="verdict" meta_type="KeywordIndex">
-  <indexed_attr value="student_study_course:current_verdict"/>
+  <indexed_attr value="current_verdict"/>
  </index>
  <index name="course" meta_type="KeywordIndex">
-  <indexed_attr value="student_study_course:study_course"/>
+  <indexed_attr value="study_course"/>
  </index>
  <index name="registered_courses" meta_type="KeywordIndex">

WAeUP_SRP/branches/joachim-event-branch/profiles/default/themes.xml

@@ -6 +6 @@
   <element key="external_edit_form" value="WAeUP_Student+Slippage"/>
   <element key="external_clearance_edit_form" value="WAeUP_Student+Slippage"/>
-  <element key="contact_student_form" value="WAeUP_Student+Slippage"/>
   <element key="login_staff" value="WAeUP_Backoffice+Default"/>
   <element key="logged_out" value="WAeUP_Student+Default"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/toolset.xml

@@ -7 +7 @@
  <required tool_id="payments_catalog"
            class="Products.WAeUP_SRP.WAeUPTables.PaymentsCatalog"/>
+ <required tool_id="online_payments_import"
+           class="Products.WAeUP_SRP.WAeUPTables.OnlinePaymentsImport"/>
  <required tool_id="portal_pins"
            class="Products.WAeUP_SRP.WAeUPTables.PinTable"/>

WAeUP_SRP/branches/joachim-event-branch/profiles/default/workflows/waeup_student_subobject_wf/definition.xml

@@ -9 +9 @@
  <permission>Modify portal content</permission>
  <permission>View</permission>
+ <permission>View</permission>
  <state state_id="closed" title="">
+  <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="open"/>
   <permission-map name="Add portal content" acquired="True">
@@ -103 +105 @@
              new_state="closed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -115 +117 @@
              new_state="content_addable" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -127 +129 @@
              new_state="created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -136 +138 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
   </guard>
@@ -144 +146 @@
              new_state="opened" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>