Changeset 2374

Timestamp:

17 Oct 2007, 19:36:22 (17 years ago)

Author:

Henrik Bettermann

Message:

implementation of recent requests (see ticket #360)

Location:

WAeUP_SRP

Files:

• base/skins/waeup_student/apply_admission.py (modified) (3 diffs)
• base/skins/waeup_student/apply_admission_form.pt (modified) (2 diffs)
• base/skins/waeup_student/apply_admission_slip.pt (modified) (1 diff)
• fceokene/profiles/default/layouts/application_manage.xml (modified) (4 diffs)
• fceokene/profiles/default/layouts/application_pde.xml (modified) (4 diffs)
• fceokene/profiles/default/schemas/application.xml (modified) (1 diff)
• fceokene/profiles/default/vocabularies.xml (modified) (1 diff)
• fceokene/profiles/default/vocabularies/aos.xml (added)

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -86 +86 @@
 headings = {}
 headings['pume'] = 'Apply for Post UME Screening Test (2007/2008)! '
-headings['pde'] = 'Apply for Post DE Screening Test (2007/2008)! '
+headings['pde'] = 'Apply for Post UDE Screening Test (2007/2008)! '
 headings['prence'] = 'Apply for Pre-NCE Programme (2007/2008)! '
 headings['pce'] = 'Apply for PCE Screening (2007/2008)! '
@@ -92 +92 @@
 headings_slip = {}
 headings_slip['pume'] = 'Post UME Screening (2007/2008) Aknowledgement Slip!'
-headings_slip['pde'] = 'Post DE Screening (2007/2008) Aknowledgement Slip'
+headings_slip['pde'] = 'Post UDE Screening (2007/2008) Aknowledgement Slip'
 headings_slip['prence'] = 'Pre-NCE Application (2007/2008) Aknowledgement Slip'
 headings_slip['pce'] = 'PCE Screening (2007/2008) Aknowledgement Slip'
 headings_slip['cest'] = 'Common Entrance Screening (2007/2008) Aknowledgement Slip'
+
+deadline = {}
+deadline['pume'] = '[Date of PUME Deadline]'
+deadline['pde'] = '[Date of PUDE Deadline]'
+deadline['prence'] = '[Date of PRENCE Deadline]'
+deadline['pce'] = '[Date of PCE Deadline]'
+deadline['cest'] = '[Date of CEST Deadline]'
+
 info = {}
+
 if traverse_subpath and traverse_subpath[0] in screening_types:
     screening_type = info['screening_type'] = traverse_subpath[0]
     info['heading'] = headings[screening_type]
     info['heading_slip'] = headings_slip[screening_type]
+    info['deadline'] = deadline[screening_type]
     layout = "application_%s" % screening_type
     without_reg_no = screening_type in ('prence',)
@@ -111 +121 @@
     info['heading'] = headings[screening_type]
     info['heading_slip'] = headings_slip[screening_type]
+    info['deadline'] = deadline[screening_type]
     layout = "application_%s" % screening_type
     without_reg_no = screening_type in ('prence',)

WAeUP_SRP/base/skins/waeup_student/apply_admission_form.pt

@@ -6 +6 @@
            info options/info;
            expired python:not info['screening_type']=='pde';
+           deadline info/deadline
            "
            >
@@ -71 +72 @@
             </ul>
             <br />
-            <font color="red">Application submission deadline is at Midnight on Thursday, 6th September 2007.  
+            <font color="red">Application submission deadline is at Midnight on <span tal:content="deadline" />.  
             No application will be treated after the deadline. </font>
           </metal:block>

WAeUP_SRP/base/skins/waeup_student/apply_admission_slip.pt

@@ -16 +16 @@
         
         The applicant has confirmed that the picture shown on this slip is a true picture of him/her. 
-
+        <br /><br />
+        <font color="red">
+        Notice: Please come back and check for the screening venue as from 30th October.
+        </font>
       </metal:block>
     </metal:block>

WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml

@@ -692 +692 @@
   </widget>
 
-    
+
   <widget name="hq_grade" meta_type="Select Widget">
     <property name="title">Higher Qualification Grade</property>
@@ -708 +708 @@
     <property name="vocabulary">high_grade</property>
   </widget>
+  
+  <widget name="aos" meta_type="Select Widget">
+    <property name="title">Area of Specialisation</property>
+    <property name="fields">
+      <element value="subj3"/>
+    </property>
+    <property name="label">Area of Specialisation</property>
+    <property name="label_edit">Area of Specialisation</property>
+    <property name="description"></property>
+    <property name="help"></property>
+    <property name="is_i18n">False</property>
+    <property name="widget_mode_expr"></property>
+    <property name="readonly_layout_modes">
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">aos</property>
+    <property name="sorted">True</property>
+    <property name="css_class_expr">string:row</property>
+  </widget>  
 
  <table>
@@ -736 +758 @@
   <row>
    <cell name="jamb_lga" ncols="2"/>
-  </row>  
+  </row>
   <row>
    <cell name="lga" ncols="2"/>
-  </row>  
-  
+  </row>
+
   <row>
    <cell name="sex" ncols="2"/>
@@ -755 +777 @@
   <row>
    <cell name="hq_grade" ncols="2"/>
-  </row>      
-  
+  </row>
+  <row>
+   <cell name="aos" ncols="2"/>
+  </row>
   <row>
    <cell name="eng_score" ncols="2"/>

WAeUP_SRP/fceokene/profiles/default/layouts/application_pde.xml

@@ -701 +701 @@
     <property name="vocabulary">high_qual</property>
   </widget>
-  
- 
+
+
   <widget name="hq_grade" meta_type="Select Widget">
     <property name="title">Higher Qualification Grade</property>
@@ -720 +720 @@
   </widget>
 
+  <widget name="aos" meta_type="Select Widget">
+    <property name="title">Area of Specialisation</property>
+    <property name="fields">
+      <element value="subj3"/>
+    </property>
+    <property name="label">Area of Specialisation</property>
+    <property name="label_edit">Area of Specialisation</property>
+    <property name="description"></property>
+    <property name="help"></property>
+    <property name="is_i18n">False</property>
+    <property name="widget_mode_expr"></property>
+    <property name="readonly_layout_modes">
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">aos</property>
+    <property name="sorted">True</property>
+    <property name="css_class_expr">string:row</property>
+  </widget>  
+
  <table>
   <row>
@@ -747 +769 @@
    <cell name="lga" ncols="2"/>
   </row>
-  
+
   <row>
    <cell name="hq_type" ncols="2"/>
@@ -753 +775 @@
   <row>
    <cell name="hq_grade" ncols="2"/>
-  </row>    
-
+  </row>
+  <row>
+   <cell name="aos" ncols="2"/>
+  </row>
   <row>
    <cell name="email" ncols="2"/>

WAeUP_SRP/fceokene/profiles/default/schemas/application.xml

@@ -39 +39 @@
  <field name="hq_grade" meta_type="CPS String Field"/>
  <field name="screening_venue" meta_type="CPS String Field"/>
+ <field name="aos" meta_type="CPS String Field"/>
 </object>

WAeUP_SRP/fceokene/profiles/default/vocabularies.xml

@@ -42 +42 @@
  <object name="cos" meta_type="CPS Vocabulary"/>
  <object name="screening_types" meta_type="CPS Vocabulary"/>
+ <object name="aos" meta_type="CPS Vocabulary"/>
  </object>