Changeset 2324 for WAeUP_SRP/base

Timestamp:

7 Oct 2007, 06:18:46 (17 years ago)

Author:

Henrik Bettermann

Message:

application_type replaced by screening_type

Location:

WAeUP_SRP/base

Files:

• Widgets.py (modified) (4 diffs)
• skins/waeup_student/apply_admission.py (modified) (3 diffs)
• skins/waeup_student/apply_admission_form.pt (modified) (2 diffs)

WAeUP_SRP/base/Widgets.py

@@ -1396 +1396 @@
                 break
             if ok >= 1:
-                application_type = self.REQUEST.form.get('application_type','unknown')
+                screening_type = self.REQUEST.form.get('screening_type','unknown')
                 if self.isStudent():
                     err = "This is only for Pume application."
@@ -1408 +1408 @@
                         d['reg_no'] = applicant.reg_no
                         d['pin'] = pin_str
-                        d['application_type'] = application_type
+                        d['screening_type'] = screening_type
                         d['status'] = 'entered'
                         getattr(self,self.catalog).modifyRecord(**d)
@@ -1416 +1416 @@
                         s_logger.info('%s/%s repeatedly entered application record with PIN %s' % (member_id,ref,pin_str))
                 else:
-                    datastructure['reg_no'] = ref 
+                    datastructure['reg_no'] = ref
                     res = self.applicants_catalog(reg_no = ref)
                     if not res:
@@ -1424 +1424 @@
                         d['pin'] = pin_str
                         d['status'] = 'entered'
-                        d['application_type'] = application_type
+                        d['screening_type'] = screening_type
                         self.applicants_catalog.addRecord(**d)
                     else:

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -49 +49 @@
     validate = False
 #layout = "application_pume"
-#application_type = ""
+#screening_type = ""
 without_reg_no = False
 
 # if traverse_subpath and traverse_subpath[0] == "prence":
 #     layout = "application_prence"
-#     application_type = "prence"
+#     screening_type = "prence"
 #     without_reg_no = True
 # elif traverse_subpath and traverse_subpath[0] == "pume":
 #     layout = "application_pume"
-#     application_type = "pume"
+#     screening_type = "pume"
 # elif traverse_subpath and traverse_subpath[0] == "pce":
 #     layout = "application_pce"
-#     application_type = "pce"
+#     screening_type = "pce"
 # elif traverse_subpath and traverse_subpath[0] == "pde":
 #     layout = "application_pde"
-#     application_type = "pde"
+#     screening_type = "pde"
 # elif traverse_subpath and traverse_subpath[0] == "cest":
 #     layout = "application_cest"
-#     application_type = "cest"
+#     screening_type = "cest"
 # else:
 #     return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-application_types = ('prence','pume','pce','pde','cest')
+screening_types = ('prence','pume','pce','pde','cest')
 headings = {}
 headings['pume'] = 'Apply for Post UME Screening Test (2007/2008)! '
@@ -78 +78 @@
 headings['cest'] = 'Apply for Common Entrance Screening Test (2007/2008)! '
 info = {}
-if traverse_subpath and traverse_subpath[0] in application_types:
-    application_type = info['application_type'] = traverse_subpath[0]
-    info['heading'] = headings[application_type]
-    layout = "application_%s" % application_type
-    without_reg_no = application_type in ('prence',)
-    
+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())
@@ -160 +160 @@
         data[field] = dm.get(field)
 data['reg_no'] = reg_no
-data['screening_type'] = application_type
+data['screening_type'] = screening_type
 if apply_admission:
     if submitted:

WAeUP_SRP/base/skins/waeup_student/apply_admission_form.pt

@@ -22 +22 @@
         <form action="" id="editForm" method="post" 
               enctype="multipart/form-data" class="workflow"
-              tal:attributes="action string:${context/absolute_url}/apply_admission/${info/application_type}"
+              tal:attributes="action string:${context/absolute_url}/apply_admission/${info/screening_type}"
               >
-          <input type="hidden" name="application_type"
-                 tal:attributes="value info/application_type|nothing"
-                 tal:condition="info/application_type|nothing"/>
+          <input type="hidden" name="screening_type"
+                 tal:attributes="value info/screening_type|nothing"
+                 tal:condition="info/screening_type|nothing"/>
           <input type="hidden" name="reg_no"
                  tal:attributes="value ds/reg_no|nothing"
@@ -65 +65 @@
             <p>Instructions :</p>
             <ul>
-              <li>Enter your <span tal:condition="python:not info['application_type']=='prence'">JAMB Registration Number and the</span> Application PIN.</li> 
+              <li>Enter your <span tal:condition="python:not info['screening_type']=='prence'">JAMB Registration Number and the</span> Application PIN.</li> 
               <li>Fill the form and upload your Passport Photograph with red background in jpg format.</li> 
               <li>Save and preview picture.