Changeset 2328 for WAeUP_SRP/base/skins/waeup_student

Timestamp:

8 Oct 2007, 15:12:24 (17 years ago)

Author:

Henrik Bettermann

Message:

improve application forms

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• apply_admission.py (modified) (3 diffs)
• apply_admission_slip.pt (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -48 +48 @@
 if manage:
     validate = False
-#layout = "application_pume"
-#screening_type = ""
 without_reg_no = False
 
-# if traverse_subpath and traverse_subpath[0] == "prence":
-#     layout = "application_prence"
-#     screening_type = "prence"
-#     without_reg_no = True
-# elif traverse_subpath and traverse_subpath[0] == "pume":
-#     layout = "application_pume"
-#     screening_type = "pume"
-# elif traverse_subpath and traverse_subpath[0] == "pce":
-#     layout = "application_pce"
-#     screening_type = "pce"
-# elif traverse_subpath and traverse_subpath[0] == "pde":
-#     layout = "application_pde"
-#     screening_type = "pde"
-# elif traverse_subpath and traverse_subpath[0] == "cest":
-#     layout = "application_cest"
-#     screening_type = "cest"
-# else:
-#     return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-screening_types = ('prence','pume','pce','pde','cest')
-headings = {}
-headings['pume'] = 'Apply for Post UME Screening Test (2007/2008)! '
-headings['pde'] = 'Apply for Post DE Screening Test(2007/2008)! '
-headings['prence'] = 'Apply for Pre-NCE Programme (2007/2008)! '
-headings['pce'] = 'Apply for PCE Screening (2007/2008)! '
-headings['cest'] = 'Apply for Common Entrance Screening Test (2007/2008)! '
-info = {}
-if traverse_subpath and traverse_subpath[0] in screening_types:
-    screening_type = info['screening_type'] = traverse_subpath[0]
-    info['heading'] = headings[screening_type]
-    layout = "application_%s" % screening_type
-    without_reg_no = screening_type in ('prence',)
-
-else:
-    return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
+
 lt = context.portal_layouts
 
@@ -116 +81 @@
             #logger.info('%s/%s entered wrong pin %s' % (member,reg_no,pin))
             #return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
+
+
+screening_types = ('prence','pume','pce','pde','cest')
+headings = {}
+headings['pume'] = 'Apply for Post UME Screening Test (2007/2008)! '
+headings['pde'] = 'Apply for Post DE Screening Test(2007/2008)! '
+headings['prence'] = 'Apply for Pre-NCE Programme (2007/2008)! '
+headings['pce'] = 'Apply for PCE Screening (2007/2008)! '
+headings['cest'] = 'Apply for Common Entrance Screening Test (2007/2008)! '
+headings_slip = {}
+headings_slip['pume'] = 'Post UME Screening (2007/2008) Aknowledgement Slip!'
+headings_slip['pde'] = 'Post DE 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'
+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]
+    layout = "application_%s" % screening_type
+    without_reg_no = screening_type in ('prence',)
+elif manage:
+    if object['screening_type']:
+        st = object['screening_type']
+    else:
+        st = 'pume'
+    screening_type = info['screening_type'] = st
+    info['heading'] = headings[screening_type]
+    info['heading_slip'] = headings_slip[screening_type]
+    layout = "application_%s" % screening_type
+    without_reg_no = screening_type in ('prence',)  
+else:
+    return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
+
 
 if slip:
@@ -160 +160 @@
         data[field] = dm.get(field)
 data['reg_no'] = reg_no
-data['screening_type'] = screening_type
+
 if apply_admission:
     if submitted:

WAeUP_SRP/base/skins/waeup_student/apply_admission_slip.pt

@@ -5 +5 @@
            mode options/mode;
            name python:ds['lastname'];
+           info options/info;
            "
            >
@@ -10 +11 @@
     <metal:block use-macro="here/slip_template/macros/master">
       <metal:block fill-slot="main">
-        <h3>Post UME Screening (2007/2008) Aknowledgement Slip</h3>
+        <h3 tal:content="info/heading_slip" />
         <br />
         <div tal:replace="structure rendered_main" />
         
         The applicant has confirmed that the picture shown on this slip is a true picture of him/her. 
-        <br/><br/>
-        Please check for your screening venue at any of the UNIBEN entry gates or
-        at the Sports Complex and come to the screening venue with a copy of this slip.  
+
       </metal:block>
     </metal:block>