Changeset 710 for WAeUP_SRP/trunk/skins

Timestamp:

16 Oct 2006, 22:30:16 (18 years ago)

Author:

joachim

Message:

fixed several bugs in the Apply for PUME Process:
jamb_reg_no had wrong widget
applying with a different PIN a second time led to an error.

the new fields:
appl_email, appl_mobile are set to hidden in laymode create
could not set the fields to required, cause that broke the applyForm.
layout: student_application.xml still has them set to required.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_pins/getBatchInfo.py (modified) (1 diff)
• waeup_student/layout_application_edit.pt (modified) (1 diff)
• waeup_student/passport_entry_view.pt (modified) (2 diffs)
• waeup_student/student_edit.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py

@@ -32 +32 @@
         jno = item['student']
         res = context.portal_catalog(SearchableText=jno,portal_type='StudentApplication')
-        if len(res) > 1:
+        if len(res) > 0:
             item['student_url'] = "%s/%s" % (context.portal_url(),res[0].relative_path)
         else:

WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt

@@ -27 +27 @@
               err python:ds.getError(wid);
               err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
+              is_required python: widget.is_required;
               tooltip_id python:wid + '_help';
               widget_css_class cell/widget_css_class|nothing;

WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getStudentInfo">
+<metal:html tal:define="info context/getStudentInfo;
+            rendered_main python:info['app_doc'].renderEdit(
+                                                        layout_mode='edit',
+                                                        proxy=info['app'],
+                                                        no_form = True,
+                                                        schema_id = 'student_application',
+                                                        layout_id='student_application_fe',
+            )">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
@@ -12 +19 @@
         <h3>Upload your Passport Picture!</h3>
         <br />
-        <span tal:omit-tag=""
-              tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
-              layout_mode='edit', 
-              layout_id='student_application_fe',
-              )" 
-              />
+        <span tal:omit-tag="" tal:replace="structure rendered_main"/>
       </span>
     </metal:main>

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -48 +48 @@
                                     use_session=True)
         action = "/passport_entry_view"
-        if app_doc.passport is not None:
-            psm = 'You successfully uploaded your passport image.'
-            args = {'apply_button': 'Apply',}
+        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 = "You didn't upload a passport image."
-            args = {}
+            psm = 'psm_content_error'
+            args = getFormUidUrlArg(REQUEST)
     elif 'apply_admission' not in REQUEST.form:
         is_valid, ds = app_doc.validate(request=REQUEST,