Changeset 2496 for WAeUP_SRP/base/skins

Timestamp:

1 Nov 2007, 08:50:40 (17 years ago)

Author:

Henrik Bettermann

Message:

new student workflow state deactivated
student workflow cleaned

Location:

WAeUP_SRP/base/skins

Files:

• waeup_layout/portlet_student_workflow_display.pt (modified) (2 diffs)
• waeup_student/student_view.pt (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_layout/portlet_student_workflow_display.pt

@@ -11 +11 @@
 
 <table class="registration" tal:condition="not:info/cr">
+
   <span tal:condition="python:path('info/review_state')=='admitted'">
   <tr>
@@ -20 +21 @@
   </tr>
   </span>
-  <span tal:condition="python:path('info/review_state')=='admission_rejected'">
-  <tr><td class="stopped">Admission rejected</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state') in ('objection_raised','clearance_pin_entered','clearance_requested','cleared_and_validated',)">
+  <span tal:condition="python:path('info/review_state') in ('objection_raised','clearance_pin_entered','clearance_requested','cleared_and_validated','deactivated')">
   <tr>
     <td>

WAeUP_SRP/base/skins/waeup_student/student_view.pt

@@ -116 +116 @@
 
 
+      <div tal:condition="python:info['review_state']=='deactivated'">
+      <font color="red">This student record has been deactivated!</font>
+      </div>
       
 
-      <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">      
+      <table tal:condition="python:is_student and info['review_state']!='deactivated'" class="contentListing" width="" summary="content layout" id="folder_content">      
         <span tal:repeat="row rows">
           <tr tal:condition="row/display">
@@ -152 +155 @@
         </tr>
       </table>
-        
+
+      
     </metal:block>
     </metal:block>