Changeset 1339 for WAeUP_SRP/trunk/skins

Timestamp:

21 Jan 2007, 22:55:34 (18 years ago)

Author:

Henrik Bettermann

Message:

transfer module activated

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getTransferInfo.py (modified) (1 diff)
• inter_faculty_transfer_1.pt (modified) (1 diff)
• request_transfer.py (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getTransferInfo.py

@@ -68 +68 @@
 
 # for testing of transfer forms
-info['paid'] = True
-info['pin'] = 'CLR-1-0123456789'
+#info['paid'] = True
+#info['pin'] = 'CLR-1-0123456789'
 
 

WAeUP_SRP/trunk/skins/waeup_student/inter_faculty_transfer_1.pt

@@ -35 +35 @@
         </td>
     </tr> 
-    <tr><td valign="top">7.</td><td>Proposed Faculty/School:</td><td style="border-bottom-style:dotted; border-bottom-width:1px; border-bottom-color:black">&nbsp;</td></tr> 
-    <tr><td></td><td>Proposed Department (if applicable):</td><td style="border-bottom-style:dotted; border-bottom-width:1px; border-bottom-color:black">&nbsp;</td></tr> 
+    <tr><td>7.</td><td>Proposed Department:</td><td style="border-bottom-style:dotted; border-bottom-width:1px; border-bottom-color:black">&nbsp;</td></tr> 
     <tr><td valign="top">8.</td><td>Reason(s) for Transfer (Tick)</td><td></td></tr> 
     <tr><td></td><td>(a) Personal Wish:</td><td>( )</td></tr> 

WAeUP_SRP/trunk/skins/waeup_student/request_transfer.py

@@ -14 +14 @@
 import logging
 from urllib import urlencode
-logger = logging.getLogger('Student.Transfer.Request')
+logger = logging.getLogger('EPayment.')
 import DateTime
 lt = context.portal_layouts
@@ -20 +20 @@
 students = context.portal_url.getPortalObject().campus.students
 
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
-member_id = str(member)
-requested_id = context.getStudentId()
-if requested_id and not context.isStaff() and member_id != requested_id:
-    logger.info('"%s", "accessed application object of", "%s"' % (member_id,requested_id))
-    student_id = requested_id
-elif context.isStaff():
-    student_id = requested_id
-else:
-    student_id = member_id
+student_id = context.getStudentId()
 if student_id is None:
     return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
@@ -37 +27 @@
 sbrain = context.students_catalog(id=student_id)[0]
 payments = getattr(student,'payments').objectIds()
-paid = False
+payed = False
 for payment in payments:
     if payment.startswith('transfer'):
-        paid = True
+        payed = True
         break
 
 # for testing of transfer forms
-paid = True
+#payed = True
 
-if paid:
-    logger.info('"%s", "opened (paid) request transfer form of", "%s"' % (member_id,student_id))
+if payed:
     return context.request_transfer_form(rendered = None,
                                  psm = None,
-                                 paid = True,
+                                 payed = True,
                                  )
 
@@ -105 +94 @@
 return context.request_transfer_form(rendered = None,
                                  psm = None,
-                                 paid = True,
+                                 payed = True,
                                  )