Changeset 14575 for main/waeup.kofa/trunk

Timestamp:

23 Feb 2017, 14:14:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Add OS column (outstanding) on display, edit and manage page.

Location:

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

Files:

• browser.py (modified) (1 diff)
• browser_templates/studyleveleditpage.pt (modified) (2 diffs)
• browser_templates/studylevelmanagepage.pt (modified) (2 diffs)
• browser_templates/studylevelpage.pt (modified) (3 diffs)

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

@@ -130 +130 @@
         value_dict['carry_over'] = translate(str(value.carry_over), 'zope',
             target_language=lang)
+        value_dict['outstanding'] = translate(str(value.outstanding), 'zope',
+            target_language=lang)
         value_dict['automatic'] = translate(str(value.automatic), 'zope',
             target_language=lang)

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

@@ -20 +20 @@
       <th i18n:translate="">Score</th>
       <th i18n:translate="">CO</th>
+      <th i18n:translate="">OS</th>
     </tr>
   </thead>
@@ -39 +40 @@
       <td tal:content="value/score|nothing">SCORE</td>
       <td tal:content="value/carry_over">CO</td>
+      <td tal:content="value/outstanding">OS</td>
     </tr>
   </tbody>

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

@@ -47 +47 @@
             <th i18n:translate="">Score</th>
             <th i18n:translate="">CO</th>
+            <th i18n:translate="">OS</th>
             <th i18n:translate="">Auto</th>
           </tr>
@@ -67 +68 @@
             <td tal:content="value/score|nothing">SCORE</td>
             <td tal:content="value/carry_over">CO</td>
+            <td tal:content="value/outstanding">OS</td>
             <td tal:content="value/automatic">AUTO</td>
           </tr>

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

@@ -31 +31 @@
       <th i18n:translate="">Grade</th>
       <th i18n:translate="">CO</th>
+      <th i18n:translate="">OS</th>
       <th i18n:translate="">Auto</th>
     </tr>
@@ -48 +49 @@
       <td tal:content="value/grade|nothing">GRADE</td>
       <td tal:content="value/carry_over">CO</td>
+      <td tal:content="value/outstanding">OS</td>
       <td tal:content="value/automatic">AUTO</td>
     </tr>
@@ -53 +55 @@
 </table>
 
+<p i18n:translate="">
+  CO: Carry-over course<br />
+  OS: Outstanding course<br />
+  Requ.: Required course<br />
+  Auto: Automatically created course ticket
+</p>
+
 <div i18n:domain="waeup.kofa"
   tal:condition="python: not len(context.keys())" i18n:translate="">