Changeset 2307 for WAeUP_SRP/base/skins

Timestamp:

4 Oct 2007, 06:21:53 (17 years ago)

Author:

joachim

Message:

allow apply_pume without reg_no. call with apply_pume/prence

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• apply_pume.py (modified) (12 diffs)
• apply_pume_form.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/apply_pume.py

@@ -48 +48 @@
 if manage:
     validate = False
-
+layout = "application"
+prence = ""
+without_reg_no = False
+if traverse_subpath and traverse_subpath[0] == "prence":
+    layout = "application_prence"
+    prence = "prence"
+    without_reg_no = True
 lt = context.portal_layouts
 reg_no = request.get('widget__reg_no','').upper()
@@ -81 +87 @@
     logger.info('%s/%s views application slip' % (member,reg_no))
 
-res,psm,ds = lt.renderLayout(layout_id= 'application',
+res,psm,ds = lt.renderLayout(layout_id= layout,
                              schema_id= 'application',
                              layout_mode = mode,
@@ -96 +102 @@
                                    mode = mode,
                                    ds = ds,
+                                   prence = prence,
                                   )
 
@@ -104 +111 @@
                                    mode = mode,
                                    ds = ds,
+                                   prence = prence,
                                   )
 elif psm == '' and not manage:
@@ -110 +118 @@
                                    ds = ds,
                                    mode = mode,
+                                   prence = prence,
                                   )
 elif psm == 'valid' or (psm == '' and manage):
     pass
+if without_reg_no:
+    reg_no = ds.get('reg_no')
 data = {}
 dm = ds.getDataModel()
@@ -120 +131 @@
 data['reg_no'] = reg_no
 
-
-
 if apply_pume:
     if submitted:
@@ -127 +136 @@
         psm = "The form has already been submitted and you are not allowed to resubmit the data!"
         logger.info('%s/%s tried to resubmit application record' % (member,reg_no))
-        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= 'application',
+        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= layout,
                                 schema_id= 'application',
                                 layout_mode = mode,
@@ -152 +161 @@
         context.applicants_catalog.modifyRecord(**data)
 
-        res,psm_dummy,ds = lt.renderLayout(layout_id= 'application',
+        res,psm_dummy,ds = lt.renderLayout(layout_id= layout,
                                 schema_id= 'application',
                                 layout_mode = mode,
@@ -169 +178 @@
     psm = ""
     #set_trace()
+    if without_reg_no:
+        object['reg_no'] = reg_no
     object['pin'] = str(ds.get('pin'))
-    res,psm,ds_dummy = lt.renderLayout(layout_id= 'application',
+    res,psm,ds_dummy = lt.renderLayout(layout_id= layout,
                                 schema_id= 'application',
                                 layout_mode = mode,
@@ -183 +194 @@
         psm = "The form has already been submitted and you are not allowed to modify the data!"
         logger.info('%s/%s tried to edit submitted application record' % (member,reg_no))
-        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= 'application',
+        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= layout,
                                 schema_id= 'application',
                                 layout_mode = mode,
@@ -203 +214 @@
         psm = "You are now assuming the applicant's role!"
         logger.info('%s/%s entered application record' % (member,reg_no))
-        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= 'application',
+        res,psm_dummy,ds_dummy = lt.renderLayout(layout_id= layout,
                                 schema_id= 'application',
                                 layout_mode = mode,
@@ -223 +234 @@
 
 return context.apply_pume_form(rendered = res,
-                            psm = psm,
-                            #psm = "%s, %s" % (psm,ds),
-                            mode = mode,
-                            show_submit = passport_uploaded,
-                            ds = ds,
-                            )
-
-
+                               psm = psm,
+                               #psm = "%s, %s" % (psm,ds),
+                               mode = mode,
+                               show_submit = passport_uploaded,
+                               ds = ds,
+                               prence = prence,
+                              )
+
+

WAeUP_SRP/base/skins/waeup_student/apply_pume_form.pt

@@ -15 +15 @@
         <form action="" id="editForm" method="post" 
               enctype="multipart/form-data" class="workflow"
-              tal:attributes="action string:${context/absolute_url}/apply_pume"
+              tal:attributes="action string:${context/absolute_url}/apply_pume/${options/prence}"
               >
           <input type="hidden" name="reg_no"