Changeset 9637

Timestamp:

15 Nov 2012, 14:25:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Add viewlets for reports.py

Add permission to roles.

Set label attribbute of views.

Location:

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

Files:

• accesscodes/browser.py (modified) (1 diff)
• browser/breadcrumbs.py (modified) (2 diffs)
• browser/reports.py (modified) (3 diffs)
• browser/viewlets.py (modified) (3 diffs)
• permissions.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/reports.py (modified) (1 diff)

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

@@ -257 +257 @@
     """Link in upper left box to access code management.
     """
-    grok.order(4)
+    grok.order(5)
     grok.require('waeup.manageACBatches')
 

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

@@ -30 +30 @@
     IUniversity, IFacultiesContainer, IUsersContainer, IDataCenter, IFaculty,
     IDepartment, ICourse, ICertificate, ICoursesContainer, ICertificateCourse,
-    ICertificatesContainer,
+    ICertificatesContainer
     )
+from waeup.kofa.reports import IReportsContainer
 
 class Breadcrumb(grok.Adapter):
@@ -157 +158 @@
     grok.context(IDataCenter)
     title = _(u'Data Center')
+    parent_viewname = 'administration'
+
+class ReportsBreadcrumb(Breadcrumb):
+    """A breadcrumb for reports.
+    """
+    grok.context(IReportsContainer)
+    title = _(u'Reports')
     parent_viewname = 'administration'
 

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

@@ -22 +22 @@
 from zope.location.location import located
 from waeup.kofa.interfaces import IJobManager
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.browser.layout import KofaPage
 from waeup.kofa.browser.resources import tabs
@@ -35 +36 @@
     grok.context(IReportsContainer)
     grok.require('waeup.manageReports')
+    label = _('Reports')
 
     def _report_url(self, job_id):
@@ -86 +88 @@
     grok.context(IReportsContainer)
     grok.require('waeup.manageReports')
+    label = _('Create report')
 
     def update(self, START_GENERATOR=None, generator=None):

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

@@ -324 +324 @@
     """A link to portal configuration.
     """
-    grok.order(2)
+    grok.order(1)
     grok.require('waeup.managePortalConfiguration')
 
@@ -347 +347 @@
     link = u'datacenter'
     text = _(u'Data Center')
+
+class ManageReports(ManageLink):
+    """A link to reports, placed in upper left box.
+    """
+    grok.order(4)
+    grok.require('waeup.manageReports')
+
+    link = u'reports'
+    text = _(u'Reports')
 
 class MyPreferences(ManageLink):
@@ -658 +667 @@
     link_title = _('Data Center')
     target_viewname = 'datacenter'
+
+class AdminTaskReports(AdminTask):
+    """Entry on administration page that link to datacenter.
+    """
+    grok.order(3)
+    grok.require('waeup.manageReports')
+
+    link_title = _('Reports')
+    target_viewname = 'reports'
 
 # The SubobjectLister and its viewlets below are not used in Kofa.

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -225 +225 @@
                      'waeup.viewHostels', 'waeup.manageHostels',
                      'waeup.editUser',
-                     'waeup.loginAsStudent'
+                     'waeup.loginAsStudent',
+                     'waeup.manageReports',
                      )
 
@@ -252 +253 @@
                      'waeup.viewHostels', 'waeup.manageHostels',
                      #'waeup.editUser',
-                     #'waeup.loginAsStudent'
+                     #'waeup.loginAsStudent',
+                     'waeup.manageReports',
                      )
 

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

@@ -2111 +2111 @@
                 self.flash(_('You are not the owner of this access code.'))
                 return
-        if self.context.student.state == CLEARED:
-            IWorkflowInfo(self.context.student).fireTransition(
-                'pay_first_school_fee')
-        elif self.context.student.state == RETURNING:
-            IWorkflowInfo(self.context.student).fireTransition(
-                'pay_school_fee')
-        elif self.context.student.state == PAID:
-            IWorkflowInfo(self.context.student).fireTransition(
-                'pay_pg_fee')
+        try:
+            if self.context.student.state == CLEARED:
+                IWorkflowInfo(self.context.student).fireTransition(
+                    'pay_first_school_fee')
+            elif self.context.student.state == RETURNING:
+                IWorkflowInfo(self.context.student).fireTransition(
+                    'pay_school_fee')
+            elif self.context.student.state == PAID:
+                IWorkflowInfo(self.context.student).fireTransition(
+                    'pay_pg_fee')
+        except ConstraintNotSatisfied:
+            self.flash(_('An error occurred, please contact the system administrator.'))
+            return
         self.flash(_('Session started.'))
         self.redirect(self.url(self.context))

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

@@ -173 +173 @@
     grok.require('waeup.manageReports')
 
+    label = _('Create students report')
+
     @property
     def generator_name(self):