Changeset 15424 for main/waeup.aaue/trunk

Timestamp:

24 May 2019, 10:13:52 (6 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• browser/viewlets.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/viewlets.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/browser/viewlets.py

@@ -20 +20 @@
 from waeup.kofa.interfaces import IKofaObject, academic_sessions_vocab
 from waeup.kofa.browser.viewlets import (
-    PrimaryNavTab, ManageActionButton, UpdateScoresActionButton)
+    PrimaryNavTab, ManageActionButton, UpdateScoresActionButton,
+    DownloadCSVFileActionButton, DownloadTicketOverviewActionButton)
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -70 +71 @@
         return _('Update session ${a} scores', mapping = {'a':st})
 
+
+class CustomDownloadCSVFileActionButton(DownloadCSVFileActionButton):
+    """ 'Download csv file' button for courses.
+    """
+
+    @property
+    def target_url(self):
+        if self.view.__name__ == 'edit_prev_scores':
+            return self.view.url(self.view.context, 'download_prev_scores')
+        return self.view.url(self.view.context, 'download_scores')
+
+
+class CustomDownloadTicketOverviewActionButton(
+    DownloadTicketOverviewActionButton):
+    """ 'Download ticket overview' button for courses.
+    """
+
+    @property
+    def target_url(self):
+        if self.view.__name__ == 'edit_prev_scores':
+            return ''
+        return self.view.url(self.view.context, 'coursetickets.pdf')
+

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

@@ -1280 +1280 @@
         # only orientation is different
         return students_utils.renderPDFCourseticketsOverview(
-            self, session, self.data(session), lecturers, '', 45, self.note)
+            self, 'coursetickets',
+            session, self.data(session), lecturers, '', 45, self.note)
 
 class DownloadPreviousSessionScoresView(DownloadScoresView):

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

@@ -29 +29 @@
     StudyCourseTranscriptActionButton,
     TranscriptSlipActionButton,
-    DownloadCSVFileActionButton,
-    DownloadTicketOverviewActionButton)
+    )
 from waeup.kofa.students.browser import StudyLevelDisplayFormPage
 
@@ -149 +148 @@
     grok.name('transcript_slip')
 
-class CustomDownloadCSVFileActionButton(DownloadCSVFileActionButton):
-    """ 'Download csv file' button for courses.
-    """
-
-    @property
-    def target_url(self):
-        if self.view.__name__ == 'edit_prev_scores':
-            return self.view.url(self.view.context, 'download_prev_scores')
-        return self.view.url(self.view.context, 'download_scores')
-
-class CustomDownloadTicketOverviewActionButton(
-    DownloadTicketOverviewActionButton):
-    """ 'Download ticket overview' button for courses.
-    """
-
-    @property
-    def target_url(self):
-        if self.view.__name__ == 'edit_prev_scores':
-            return ''
-        return self.view.url(self.view.context, 'coursetickets.pdf')
-
 class StudyLevelRepairActionButton(ManageActionButton):
     grok.order(2)