Changeset 1359 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

26 Jan 2007, 09:00:48 (18 years ago)

Author:

Henrik Bettermann

Message:

enable hostel booking for school_fee_paid
session result view available only for students with results

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getAccommodationInfo.py (modified) (3 diffs)
• getStudentFolderInfo.py (modified) (1 diff)
• student_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py

@@ -39 +39 @@
     logger.info('"%s","not found in students_catalog"')
     return None
-    
+
 ekehuan_certificates = ('BARTAPG',
                         'BARTAPM',
@@ -66 +66 @@
 
 students_object = context.portal_url.getPortalObject().campus.students
-res = context.results_import(matric_no = s_brain.matric_no)
 student = getattr(students_object, student_id)
 info['id'] = student_id
@@ -72 +71 @@
 review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
 booking_allowed = False
-if review_state in ('returning','school_fee_paid','courses_registered', 'courses_validated',):
+if review_state in ('cleared_and_validated','returning','school_fee_paid','courses_registered', 'courses_validated',):
+    booking_allowed = True
     res = context.results_import(matric_no = s_brain.matric_no)
     if res:
         booking_allowed = res[0].Verdict in ("SUCCESSFUL STUDENT",
                                              "STUDENT WITH CARRYOVER COURSES",)
-elif review_state in ('cleared_and_validated',):
-    booking_allowed = True
 info['booking_allowed'] = booking_allowed
 if not booking_allowed:

WAeUP_SRP/trunk/skins/waeup_student/getStudentFolderInfo.py

@@ -55 +55 @@
 if res:
     info['review_state'] = res[0].review_state
+res = context.results_import(matric_no = st_brain.matric_no)
+if res:
+    info['session'] = True
+else:
+    info['session'] = False
+
 info['id'] = student_id
 items = []

WAeUP_SRP/trunk/skins/waeup_student/student_view.pt

@@ -41 +41 @@
             
           </tr>
-          <tr tal:condition="python:info['review_state'] == 'returning'">
+          <tr tal:condition="info/session">
             <td>
                 <a href="edit" tal:attributes="href string:session_results_view">
@@ -85 +85 @@
         </tr>
       </span>
-      <tr tal:condition="python:info['review_state'] == 'returning'">
+      <tr tal:condition="info/session">
         <td>
             <a href="edit" tal:attributes="href string:session_results_view">