Changeset 788 for WAeUP_SRP/trunk/skins/waeup_student/application_edit.py

Timestamp:

8 Nov 2006, 08:32:36 (18 years ago)

Author:

joachim

Message:

added email to checkadmission-form, first draft of clearance_edit

File:

• WAeUP_SRP/trunk/skins/waeup_student/application_edit.py (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/student_edit.py) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/application_edit.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=REQUEST, cluster=None, cpsdocument_edit_and_view_button=None, action=None
+##parameters=REQUEST,proceed=None, cpsdocument_edit_button=None, action=None
 ##title=
 # $Id$
@@ -17 +17 @@
 
 # Until ajax posts directly to its own script...
-if 'ajax_edit' in REQUEST.form:
-    return context.cpsdocument_edit_ajax(REQUEST, cluster=cluster)
+##if 'ajax_edit' in REQUEST.form:
+##    return context.cpsdocument_edit_ajax(REQUEST, cluster=cluster)
 
 # Check flexible controls
@@ -33 +33 @@
 clear_doc = info['clear_doc']
 state = context.getStudentInfo()['review_state']
-
-if context.portal_type == "Student":
-    if app_doc.passport is None:
-        is_valid, ds = app_doc.validate(request=REQUEST,
-                                    proxy=app_doc,
-                                    layout_id = "student_application_fe",
-                                    layout_mode = 'edit',
-                                    use_session=True)
-        action = "/application_edit"
-        if is_valid:
-            if app_doc.passport is not None:
-                psm = 'You successfully uploaded your passport image.'
-                args = {'apply_button': 'Apply',}
-            else:
-                psm = "You didn't upload a passport image."
-                args = {}
-        else:
-            psm = 'psm_content_error'
-            args = getFormUidUrlArg(REQUEST)
-    elif 'apply_admission' not in REQUEST.form:
-        is_valid, ds = app_doc.validate(request=REQUEST,
-                                    proxy=app_doc,
-                                    layout_id = "student_application_fe",
-                                    layout_mode = 'edit',
-                                    use_session=True)
-        action = "/application_edit"
-        if is_valid:
-            args = {}
-            if 'apply_admission' not in REQUEST.form:
-                args = {'apply_button': 'Apply',}
-                psm = 'You successfully uploaded your passport image.'
-            else:
-                psm = 'You applied for admission.'
-        else:
-            args = getFormUidUrlArg(REQUEST)
-            psm = 'psm_content_error'
-    else:
-        psm = ''
-        args = {}
-        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'] == "admitted":
-            student.content_status_modify(workflow_action="enter_clearance_pin")
-            #wftool.doActionFor(info['clear'],'open',dest_container=info['clear'])
-            app_doc = info['app_doc']
-            dc = {}
-            dc['email'] = app_doc.app_email
-            info['clear_doc'].edit(mapping = dc)
-            wftool.doActionFor(app,'close',dest_container= app)
-            psm = 'You successfully started the clearance process.'
-            action = "/clearance_edit"
-        else:
-            action = "/clearance_view"
-
-else:
-    is_valid, ds = app_doc.validate(request=REQUEST, proxy=context, cluster=cluster,
+is_valid, ds = app_doc.validate(request=REQUEST, 
+                                schema_id = 'student_application',
+                                layout_id = 'student_application_fe',
+                                proxy=app,
                                 use_session=True)
 
-    if action is None:
-        ti = app.getTypeInfo()
-        action = ti.queryMethodID('edit', 'cpsdocument_edit_form')
-        action = '/' + action
-
+psm = ""
+args = {}
+action = "/application_edit_view"
+if cpsdocument_edit_button:
     if is_valid:
-        comments = REQUEST.get('comments')
-        context.cpsdocument_notify_modification(comments=comments)
-        if cpsdocument_edit_and_view_button is not None:
-            action = ''
-        psm = 'psm_content_changed'
-        args = {}
+        if app_doc.passport is not None:
+            args['proceed'] = 'Continue to Clearance'
+            psm = 'You successfully uploaded your passport image.'
+        else:
+            psm = "You didn't upload a passport image."
+elif proceed:
+    if is_valid:
+        action = "/request_clearance"
     else:
         psm = 'psm_content_error'
-        args = getFormUidUrlArg(REQUEST)
-
 args['portal_status_message'] = psm
-url = context.absolute_url() + action + '?' + urlencode(args)
+url = app.absolute_url() + action + '?' + urlencode(args)
 REQUEST.RESPONSE.redirect(url)