Changeset 5569 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

15 Oct 2010, 06:49:26 (14 years ago)

Author:

Henrik Bettermann

Message:

FCEOkene: show both course_registration_slip and examination_slip

course_registration_slip.pt: schow 'validated by system' if no validated_by string

File:

• WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

@@ -13 +13 @@
           is_student info/is_student;
           validated info/validated;
+          cv_id info/doc/validated_by|nothing;
+          cv_member python:context.waeup_tool.getOfficerName(cv_id);          
           ">
       <h3>Course Registration Slip for <span tal:content="info/level_str" /></h3>
-      <br />
-      <div tal:condition="validated">
-        - validated by <span tal:condition="info/doc/validated_by|nothing" tal:omit-tag="">
-          <span tal:replace="info/doc/validated_by" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" />
-        </span> -
+      <div tal:condition="python: validated and cv_id">
+        <br />
+        - validated by 
+            <span tal:replace="cv_member" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" /> -
+        <br />
       </div>
       <div tal:condition="not: validated">
+        <br />
         - not yet validated by Course Adviser -
+        <br />
       </div>
-      <br />
+      <div tal:condition="python: validated and not cv_id">
+        <br />
+        - validated by system -
+        <br />
+      </div>      
       <span tal:omit-tag=""
             tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],