Changeset 15228 for main

Timestamp:

11 Nov 2018, 10:13:56 (6 years ago)

Author:

Henrik Bettermann

Message:

Show imported total scores in bold.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (2 diffs)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• studylevel.py (modified) (1 diff)

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

@@ -91 +91 @@
 grok.context(IKofaObject)  # Make IKofaObject the default context
 
+def translated_values(view):
+    """Translate course ticket attribute values to be displayed on
+    studylevel pages.
+    """
+    lang = view.request.cookies.get('kofa.language')
+    for value in view.context.values():
+        value._p_activate()
+        value_dict = dict([i for i in value.__dict__.items()])
+        value_dict['url'] = view.url(value)
+        value_dict['removable_by_student'] = value.removable_by_student
+        value_dict['mandatory'] = translate(str(value.mandatory), 'zope',
+            target_language=lang)
+        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)
+        value_dict['grade'] = value.grade
+        value_dict['weight'] = value.weight
+        value_dict['course_category'] = value.course_category
+        value_dict['total_score'] = value.total_score
+        semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
+        value_dict['semester'] = semester_dict[
+            value.semester].replace('mester', 'm.')
+        # AAUE specific
+        value_dict['formatted_total_score'] = value.total_score
+        if getattr(value, 'imported_ts', None):
+            value_dict['formatted_total_score'] = "<strong>%s</strong>" % value.imported_ts
+        yield value_dict
+
 class CustomStudentBaseDisplayFormPage(NigeriaStudentBaseDisplayFormPage):
     """ Page to display student base data
@@ -444 +475 @@
     form_fields[
         'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+    @property
+    def translated_values(self):
+        return translated_values(self)
 
     @property

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

@@ -43 +43 @@
       <td tal:content="value/credits">CREDITS</td>
       <td tal:content="value/mandatory">MANDATORY</td>
-      <td tal:condition="view/show_results" tal:content="value/total_score|nothing">TOTALSCORE</td>
+      <td tal:condition="view/show_results" tal:content="structure value/formatted_total_score|nothing">TOTALSCORE</td>
       <td tal:condition="view/show_results" tal:content="value/grade|nothing">GRADE</td>
       <td tal:content="value/carry_over">CO</td>

main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

@@ -406 +406 @@
     @property
     def total_score(self):
-        """Returns ca + score.
+        """Returns ca + score or imported total score.
         """
         # Override total_score if value has been imported