Changeset 14481 for main

Timestamp:

31 Jan 2017, 13:04:51 (8 years ago)

Author:

Henrik Bettermann

Message:

Show correct level on level reports and session results presentations.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/reports/level_report.py (modified) (2 diffs)
• src/waeup/kofa/students/reports/session_results_presentation.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.4.2.dev0 (unreleased)
 =======================
+
+* Show correct level on level reports and session results presentations.
 
 * Get set of selected students also from list of matric numbers.

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -194 +194 @@
         self.portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
         self.session = academic_sessions_vocab.getTerm(session).title
-        self.level = translate(self.studylevelsource.getTitle(None, int(level)),
-            'waeup.kofa', target_language=self.portal_language)
         self.levelcode = level
         self.sessioncode = session
@@ -207 +205 @@
                 _('All Certificates'), 'waeup.kofa',
                 target_language=self.portal_language)
+            self.level = translate(
+                self.studylevelsource.getTitle(None, int(level)),
+                'waeup.kofa', target_language=self.portal_language)
         else:
-            self.certtitle = site['faculties'][faccode][
-                depcode].certificates[certcode].longtitle
+            certificate = site[
+                'faculties'][faccode][depcode].certificates[certcode]
+            self.certtitle = certificate.longtitle
+            self.level = translate(
+                self.studylevelsource.getTitle(certificate, int(level)),
+                'waeup.kofa', target_language=self.portal_language)
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/session_results_presentation.py

@@ -138 +138 @@
         self.portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
         self.session = academic_sessions_vocab.getTerm(session).title
-        if level == 0:
-            self.level = translate(_('all levels'))
-        else:
-            self.level = translate(self.studylevelsource.getTitle(None, int(level)),
-                'waeup.kofa', target_language=self.portal_language)
         self.levelcode = level
         self.sessioncode = session
@@ -155 +150 @@
                 target_language=self.portal_language)
         else:
-            self.certtitle = site['faculties'][faccode][
-                depcode].certificates[certcode].longtitle
+            certificate = site[
+                'faculties'][faccode][depcode].certificates[certcode]
+            self.certtitle = certificate.longtitle
+        if level == 0:
+            self.level = translate(_('all levels'))
+        else:
+            if self.certcode == 'all':
+                self.level = translate(
+                    self.studylevelsource.getTitle(None, int(level)),
+                    'waeup.kofa', target_language=self.portal_language)
+            else:
+                self.level = translate(
+                    self.studylevelsource.getTitle(certificate, int(level)),
+                    'waeup.kofa', target_language=self.portal_language)
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(