Changeset 4035

Timestamp:

31 Mar 2009, 21:18:43 (16 years ago)

Author:

Henrik Bettermann

Message:

signature included, academic report slip fixed, average with 2 decimals

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

• academic_report_slip.pt (modified) (4 diffs)
• butler.jpg (added)
• getStudyLevelInfo.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -21 +21 @@
                                                  layout_mode='view_info',       
                                                  layout_id='student_application')"       />
+
+        
+        <span tal:condition="python:info[sem[2]]" tal:omit-tag="">
+        
         <table>
             <tr>
@@ -29 +33 @@
             </tr>
         </table>
-        <br />         
+        <br />   <br />                 
         
-        <span tal:condition="python:info[sem[2]]" tal:omit-tag="">
             <table class="contentListing" id="folder_content" width="100%">
                     <tr tal:condition="python:info[sem[1]]">
@@ -62 +65 @@
             <table width=100%>
                 <tr > 
-                    <td width=40%>&nbsp;</td>  
-                    <td width=30%>Date: 12/12/2008</td> 
-                    <td width=30%>Ms J.C. Butler</td>
+                    <td width=50%>&nbsp;</td>  
+                    <td width=20%>Date: 12/12/2008</td> 
+                    <td width=30% align='center'>
+                    <img tal:attributes="src string:${static_base_url}butler.jpg"  alt="Signature"/>
+                    <br />Ms J.C. Butler
+                    <br />Principal</td>
                 </tr>            
-                <tr > 
-                    <td width=40%>&nbsp;</td> 
-                    <td width=30%></td> 
-                    <td width=30%>Principal</td>
-                </tr>
             </table>
         </span>
@@ -77 +78 @@
         <span tal:condition="python:not info[sem[2]]" tal:omit-tag="">      
         
+        <br />      
         <font color=red>Report not yet complete</font>
           

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -109 +109 @@
     score_calc_average_1 /= len(normal1)    
 info['complete1'] = complete1     
-info['score_calc_average_1'] = score_calc_average_1  
+info['score_calc_average_1'] = '%.2f' % score_calc_average_1  
 
 complete2 = 0
 score_calc_average_2 = 0
-for r in normal1:
+for r in normal2:
     if r['grade'] and r['atl']:
         score_calc_average_2 += r['score_calc']
@@ -124 +124 @@
     score_calc_average_2 /= len(normal2)
 info['complete2'] = complete2
-info['score_calc_average_2'] = score_calc_average_2  
+info['score_calc_average_2'] = '%.2f' % score_calc_average_2  
 
 complete3 = 0
 score_calc_average_3 = 0
-for r in normal1:
+for r in normal3:
     if r['grade'] and r['atl']:
         complete3 += 1
@@ -139 +139 @@
     score_calc_average_3 /= len(normal3)    
 info['complete3'] = complete3
-info['score_calc_average_3'] = score_calc_average_3  
+info['score_calc_average_3'] =  '%.2f' % score_calc_average_3