Changeset 10256 for main/waeup.kofa/trunk/src

Timestamp:

30 May 2013, 18:02:31 (12 years ago)

Author:

Henrik Bettermann

Message:

Test if the transcript pdf slip can be opened.

Add date_of_birth to base data.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (4 diffs)
• tests/test_browser.py (modified) (3 diffs)
• utils.py (modified) (4 diffs)

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

@@ -668 +668 @@
     omit_fields = (
         'password', 'suspended', 'phone',
-        'adm_code', 'suspended_comment')
+        'adm_code', 'suspended_comment',
+        'date_of_birth')
 
     @property
@@ -1223 +1224 @@
     prefix = 'form'
     omit_fields = (
-        'password', 'suspended', 'phone',
+        'password', 'suspended', 'phone', 'date_of_birth',
         'adm_code', 'sex', 'suspended_comment')
 
@@ -1773 +1774 @@
     note = None
     omit_fields = (
-        'password', 'suspended', 'phone',
+        'password', 'suspended', 'phone', 'date_of_birth',
         'adm_code', 'sex', 'suspended_comment')
 
@@ -2019 +2020 @@
     prefix = 'form'
     omit_fields = (
-        'password', 'suspended', 'phone', 'adm_code', 'suspended_comment')
+        'password', 'suspended', 'phone', 'adm_code',
+        'suspended_comment', 'date_of_birth')
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1834 +1834 @@
         self.assertEqual(td[0][0]['level'].level, 100)
         self.assertEqual(td[0][0]['level'].level_session, 2005)
-        self.assertEqual(td[0][0]['tickets_1'][0].code, 'COURSE1')
-        self.assertEqual(td[0][0]['tickets_1'][1].code, 'ANYCODE')
+        self.assertEqual(td[0][0]['tickets_1'][0].code, 'ANYCODE')
+        self.assertEqual(td[0][0]['tickets_1'][1].code, 'COURSE1')
         self.assertEqual(td[1], 3.57)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -1841 +1841 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertTrue('Transcript' in self.browser.contents)
+        # Officers can open the pdf transcript
+        self.browser.open(self.student_path + '/studycourse/transcript.pdf')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
 
 class StudentUITests(StudentsFullSetup):
@@ -2194 +2198 @@
         self.assertTrue('Course list has been registered' in self.browser.contents)
         self.assertEqual(self.student.state, 'courses registered')
+        # Students can open the pdf transcript
+        self.browser.open(self.student_path + '/studycourse/transcript.pdf')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -38 +38 @@
     get_signature_tables)
 from waeup.kofa.browser.interfaces import IPDFCreator
+from waeup.kofa.utils.helpers import to_timezone
 
 SLIP_STYLE = [
@@ -174 +175 @@
             entry_session = academic_sessions_vocab.getTerm(entry_session).title
             f_text = formatted_text(entry_session)
+            f_text = Paragraph(f_text, ENTRY1_STYLE)
+            data_right.append([f_label,f_text])
+        if not 'date_of_birth' in omit_fields:
+            f_label = _('Date of Birth: ')
+            f_label = Paragraph(f_label, ENTRY1_STYLE)
+            date_of_birth = studentview.context.date_of_birth
+            tz = getUtility(IKofaUtils).tzinfo
+            date_of_birth = to_timezone(date_of_birth, tz)
+            if date_of_birth is not None:
+                date_of_birth = date_of_birth.strftime("%d/%m/%Y")
+            f_text = formatted_text(date_of_birth)
             f_text = Paragraph(f_text, ENTRY1_STYLE)
             data_right.append([f_label,f_text])
@@ -731 +743 @@
         f_label = _('Entry Session:')
         f_label = Paragraph(f_label, ENTRY1_STYLE)
-        f_text = formatted_text(view.session_dict[view.context.entry_session])
+        f_text = formatted_text(
+            view.session_dict.get(view.context.entry_session))
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -737 +750 @@
         f_label = _('Entry Mode:')
         f_label = Paragraph(f_label, ENTRY1_STYLE)
-        f_text = formatted_text(view.studymode_dict[view.context.entry_mode])
+        f_text = formatted_text(view.studymode_dict.get(
+            view.context.entry_mode))
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])