Changeset 766 for WAeUP_SRP/trunk/skins

Timestamp:

27 Oct 2006, 16:35:27 (18 years ago)

Author:

joachim

Message:

added request_clearance

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (1 diff)
• waeup_student/clearance_pin_form.pt (added)
• waeup_student/clearance_view.pt (added)
• waeup_student/getStudentInfo.py (modified) (1 diff)
• waeup_student/passport_entry_view.pt (modified) (1 diff)
• waeup_student/request_clearance.py (added)
• waeup_student/student_edit.py (modified) (3 diffs)
• waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -51 +51 @@
             info = context.getStudentInfo()
             student = info['student']
-            if info['review_state'] == "student_created":
-                student.content_status_modify(workflow_action="enter_application_pin")
+            if info['review_state'] in ("student_created","admitted"):
+                student.content_status_modify(workflow_action="enter_clearance_pin")
                 wftool.doActionFor(info['app'],'open',dest_container=info['app'])
                 da = {}
                 pin = request.get('pin')
+                app_doc = info['app_doc']
                 da['app_ac_pin'] = pin
                 da['app_ac_date'] = current
-                info['app_doc'].edit(mapping = da)
+                app_doc.edit(mapping = da)
+                dc = {}
+                dc['clr_ac_pin'] = pin
+                dc['entry_date'] = current
+                dc['session'] = "%s" % current.year()
+                dc['lga'] = app_doc.jamb_lga
+                info['clear_doc'].edit(mapping = dc)
         elif "Manager" in member.getRoles():
             pass

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -59 +59 @@
 else:
     info['acco'] = None
+res = context.portal_catalog(container_path=student_path,
+                             portal_type='StudentClearance')
+if res:
+    clear = res[0].getObject()
+    info['clear'] = clear
+    info['clear_doc'] = clear.getContent()
+    info['clear_review_state'] = wf.getInfoFor(clear,'review_state',None)
+else:
+    info['clear'] = None
 
 items = []
 s_edit_links = {'StudentApplication': 'student_edit',
               'StudentAccommodation': '',
+              'StudentClearance': '',
               'StudentPersonal': '',
               }
 s_view_links = {'StudentApplication': None,
               'StudentAccommodation': 'accommodation_view',
+              'StudentClearance': None,
               'StudentPersonal': None,
               'StudentApplication': 'application_view',

WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt

@@ -18 +18 @@
       <span tal:condition="info"
             tal:define="review_state info/review_state">
-        <h3>Upload your Passport Picture!</h3>
+        <h3>Upload or Change your Passport Picture!</h3>
         <br />
         <span tal:omit-tag="" tal:replace="structure rendered_main"/>

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -9 +9 @@
 # $Id$
 """
-Called when a document form is posted.
-
-Validates data, then:
-
- - if there's no error, updates the object and redirects to it,
-
- - if there's an error, puts data in session and redirects to edit form.
-
-A form uid is propagated during the redirect to uniquely identify the
-form in the session.
 """
 wftool = context.portal_workflow
 from urllib import urlencode
 from Products.CPSDocument.utils import getFormUidUrlArg
+import DateTime
+current = DateTime.DateTime()
 
 # Until ajax posts directly to its own script...
@@ -38 +30 @@
 app = info['app']
 app_doc = info['app_doc']
+clear = info['clear']
+clear_doc = info['clear_doc']
 state = context.getStudentInfo()['review_state']
 
@@ -77 +71 @@
     else:
         args = {}
-        student.content_status_modify(workflow_action="apply_for_admission")
-        wftool.doActionFor(app,'close',dest_container= app)
-        psm = 'You applied for admission.'
-        action = "/application_view"
+        if info['review_state'] == "student_created":
+            student.content_status_modify(workflow_action="apply_for_admission")
+            wftool.doActionFor(app,'close',dest_container= app)
+            psm = 'You applied for admission.'
+            action = "/application_view"
+        elif info['review_state'] == "clearance_pin_entered":
+            student.content_status_modify(workflow_action="request_clearance")
+            #wftool.doActionFor(info['clear'],'open',dest_container=info['clear'])
+            da = {}
+            pin = REQUEST.get('pin')
+            da['app_ac_pin'] = pin
+            da['app_ac_date'] = current
+            app_doc = info['app_doc']
+            app_doc.edit(mapping = da)
+            dc = {}
+            dc['email'] = app_doc.appl_email
+            dc['mobil'] = app_doc.appl_mobile
+            dc['passport'] = app_doc.passport
+            info['clear_doc'].edit(mapping = dc)
+            wftool.doActionFor(app,'close',dest_container= app)
+            psm = 'You requested clearance.'
+            action = "/clearance_view"
+        else:
+            psm = ''
+            action = "/clearance_view"
+            
 else:
     is_valid, ds = app_doc.validate(request=REQUEST, proxy=context, cluster=cluster,

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -32 +32 @@
     if state == 'admission_applied':
         return redirect("%s/application_view" % student.absolute_url())
-    elif state == 'application_pin_entered':
+    elif state in ('application_pin_entered','clearance_pin_entered'):
         return redirect("%s/passport_entry_view" % student.absolute_url())
+    elif state == 'request_clearance':
+        return redirect("%s/student_view" % info['clear'].absolute_url())
     elif context.portal_type == 'StudentStudyLevel':
         return context.study_level_student_view()
     return redirect("%s/student_view" % student.absolute_url())
-
-