Changeset 3985

Timestamp:

27 Feb 2009, 20:22:29 (16 years ago)

Author:

Henrik Bettermann

Message:

getAccommodationInfo.py: deactivate histel booking fro graduates
srp_anonymous_view.pt: Use portal title for headline
portlet_student_workflow_display.pt: show state graduated

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/getAccommodationInfo.py (modified) (2 diffs)
• waeup_default/srp_anonymous_view.pt (modified) (1 diff)
• waeup_default/srp_view.pt (modified) (1 diff)
• waeup_layout/portlet_student_workflow_display.pt (modified) (3 diffs)
• waeup_student/getStudentWorkflowInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -103 +103 @@
     logger.info('%s has invalid session %s' % (student_id,student_record.session))
 
-if level is None or end_level is None or student_record.review_state == 'deactivated':
+if level is None or end_level is None or student_record.review_state in ('deactivated','graduated'):
     pass
 elif arrived:
@@ -109 +109 @@
         booking_allowed = student_record.review_state in new_states
     else:
-        booking_allowed = not (level % 100)
+        booking_allowed = not (level % 100) 
 elif previous:
     booking_allowed = student_record.verdict in ('A','B',)

WAeUP_SRP/trunk/skins/waeup_default/srp_anonymous_view.pt

@@ -11 +11 @@
 
       <h2>Welcome to the     
-      <br />New Student Registration Portal of the <span tal:replace="here/portal_properties/institution_title" /></h2>
+      <br /><span tal:replace="here/portal_properties/title" /> of the <span tal:replace="here/portal_properties/institution_title" /></h2>
              
       <strong>This is the default frontpage of the Student Registration Portal (SRP) which is part 

WAeUP_SRP/trunk/skins/waeup_default/srp_view.pt

@@ -13 +13 @@
       
         <h2>Welcome to the     
-          <br />Student Registration Portal of the <span tal:replace="here/portal_properties/institution_title" /></h2>
+          <br /><span tal:replace="here/portal_properties/title" /> of the <span tal:replace="here/portal_properties/institution_title" /></h2>
           <br />
           You are logged in and viewing the portal's root folder. Please go to one of the sections above.   

WAeUP_SRP/trunk/skins/waeup_layout/portlet_student_workflow_display.pt

@@ -77 +77 @@
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
-    
     Returning
-
   </td></tr>
   </span>
+  <span tal:condition="python:info['review_state']!='returning'">
+  <tr><td>
+    Returning
+  </td></tr>
+  </span>  
   <span tal:condition="python:info['review_state']=='school_fee_paid'">
   <tr><td class="active">
@@ -109 +112 @@
   <tr><td class="active">
     <a href="" tal:attributes="href string:${info/url}/student_view">
-    Courses vaildated
+    Courses validated
     </a>
   </td></tr>
@@ -115 +118 @@
   <span tal:condition="python:info['review_state']!='courses_validated'">
   <tr><td>
-    Courses vaildated
+    Courses validated
   </td></tr>
   </span>     
+  <span tal:condition="python:info['review_state']=='graduated'">
+  <tr><td class="active">
+    <a href="" tal:attributes="href string:${info/url}/student_view">
+    Graduated
+    </a>
+  </td></tr>
+  </span>  
+  <span tal:condition="python:info['review_state']!='graduated'">
+  <tr><td>
+    Graduated
+  </td></tr>
+  </span>    
 </table>
 

WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py

@@ -32 +32 @@
                                            'courses_registered',
                                            'courses_validated',
+                                           'graduated',
                                            )
 info['tr'] = review_state in  ('returning',)