Changeset 17497 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

20 Jul 2023, 13:38:29 (17 months ago)

Author:

Henrik Bettermann

Message:

Remove redundant ‚key‘ field from exports.
Adjust tests and code.
Add columns to transcript officers landing page.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (2 diffs)
• browser_templates/transcript.pt (modified) (3 diffs)
• utils.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1602 +1602 @@
             self.redirect(self.url(self.context))
             return
+        self.tdata = self.context.getTranscriptData()
+        #if not self.tdata[1]:
+        #    self.flash(_('No results yet!'), type="warning")
+        #    self.redirect(self.url(self.context))
+        #    return
         super(StudyCourseTranscriptPage, self).update()
         self.semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
@@ -1636 +1641 @@
             self.redirect(self.url(self.context))
             return
+        tdata = self.context.getTranscriptData()
+        #if not tdata[1]:
+        #    self.flash(_('No results yet!'), type="warning")
+        #    self.redirect(self.url(self.context))
+        #    return
         super(ExportPDFTranscriptSlip, self).update()
         self.semester_dict = getUtility(IKofaUtils).SEMESTER_DICT

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcript.pt

@@ -1 @@
-<tal:def define="tdata python:context.getTranscriptData()">
 <table class="form-table" i18n:domain="waeup.kofa">
   <thead>
@@ -16 +15 @@
       </tr>
     </tal:block>
-    <tr>
+    <tr tal:condition="python:view.tdata[1]">
       <td>
         <span i18n:translate="">Cumulative GPA</span>:
       </td>
       <td>
-        <div tal:content="python:view.format_float(tdata[1], 3)">CGPA</div>
+        <div tal:content="python:view.format_float(view.tdata[1], 3)">CGPA</div>
       </td>
     </tr>
@@ -27 +26 @@
 </table>
 
-<h3 i18n:domain="waeup.kofa" i18n:translate="">Subjects/Courses</h3>
+<tal:block condition=python:view.tdata[1]>
+  <h3 i18n:domain="waeup.kofa" i18n:translate="">Subjects/Courses</h3>
+  <table i18n:domain="waeup.kofa" class="form-table" >
+    <thead>
+      <tr>
+        <th i18n:translate="">Level</th>
+        <th i18n:translate="">Session</th>
+        <th i18n:translate="">Term</th>
+        <th i18n:translate="">Course</th>
+        <th i18n:translate="">Title</th>
+        <th i18n:translate="">Credits</th>
+        <th i18n:translate="">Grade</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tal:levels tal:repeat="level python:view.tdata[0]">
+        <tal:semesters tal:repeat="semester_tickets python:(level['tickets_1'],
+                                        level['tickets_2'], level['tickets_3'])">
+        <tr tal:repeat="ticket semester_tickets">
+          <td tal:content="python: view.level_dict.get('ticket.level', ticket.level)">LEVEL</td>
+          <td tal:content="python: view.session_dict[ticket.level_session]">SESSION</td>
+          <td tal:content="python: view.semester_dict[ticket.semester]">SEMESTER</td>
+          <td tal:content="ticket/code">CODE</td>
+          <td tal:content="ticket/title">TITLE</td>
+          <td tal:content="ticket/credits">CREDITS</td>
+          <td tal:content="ticket/grade|nothing">GRADE</td>
+        </tr>
+        </tal:semesters>
+      </tal:levels>
+    </tbody>
+  </table>
+  <br />
+</tal:block>
 
-<table i18n:domain="waeup.kofa" class="form-table" >
-  <thead>
-    <tr>
-      <th i18n:translate="">Level</th>
-      <th i18n:translate="">Session</th>
-      <th i18n:translate="">Term</th>
-      <th i18n:translate="">Course</th>
-      <th i18n:translate="">Title</th>
-      <th i18n:translate="">Credits</th>
-      <th i18n:translate="">Grade</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tal:levels tal:repeat="level python:tdata[0]">
-      <tal:semesters tal:repeat="semester_tickets python:(level['tickets_1'],
-                                      level['tickets_2'], level['tickets_3'])">
-      <tr tal:repeat="ticket semester_tickets">
-        <td tal:content="python: view.level_dict.get('ticket.level', ticket.level)">LEVEL</td>
-        <td tal:content="python: view.session_dict[ticket.level_session]">SESSION</td>
-        <td tal:content="python: view.semester_dict[ticket.semester]">SEMESTER</td>
-        <td tal:content="ticket/code">CODE</td>
-        <td tal:content="ticket/title">TITLE</td>
-        <td tal:content="ticket/credits">CREDITS</td>
-        <td tal:content="ticket/grade|nothing">GRADE</td>
-      </tr>
-      </tal:semesters>
-    </tal:levels>
-  </tbody>
-</table>
-<br />
 <div tal:content="python:getattr(context, 'transcript_signees', '')">SIGNEES</div>
-</tal:def>
+
+<p tal:condition="not: python:view.tdata[1]">
+  <br />
+  <strong>No results yet!</strong>
+</p>

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -1089 +1089 @@
         else:
             f_text = formatted_text('%s' % cgpa)
+            if not transcript_data[1]:
+                f_text = formatted_text('No results yet!')
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -1095 +1097 @@
         data.append(contexttable)
 
-        transcripttables = render_transcript_data(
-            view, tableheader, levels_data, lang=portal_language)
-        data.extend(transcripttables)
+        if transcript_data[1]:
+            transcripttables = render_transcript_data(
+                view, tableheader, levels_data, lang=portal_language)
+            data.extend(transcripttables)
 
         # Insert signatures