Changeset 1327

Timestamp:

19 Jan 2007, 18:14:23 (18 years ago)

Author:

joachim

Message:

request_transfer_form is directly shown, if transferfee is payed.

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_transfer.xml (modified) (1 diff)
• skins/waeup_student/request_transfer.py (modified) (3 diffs)
• skins/waeup_student/request_transfer_form.pt (modified) (2 diffs)

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

@@ -34 +34 @@
   <table>
     <row>
-      <cell name="transfer_type"/>
-    </row>
-    <row>
       <cell name="pin"/>
     </row>

WAeUP_SRP/trunk/skins/waeup_student/request_transfer.py

@@ -26 +26 @@
 student = getattr(students,student_id)
 sbrain = context.students_catalog(id=student_id)[0]
-
+payments = getattr(student,'payments').objectIds()
+payed = False
+for payment in payments:
+    if payment.startswith('transfer'):
+        payed = True
+        break
+if payed:
+    return context.request_transfer_form(rendered = None,
+                                 psm = None,
+                                 payed = True,
+                                 )
+    
 validate = request.has_key("cpsdocument_create_button")
 res,psm,ds = lt.renderLayout(layout_id= 'student_transfer',
@@ -64 +75 @@
 info = {}
 order_id = ds.get('pin_n')
-p_id = "p%s" % order_id
+p_id = "transfer_%s" % order_id
 now = DateTime.DateTime()
 info['date'] = now
 info['amount'] = "n/a"
 pin = info['order_id'] = ds.get('pin')
-info['type_code'] = "%s" % pin
+info['type_code'] = "transfer_%s" % pin
 info['type_description'] = 'Transfer Form SC %s' % pin
 payments.invokeFactory('Payment', p_id)
@@ -77 +88 @@
 payment.getContent().edit(mapping=info)
 wftool.doActionFor(payment,'close')
-url = "%s/payments" % (student.absolute_url())
-request.RESPONSE.redirect(url)
+return context.request_transfer_form(rendered = None,
+                                 psm = None,
+                                 payed = True,
+                                 )
 

WAeUP_SRP/trunk/skins/waeup_student/request_transfer_form.pt

@@ -1 +1 @@
 <tal:block define="rendered_main options/rendered;
            portal_status_message options/psm;
-           data_storage options/ds;
+           payed options/payed|nothing;
            edition python:1;"
            >
@@ -13 +13 @@
       </metal:block>
       <metal:block fill-slot="main">
-        <h3>Request a Transfer!</h3>
-        <br />
-        <div tal:replace="structure rendered_main" />
+        <span tal:condition="rendered_main">
+          <h3>Request a Transfer!</h3>
+          <br />
+          <div tal:replace="structure rendered_main" />
+        </span>
+        <span tal:condition="payed">
+          <a href="intra_transfer">Request an Intra Faculty Transfer</a>
+          <a href="inter_transfer">Request an Inter Faculty Transfer</a>
+        </span>          
       </metal:block>
       <metal:block fill-slot="sub">