Changeset 15294 for main/kofacustom.coewarri

Timestamp:

10 Jan 2019, 15:58:13 (6 years ago)

Author:

Henrik Bettermann

Message:

Shoow course category on student pages.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

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

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/browser.py

@@ -70 +70 @@
         Faculty = translate(_('Faculty'), 'waeup.kofa', target_language=portal_language)
         Cred = translate(_('Cred.'), 'waeup.kofa', target_language=portal_language)
-        #Mand = translate(_('Requ.'), 'waeup.kofa', target_language=portal_language)
+        CC = translate(_('Cat.'), target_language=portal_language)
         Score = translate(_('Score'), 'waeup.kofa', target_language=portal_language)
         Grade = translate(_('Grade'), 'waeup.kofa', target_language=portal_language)
@@ -87 +87 @@
                              (Dept,'dcode', 1.5), (Faculty,'fcode', 1.5),
                              (Cred, 'credits', 1.5),
-                             #(Mand, 'mandatory', 1.5),
+                             (CC, 'course_category', 1.2),
                              (Score, 'score', 1.5),
                              (Grade, 'grade', 1.5),
-                             #('Auto', 'automatic', 1.5)
                              ])
         return students_utils.renderPDF(

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/browser_templates/studyleveleditpage.pt

@@ -21 +21 @@
       <th i18n:translate="">CO</th>
       <th i18n:translate="">OS</th>
+      <th i18n:translate="">CC</th>
     </tr>
   </thead>
@@ -41 +42 @@
       <td tal:content="value/carry_over">CO</td>
       <td tal:content="value/outstanding">OS</td>
+      <td tal:content="value/course_category">CC</td>
     </tr>
   </tbody>

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/browser_templates/studylevelmanagepage.pt

@@ -48 +48 @@
             <th i18n:translate="">CO</th>
             <th i18n:translate="">OS</th>
+            <th i18n:translate="">CC</th>
             <th i18n:translate="">Auto</th>
           </tr>
@@ -69 +70 @@
             <td tal:content="value/carry_over">CO</td>
             <td tal:content="value/outstanding">OS</td>
+            <td tal:content="value/course_category">CC</td>
             <td tal:content="value/automatic">AUTO</td>
           </tr>

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/browser_templates/studylevelpage.pt

@@ -32 +32 @@
       <th i18n:translate="">CO</th>
       <th i18n:translate="">OS</th>
+      <th i18n:translate="">CC</th>
       <th i18n:translate="">Auto</th>
     </tr>
@@ -50 +51 @@
       <td tal:content="value/carry_over">CO</td>
       <td tal:content="value/outstanding">OS</td>
+      <td tal:content="value/course_category|nothing">CC</td>
       <td tal:content="value/automatic">AUTO</td>
     </tr>
@@ -58 +60 @@
   CO: Carry-over course<br />
   OS: Outstanding course<br />
+  CC: Course Category (C or E)<br />
   Requ.: Required course<br />
   Auto: Automatically created course ticket