Changeset 14528 for main

Timestamp:

9 Feb 2017, 12:53:43 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace ' - ' by linebreak.

Location:

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

Files:

• level_report.py (modified) (1 diff)
• raw_score_report.py (modified) (1 diff)
• session_results_presentation.py (modified) (1 diff)
• tests/test_level_report.py (modified) (1 diff)
• tests/test_raw_score_report.py (modified) (1 diff)
• tests/test_session_results_presentation.py (modified) (1 diff)

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

@@ -41 +41 @@
         if not hod:
             hod = 'Head of Department'
+        dean = dean.replace(' - ', '<br />')
+        hod = hod.replace(' - ', '<br />')
         return [hod, dean]
 

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py

@@ -33 +33 @@
         if not hod:
             hod = 'Head of Department'
+        dean = dean.replace(' - ', '<br />')
+        hod = hod.replace(' - ', '<br />')
         return [hod, dean]
 

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

@@ -57 +57 @@
         if not examiner:
             examiner = 'External Examiner'
+        dean = dean.replace(' - ', '<br />')
+        hod = hod.replace(' - ', '<br />')
+        examiner = examiner.replace(' - ', '<br />')
         return [hod, examiner, dean]
 

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_level_report.py

@@ -36 +36 @@
     def test_create_pdf(self):
         self.student['studycourse']['100']['Course1'].ca = 0
-        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine (Dean of Faculty)'
-        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine (Head of Department)'
+        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
+        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
         report = CustomLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
         result = report.create_pdf('JOB_ID')

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

@@ -61 +61 @@
         self.app['faculties']['fac1']['dep1'].certificates[
             'CERT1'].addCertCourse(self.course, level=100)
-        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine (Dean of Faculty)'
-        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine (Head of Department)'
+        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
+        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
         studylevel = createObject('waeup.StudentStudyLevel')
         studylevel.level = 200

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_session_results_presentation.py

@@ -42 +42 @@
     def test_create_pdf(self):
         self.certificate.degree = 'BA(FS)'
-        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine (Dean of Faculty)'
-        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine (Head of Department)'
-        self.app['faculties']['fac1']['dep1'].officer_2 = 'Theresa Starbright (External Examiner)'
+        self.app['faculties']['fac1'].officer_1 = 'Rosa Moonshine - Dean of Faculty'
+        self.app['faculties']['fac1']['dep1'].officer_1 = 'Amalia Sunshine - Head of Department'
+        self.app['faculties']['fac1']['dep1'].officer_2 = 'Theresa Starbright - External Examiner'
         report = CustomSessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
         result = report.create_pdf('JOB_ID')