Changeset 1165 for WAeUP_SRP

Timestamp:

31 Dec 2006, 16:27:38 (18 years ago)

Author:

joachim

Message:

group results by semester,
show titles for courses, for that the courses_catalog must be available.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• display_session_results.py (modified) (1 diff)
• session_results_anon_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py

@@ -40 +40 @@
                                  )
 elif psm == 'valid':
-##    context.waeup_tool.makeStudent(ds.get('student'),
-##                                   results=ds.get('results'))
-    return context.session_results_anon_view(student=ds.get('student'),
-                                           results=ds.get('results'))
+    pass
+brains = ds.get('results')
+sem1 = []
+sem2 = []
+with_courses_cat = hasattr(context,'courses_catalog')
+fields = context.results_import.schema()
+for r in brains:
+    result = {}
+    for field in fields:
+        result[field] = getattr(r,field)
+    if with_courses_cat:
+        res = context.courses_catalog(code = r.CosCode)
+    if with_courses_cat and res:
+        result['title'] = res[0].title
+    else:
+        result['title'] = "Title no available"
+    if r.Semester == '2':
+        sem2.append(result)
+    else:
+        sem1.append(result)
+#from Products.zdb import set_trace;set_trace()
+results = (sem1, sem2)
+return context.session_results_anon_view(student=ds.get('student'),
+                                           results=results)
 

WAeUP_SRP/trunk/skins/waeup_student/session_results_anon_view.pt

@@ -4 +4 @@
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <div style="text-align: right">
+      <div tal:condition="nothing" style="text-align: right">
         <a href="" target="slip" tal:attributes="href string:session_results_anon_slip?nr=${student/matric_no}"
            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')">
@@ -33 +33 @@
        <table>
           <tr>
-            <th width="150px">Verdict:</th><td tal:content="python:results[0]['Verdict']" /> 
+            <th width="150px">Verdict:</th><td tal:content="python:results[0][0]['Verdict']" /> 
           </tr>
           <tr>  
-            <th>Session:</th><td tal:content="python:results[0]['Session']" /> 
+            <th>Session:</th><td tal:content="python:results[0][0]['Session']" /> 
           </tr>        
        </table>
@@ -43 +43 @@
                      
        <table>
-        <span tal:repeat="result results">
-          <tr tal:condition="repeat/result/start">
-            <th width="150px">Course</th><th>Grade</th>
+         <span tal:repeat="semester results">
+          <tr tal:condition="repeat/semester/start">
+            <th width="50px">Course</th><th>Title</th><th>Grade</th>
           </tr>
-          <tr><td tal:content="result/CosCode" />
-            <td tal:content="result/GRADE" />
+            <span tal:repeat="result semester">
+             <tr tal:condition="repeat/result/start">
+              <th colspan="5">
+                <span tal:replace="python: test(repeat['result'].index,'Second','First')" /> Semester
+              </th>
+             </tr>
+            <tr>     
+            <td tal:content="result/CosCode" />
+            <td tal:condition="nothing" align="center" tal:content="result/Semester" />
+            <td tal:content="result/title" />
+            <td align="center" tal:content="result/GRADE" />
           </tr>
+        </span>
         </span>
       </table>