Changeset 3811 for WAeUP_SRP/trunk/skins

Timestamp:

10 Dec 2008, 15:33:34 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket Schools #1

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

• academic_report_slip.pt (modified) (3 diffs)
• academic_report_slip_1.pt (deleted)
• academic_report_slip_2.pt (deleted)
• academic_report_slip_3.pt (deleted)
• academic_report_slip_old.pt (added)
• academic_report_view.pt (modified) (1 diff)
• callAcademicReportSlip.py (added)
• getStudyLevelInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -7 +7 @@
     <span tal:omit-tag=""   tal:define="is_so info/is_so;   
                                        is_ca info/is_ca;   
-                                       show_check_boxes 
-                                       info/show_check_boxes;   
+                                       show_check_boxes info/show_check_boxes;   
                                        is_student info/is_student;   
-                                       validated info/validated;   ">  
-        <h3> <span tal:content="info/session" /> Academic Report (<span tal:content="info/student/course" /> 
-                                                                  <span tal:content="info/level_str" />)
+                                       validated info/validated;
+                                       term_complete info/complete1;
+                                       term options/term;
+                                       sem_series python:(('Term One','normal1','complete1'),('Term Two','normal2','complete2'),('Term Three','normal3','complete3'));
+                                       sem python:sem_series[int(term)-1];
+                                       ">
+                                          
+        <h3> <span tal:content="info/session" /> <span tal:content="python:sem[0]" /> Academic Report (<span tal:content="info/level_str" />)
             </h3>  <br /> 
-        <span tal:omit-tag=""       tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],       
+        <span tal:omit-tag="" tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],       
                                                  layout_mode='view_info',       
                                                  layout_id='student_application')"       />
         <br /> 
-        <span tal:condition="not:info/data_missing" tal:omit-tag="">
+        <span tal:condition="python:info[sem[2]]" tal:omit-tag="">
             <table class="contentListing" id="folder_content" width="100%">
-                <span tal:repeat="sem python:(('1','Term One','normal1'),('2','Term Two','normal2'),('3','Term Three','normal3'))">
-                    <tr tal:condition="python:info[sem[2]]">
-                        <th tal:content="python:sem[1]" />
+                    <tr tal:condition="python:info[sem[1]]">
+                        <th />
                         <th align='center'>ATL</th>  
                         <th align='center'>CA 1 <br />Marks</th>
@@ -32 +35 @@
                         </th>
                     </tr>
-                    <tr tal:repeat="row python:info[sem[2]]"       
+                    <tr tal:repeat="row python:info[sem[1]]"       
                         tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 
                         <td tal:content="row/title"></td> 
@@ -44 +47 @@
                     <tr><td>&nbsp;</td>
                     </tr>
-                </span>
             </table>
-        </span>
 
-        <span tal:condition="python:False">      <br /><br />
+
+        <span tal:condition="python:True">      <br /><br />
             <table width=100%>
                 <tr > 
-                    <td width=50%>Date:</td><td>Date:</td>
-                </tr>
-            </table>    <br /><br /><br /><br />
-            <table width=100%>
+                    <td width=40%>&nbsp;</td>  
+                    <td width=30%>Date: 12/12/2008</td> 
+                    <td width=30%>Ms J.C. Butler</td>
+                </tr>            
                 <tr > 
-                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td> 
-                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
+                    <td width=40%>&nbsp;</td> 
+                    <td width=30%></td> 
+                    <td width=30%>Principal</td>
                 </tr>
             </table>
         </span>
+        </span>        
+        
+        <span tal:condition="python:not info[sem[2]]" tal:omit-tag="">      
+        
+        <font color=red>Report not yet complete</font>
+          
+        </span>  
+        
+        
     </span>
 </span>

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt

@@ -27 +27 @@
          tal:condition="python:True"> 
     <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" /> Academic Report Slip:
-    <a href="" target="slip" tal:attributes="href string:academic_report_slip_1"
+    <a href="" target="slip" tal:attributes="href string:callAcademicReportSlip?term=1"
         onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
         Term 1 /
     </a>
-    <a href="" target="slip" tal:attributes="href string:academic_report_slip_2"
+    <a href="" target="slip" tal:attributes="href string:callAcademicReportSlip?term=2"
         onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
         Term 2 /
     </a>
-    <a href="" target="slip" tal:attributes="href string:academic_report_slip_3"
+    <a href="" target="slip" tal:attributes="href string:callAcademicReportSlip?term=3"
         onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
         Term 3

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -96 +96 @@
 info['items'] = items
 
+complete1 = 0
+for r in normal1:
+   if r['grade']:
+       complete1 += 1
+if len(normal1) == complete1:
+    complete1 =  True
+else:
+    complete1 = False
+info['complete1'] = complete1     
+
+complete2 = 0
+for r in normal1:
+   if r['grade']:
+       complete2 += 1
+if len(normal2) == complete2:
+    complete2 =  True
+else:
+    complete2 = False
+info['complete2'] = complete2
+
+complete3 = 0
+for r in normal1:
+   if r['grade']:
+       complete3 += 1
+if len(normal3) == complete3:
+    complete3 =  True
+else:
+    complete3 = False
+info['complete3'] = complete3
+
 
 #end customization