Changeset 790

Timestamp:

8 Nov 2006, 13:42:49 (18 years ago)

Author:

joachim

Message:

clearance_edit polished,

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (1 diff)
• profiles/default/layouts/student_clearance.xml (modified) (2 diffs)
• profiles/default/layouts/student_clearance_fe.xml (modified) (12 diffs)
• profiles/default/schemas/student_clearance.xml (modified) (1 diff)
• skins/waeup_custom/widget_image_render.pt (added)
• skins/waeup_student/defer_admission.py (modified) (1 diff)
• skins/waeup_student/defer_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/defer_done_view.pt)
• skins/waeup_student/layout_clearance_view.pt (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt)
• skins/waeup_student/request_clearance.py (modified) (2 diffs)

WAeUP_SRP/trunk/Students.py

@@ -387 +387 @@
             else:
                 wftool.doActionFor(student,'pume_fail')
-                wftool.doActionFor(student,'finally_reject')
+                wftool.doActionFor(student,'reject_admission')
             if len(no_import) > 1:
                 open("%s/import/%s_not_imported.csv" % (i_home,name),"w").write(

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

@@ -224 +224 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="email" meta_type="Email Widget">
-  <property name="title">Email</property>
-  <property name="fields">
-   <element value="email"/>
-  </property>
-  <property name="label">Email</property>
-  <property name="label_edit">Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-    <element value="create"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
  <widget name="entry_date" meta_type="Date Widget">
   <property name="title">Entry Date</property>
@@ -754 +741 @@
   </row>
   <row>
-   <cell name="email"/>
-  </row>
-  <row>
    <cell name="fst_sit_fname"/>
   </row>

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

@@ -55 +55 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <widget name="age_dec" meta_type="Image Widget">
@@ -93 +94 @@
   <property name="label">Fullname</property>
   <property name="label_edit">Fullname</property>
+  <property name="description">Advanced Level Data</property>
   <property
      name="help">Fullname as it appears on certificate/result</property>
@@ -138 +140 @@
   <property name="label">Birth Certificate</property>
   <property name="label_edit">Birth Certificate</property>
+  <property name="description">Other Documents</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes">
@@ -223 +226 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="email" meta_type="Email Widget">
-  <property name="title">Email</property>
-  <property name="fields">
-   <element value="email"/>
-  </property>
-  <property name="label">Email</property>
-  <property name="label_edit">Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-    <element value="create"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <widget name="entry_date" meta_type="Date Widget">
@@ -300 +291 @@
   <property name="label">First Choice</property>
   <property name="label_edit">First Choice</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-    <element value="create"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
+  <property name="description">Administrative Data</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+    <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <widget name="fst_sit_date" meta_type="Date Widget">
@@ -326 +319 @@
   <property name="label">Fullname</property>
   <property name="label_edit">Fullname</property>
+  <property name="description">First Sitting Data</property>
   <property
      name="help">Fullname as it appears on certificate/result</property>
@@ -398 +392 @@
   <property name="label">Higher Qualification Grade</property>
   <property name="label_edit">Higher Qualification Grade</property>
+  <property name="description">Higher Qualification Data</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes">
@@ -615 +610 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <widget name="scd_sit_date" meta_type="Date Widget">
@@ -636 +632 @@
   <property name="label">Fullname</property>
   <property name="label_edit">Fullname</property>
+  <property name="description">Second Sitting  Level Data</property>
   <property
      name="help">Fullname as it appears on certificate/result</property>
@@ -717 +714 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <widget name="uniben" meta_type="Boolean Widget">
@@ -730 +728 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="render_format">radio</property>    
  </widget>
  <table>
@@ -752 +751 @@
   <row>
    <cell name="nationality"/>
-  </row>
-  <row>
-   <cell name="email"/>
   </row>
   <row>

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

@@ -16 +16 @@
  <field name="lga" meta_type="CPS String Field"/>
  <field name="nationality" meta_type="CPS String Field"/>
-
- <field name="email" meta_type="CPS String Field" />
 
  <field name="fst_sit_fname" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/skins/waeup_student/defer_admission.py

@@ -24 +24 @@
 info['app_doc'].edit(mapping={'defer_date':current,})
 wf.doActionFor(info['student'],'defer')
-return context.defer_done_view(info=info)
+return context.defer_view(info=info)

WAeUP_SRP/trunk/skins/waeup_student/request_clearance.py

@@ -46 +46 @@
     review_state = info['review_state']
     wf.doActionFor(info['student'],'enter_clearance_pin')
+    wf.doActionFor(info['app'],'close')
     wf.doActionFor(info['clear'],'open')
     pin = str(ds.get('clr_ac_pin'))
@@ -52 +53 @@
     dc['clr_ac_date'] = current
     info['clear_doc'].edit(mapping = dc)
-return redirect("%s/clearance_edit_view" % info['clear'].absolute_url())
+return redirect("%s/clearance_edit_form" % info['clear'].absolute_url())