Changeset 10266 for main

Timestamp:

31 May 2013, 17:48:29 (12 years ago)

Author:

Henrik Bettermann

Message:

Define correct dictionaries. level_dict must include probation levels.

Add buttons for navigating to transcripts.

Add property attribute 'transcript_enabled' which eases defining conditions in custom packages.

Location:

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

Files:

• browser/static/actionicon_transcript.png (added)
• students/browser.py (modified) (5 diffs)
• students/browser_templates/studycoursemanagepage.pt (modified) (2 diffs)
• students/browser_templates/transcript.pt (modified) (1 diff)
• students/student.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• students/viewlets.py (modified) (2 diffs)

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

@@ -166 +166 @@
     return True
 
+def level_dict(studycourse):
+    portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+    level_dict = {}
+    studylevelsource = StudyLevelSource().factory
+    for code in studylevelsource.getValues(studycourse):
+        title = translate(studylevelsource.getTitle(studycourse, code),
+            'waeup.kofa', target_language=portal_language)
+        level_dict[code] = title
+    return level_dict
+
 class StudentsBreadcrumb(Breadcrumb):
     """A breadcrumb for the students container.
@@ -991 +1001 @@
 
     @property
-    def level_dict(self):
+    def level_dicts(self):
         studylevelsource = StudyLevelSource().factory
         for code in studylevelsource.getValues(self.context):
@@ -998 +1008 @@
 
     @property
-    def session_dict(self):
+    def session_dicts(self):
         yield(dict(code='', title='--'))
         for item in academic_sessions():
@@ -1058 +1068 @@
 
     def update(self):
+        if not self.context.student.transcript_enabled:
+            self.flash(_('You are not allowed to view the transcript.'))
+            self.redirect(self.url(self.context))
+            return
         super(StudyCourseTranscriptPage, self).update()
         self.semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
+        self.level_dict = level_dict(self.context)
         self.session_dict = dict(
             [(item[1], item[0]) for item in academic_sessions()])
-        self.course_levels = course_levels
         self.studymode_dict = getUtility(IKofaUtils).STUDY_MODES_DICT
         return
@@ -1087 +1101 @@
 
     def update(self):
+        if not self.context.student.transcript_enabled:
+            self.flash(_('You are not allowed to download the transcript.'))
+            self.redirect(self.url(self.context))
+            return
         super(ExportPDFTranscriptPage, self).update()
         self.semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
+        self.level_dict = level_dict(self.context)
         self.session_dict = dict(
             [(item[1], item[0]) for item in academic_sessions()])
-        self.course_levels = course_levels
         self.studymode_dict = getUtility(IKofaUtils).STUDY_MODES_DICT
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studycoursemanagepage.pt

@@ -71 +71 @@
         </span>
         <select id="addlevel" name="addlevel" class='span5'>
-          <option tal:attributes="value level/code" tal:repeat="level view/level_dict">
+          <option tal:attributes="value level/code" tal:repeat="level view/level_dicts">
             <span tal:replace="level/title">LEVELTITLE
           </span>
@@ -78 +78 @@
         &nbsp;&nbsp;<span i18n:translate="">in session</span>&nbsp;&nbsp;
         <select id="level_session" name="level_session" class='span3'>
-          <option tal:attributes="value session/code" tal:repeat="session view/session_dict">
+          <option tal:attributes="value session/code" tal:repeat="session view/session_dicts">
             <span tal:replace="session/title">LEVELSESSION
           </span>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcript.pt

@@ -46 +46 @@
                                       level['tickets_2'], level['tickets_3'])">
       <tr tal:repeat="ticket semester_tickets" class="gradeC">
-        <td tal:content="python: view.course_levels.getTerm(ticket.level).title">LEVEL</td>
+        <td tal:content="python: view.level_dict[ticket.level]">LEVEL</td>
         <td tal:content="python: view.session_dict[ticket.level_session]">SESSION</td>
         <td tal:content="python: view.semester_dict[ticket.semester]">SEMESTER</td>

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

@@ -232 +232 @@
         return False
 
+    @property
+    def transcript_enabled(self):
+        return True
+
     def transfer(self, certificate, current_session=None,
         current_level=None, current_verdict=None, previous_verdict=None):

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

@@ -2205 +2205 @@
         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')
+        # Students can view the transcript
+        self.browser.open(self.studycourse_path)
+        self.browser.getLink("Transcript").click()
+        self.browser.getLink("Academic Transcript").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')

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

@@ -216 +216 @@
     data = []
     style = getSampleStyleSheet()
-
     for level in levels_data:
         level_obj = level['level']
@@ -226 +225 @@
             view.session_dict[level_obj.level_session],
             trans(_('Level'), lang),
-            view.course_levels.getTerm(level_obj.level).title)
+            view.level_dict[level_obj.level])
         data.append(Paragraph(subheader, HEADING_STYLE))
         for element in tableheader:

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

@@ -45 +45 @@
     AccommodationManageFormPage, BedTicketDisplayFormPage,
     StudentClearanceEditFormPage, StudentPersonalEditFormPage,
-    PaymentsManageFormPage)
+    PaymentsManageFormPage, StudyCourseTranscriptPage)
 from waeup.kofa.students.interfaces import (
     IStudentsContainer, IStudent, IStudentStudyCourse, IStudentAccommodation,
@@ -341 +341 @@
     def target_url(self):
         if self.context.is_current:
+            return self.view.url(self.view.context, self.target)
+        return False
+
+class StudyCourseTranscriptActionButton(ManageActionButton):
+    grok.order(2)
+    grok.context(IStudentStudyCourse)
+    grok.view(StudyCourseDisplayFormPage)
+    grok.require('waeup.viewStudent')
+    text = _('Transcript')
+    target = 'transcript'
+    icon = 'actionicon_transcript.png'
+
+    @property
+    def target_url(self):
+        if self.context.student.transcript_enabled:
+            return self.view.url(self.view.context, self.target)
+        return False
+
+class TranscriptSlipActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudentStudyCourse)
+    grok.view(StudyCourseTranscriptPage)
+    grok.require('waeup.viewStudent')
+    text = _('Academic Transcript')
+    target = 'transcript.pdf'
+    icon = 'actionicon_pdf.png'
+
+    @property
+    def target_url(self):
+        if self.context.student.transcript_enabled:
             return self.view.url(self.view.context, self.target)
         return False