Changeset 979 for WAeUP_SRP/trunk

Timestamp:

1 Dec 2006, 18:14:48 (18 years ago)

Author:

Henrik Bettermann

Message:

more changes to enable admission checking

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_application_fe.xml (modified) (1 diff)
• profiles/default/workflows/waeup_scbf_wf/definition.xml (modified) (3 diffs)
• skins/waeup_custom/logged_in.py (modified) (1 diff)
• skins/waeup_student/admission_form.pt (modified) (1 diff)
• skins/waeup_student/check_admission.py (modified) (2 diffs)
• skins/waeup_student/check_admission_pin_form.pt (modified) (1 diff)

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

@@ -80 +80 @@
   <property name="readonly_layout_modes">
   </property>
-  <property name="hidden_layout_modes"></property>
+  <property name="hidden_layout_modes">
+    <element value="create"/>
+  </property>
   <property name="hidden_readonly_layout_modes"/>
  </widget>

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

@@ -10 +10 @@
   <exit-transition transition_id="cut_copy_paste"/>
   <permission-map name="Delete objects" acquired="False">
+   <permission-role>Manager</permission-role>
   </permission-map>
   <permission-map name="View" acquired="False">
@@ -22 +23 @@
              new_state="static" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -33 +34 @@
              title="Create content" new_state=""
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -60 +60 @@
                 da = {}
                 pin = request.get('pin')
-                email = request.get('email')
+##                email = request.get('email')
                 app_doc = info['app_doc']
                 da['app_ac_pin'] = pin
-                da['app_email'] = email
+##                da['app_email'] = email
                 da['app_ac_date'] = current
                 app_doc.edit(mapping = da)

WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

@@ -55 +55 @@
         </table>        
         
+        <br />
         
         <strong>Clearance commences on resumption and ends exactly two(2)weeks after resumption date.
-              Any breach of this directive,will result in forfeiture of the admission offer.</strong>      
+              <br />Any breach of this directive,will result in forfeiture of the admission offer.</strong><br /><br />      
   
      

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -44 +44 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
-    email = ds.get('app_email')
+##  
+##    email = ds.get('app_email')
     student = getattr(context.campus.students, s_id)
     review_state = wf.getInfoFor(student,'review_state',None)
@@ -55 +56 @@
     args['__ac_password'] = pin.split('-')[2]
     args['pin'] = pin
-    args['email'] = email
+##    args['email'] = email
     url = "%s/logged_in?%s" % (context.absolute_url(),urlencode(args))
     return redirect(url)

WAeUP_SRP/trunk/skins/waeup_student/check_admission_pin_form.pt

@@ -20 +20 @@
           <ul>
             <li>Buy an Application Scratch Card.</li> 
-            <li>Enter your JAMB Registration Number, the Admission PIN and your Email Address above.</li> 
+            <li>Enter your JAMB Registration Number and the Admission PIN.</li> 
           </ul>
       </metal:block>