Changeset 744

Timestamp:

25 Oct 2006, 05:23:15 (18 years ago)

Author:

Henrik Bettermann

Message:

spelling mistake corrected (maintenance)

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/acco_hall.xml (modified) (2 diffs)
• profiles/default/layouts/student_accommodation.xml (modified) (2 diffs)
• profiles/default/layouts/student_accommodation_fe.xml (modified) (3 diffs)
• profiles/default/schemas/acco_hall.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_accommodation_wf/definition.xml (modified) (4 diffs)
• skins/waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• skins/waeup_student/getMaintainancePrefix.py (deleted)
• skins/waeup_student/getMaintenancePrefix.py (added)
• skins/waeup_student/reserve_accommodation.py (modified) (3 diffs)

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

@@ -124 +124 @@
   <property name="label_true">female</property>
  </widget>
-<widget name="maintainance_code" meta_type="Select Widget">
- <property name="title">Maintainance Fee Prefix</property>
+<widget name="maintenance_code" meta_type="Select Widget">
+ <property name="title">Maintenance Fee Prefix</property>
  <property name="fields">
-  <element value="maintainance_code"/>
+  <element value="maintenance_code"/>
  </property>
  <property name="is_required">True</property>
- <property name="label">Maintainance Fee Prefix</property>
- <property name="label_edit">Maintainance Fee Prefix</property>
+ <property name="label">Maintenance Fee Prefix</property>
+ <property name="label_edit">Maintenance Fee Prefix</property>
  <property name="readonly_layout_modes"/>
  <property name="hidden_layout_modes"/>
@@ -142 +142 @@
   </row>
   <row>
-   <cell name="maintainance_code"/>
+   <cell name="maintenance_code"/>
   </row>
   <row>

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

@@ -8 +8 @@
  <property name="validate_values_expr"></property>
  <widget name="acco_maint_date" meta_type="DateTime Widget">
-  <property name="title">Maintainance Payment Date</property>
+  <property name="title">Maintenance Payment Date</property>
   <property name="fields">
    <element value="acco_maint_date"/>
   </property>
-  <property name="label">Maintainance Payment Date</property>
-  <property name="label_edit">Maintainance Payment Date</property>
+  <property name="label">Maintenance Payment Date</property>
+  <property name="label_edit">Maintenance Payment Date</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes">
@@ -23 +23 @@
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Maintainance Payment PIN</property>
+  <property name="title">Maintenance Payment PIN</property>
   <property name="fields">
    <element value="acco_maint_sc_pin"/>
   </property>
-  <property name="label">Maintainance Payment PIN</property>
-  <property name="label_edit">Maintainance Payment PIN</property>
+  <property name="label">Maintenance Payment PIN</property>
+  <property name="label_edit">Maintenance Payment PIN</property>
   <property name="hidden_layout_modes">
     <element value="create"/>

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

@@ -8 +8 @@
  <property name="validate_values_expr"></property>
  <widget name="acco_maint_date" meta_type="DateTime Widget">
-  <property name="title">Maintainance Payment Date</property>
+  <property name="title">Maintenance Payment Date</property>
   <property name="fields">
    <element value="acco_maint_date"/>
   </property>
-  <property name="label">Maintainance Payment Date</property>
-  <property name="label_edit">Maintainance Payment Date</property>
+  <property name="label">Maintenance Payment Date</property>
+  <property name="label_edit">Maintenance Payment Date</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes">
@@ -23 +23 @@
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Maintainance Payment PIN</property>
+  <property name="title">Maintenance Payment PIN</property>
   <property name="fields">
    <element value="acco_maint_sc_pin"/>
   </property>
-  <property name="label">Maintainance Payment PIN</property>
-  <property name="label_edit">Maintainance Payment PIN</property>
+  <property name="label">Maintenance Payment PIN</property>
+  <property name="label_edit">Maintenance Payment PIN</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes">
@@ -34 +34 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="prefix">@getMaintainancePrefix</property>
+  <property name="prefix">@getMaintenancePrefix</property>
  </widget>
  <widget name="acco_res_date" meta_type="DateTime Widget">

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

@@ -25 +25 @@
  <field name="which_sex" meta_type="CPS Boolean Field">
   </field>
-   <field name="maintainance_code" meta_type="CPS String Field"/>
+   <field name="maintenance_code" meta_type="CPS String Field"/>
 </object>

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_accommodation_wf/definition.xml

@@ -8 +8 @@
  <permission>View</permission>
  <state state_id="bed_reserved" title="">
-  <exit-transition transition_id="pay_maintainance_fee"/>
+  <exit-transition transition_id="pay_maintenance_fee"/>
   <exit-transition transition_id="remove"/>
   <permission-map name="Add portal content" acquired="True">
@@ -20 +20 @@
   </permission-map>
  </state>
- <state state_id="maintainance_fee_payed" title="">
+ <state state_id="maintenance_fee_payed" title="">
   <exit-transition transition_id="remove"/>
  </state>
  <state state_id="removed" title="">
  </state>
- <transition transition_id="pay_maintainance_fee" title=""
-             new_state="maintainance_fee_payed"
+ <transition transition_id="pay_maintenance_fee" title=""
+             new_state="maintenance_fee_payed"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -35 +35 @@
              new_state="removed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -42 +42 @@
              new_state="bed_reserved" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ -12 +12 @@
                                         'category_E',
                                         'category_F',
-                                        'content_addable'];">
+                                        'content_addable',
+                                        'bed_reserved',
+                                        'maintenance_fee_paid'
+                                        ];">
 
 <span tal:condition="python:path('info/review_state') in status_list ">

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -22 +22 @@
 mode = 'create'
 if info.has_key('acco') and info['acco']:
-    if info['acco_review_state'] == "maintainance_fee_payed":
+    if info['acco_review_state'] == "maintenance_fee_payed":
         return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
     else:
@@ -76 +76 @@
         ds.set('session', session)
         acco.getContent().edit(mapping=ds)
-        #wftool.doActionFor(acco,'pay_maintainance_fee',dest_container=acco)
+        #wftool.doActionFor(acco,'pay_maintenance_fee',dest_container=acco)
         return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % student.absolute_url())
 pin = str(ds.get('acco_main_sc_pin'))
@@ -83 +83 @@
 ds.set('acco_maint_date', current)
 acco.getContent().edit(mapping=ds)
-wftool.doActionFor(acco,'pay_maintainance_fee',dest_container=acco)
+wftool.doActionFor(acco,'pay_maintenance_fee',dest_container=acco)
 return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % student.absolute_url())