Changeset 14517 for main/waeup.aaue/trunk

Timestamp:

8 Feb 2017, 08:17:02 (8 years ago)

Author:

Henrik Bettermann

Message:

Customize signature fields. Fetch names from academic section.

Location:

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

Files:

• level_report.py (modified) (2 diffs)
• raw_score_report.py (modified) (2 diffs)
• session_results_presentation.py (modified) (2 diffs)
• 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

@@ -17 +17 @@
 ##
 
+import grok
 from waeup.kofa.students.reports.level_report import (
     LevelReport, LevelReportGenerator)
@@ -31 +32 @@
 #"""
 
-    signatures = [
-        'Head of Department', 'Dean of Faculty']
+    @property
+    def signatures(self):
+        site = grok.getSite()
+        dean = site['faculties'][self.faccode].officer_1
+        hod = site['faculties'][self.faccode][self.depcode].officer_1
+        if not dean:
+            dean = 'Dean of Faculty'
+        if not hod:
+            hod = 'Head of Department'
+        return [hod, dean]
 
 class LevelReportGenerator(LevelReportGenerator):

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

@@ -17 +17 @@
 ##
 
+import grok
 from waeup.kofa.students.reports.raw_score_report import (
     RawScoreReport, RawScoreReportGenerator)
@@ -23 +24 @@
 class CustomRawScoreReport(RawScoreReport):
 
-    signatures = ['Head of Department', 'Dean of Faculty']
+    @property
+    def signatures(self):
+        site = grok.getSite()
+        dean = site['faculties'][self.faccode].officer_1
+        hod = site['faculties'][self.faccode][self.depcode].officer_1
+        if not dean:
+            dean = 'Dean of Faculty'
+        if not hod:
+            hod = 'Head of Department'
+        return [hod, dean]
 
 

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

@@ -31 +31 @@
     @property
     def introduction (self):
-        site = grok.getSite()
-        degrees_dict = getUtility(IKofaUtils).DEGREES_DICT
-        if self.certcode == 'all':
-            text = """I present to Senate, on behalf of the Faculty Board,
+        text = """I present to Senate, on behalf of the Faculty Board,
 the results of courses taught and examinations held this academic session.
 The following candidate(s) have/have not satisfied the degree requirements
-of the Faculty and have/have not qualified for the award of an academic
-degree as stated below:
+of the Faculty and have/have not qualified for the award of a degree as follows:
 """
-        else:
-            certificate = site['faculties'][self.faccode][
-                self.depcode].certificates[self.certcode]
-            degree = degrees_dict.get(certificate.degree, '[undefined]')
-            text = """I present to Senate, on behalf of the Faculty Board,
-the results of courses taught and examinations held this academic session.
-The following candidate(s) have/have not satisfied the degree requirements
-of the Faculty and have/have not qualified for the award of a %s as stated
-below:
-""" % degree
         return text
 
@@ -59 +45 @@
 #"""
 
-    signatures = ['Head of Department', 'External Examiner', 'Dean of Faculty']
+    @property
+    def signatures(self):
+        site = grok.getSite()
+        dean = site['faculties'][self.faccode].officer_1
+        hod = site['faculties'][self.faccode][self.depcode].officer_1
+        examiner = site['faculties'][self.faccode][self.depcode].officer_2
+        if not dean:
+            dean = 'Dean of Faculty'
+        if not hod:
+            hod = 'Head of Department'
+        if not examiner:
+            examiner = 'External Examiner'
+        return [hod, examiner, dean]
 
 class CustomSessionResultsPresentationGenerator(

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)'
         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)'
         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)'
         report = CustomSessionResultsPresentation('fac1', 'dep1', 'CERT1', 2010, 100)
         result = report.create_pdf('JOB_ID')