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

Timestamp:

29 Aug 2013, 15:12:04 (11 years ago)

Author:

Henrik Bettermann

Message:

Define _set_faccode_depcode_values method properly.

Tests will follow.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py (modified) (5 diffs)

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

@@ -158 +158 @@
     def generate(self, site, faccode=None, depcode=None,
                  session=None, level=None, author=None):
-        result = LevelReportReport(faccode=faccode, depcode=depcode,
-                                   session=session, level=level, author=author)
+        result = LevelReport(faccode=faccode, depcode=depcode,
+                             session=session, level=level, author=author)
         return result
 
@@ -192 +192 @@
         self._set_level_values()
         self._set_faccode_depcode_values()
-        #faccode = faccode_depcode.split('_')[0]
-        #depcode = faccode_depcode.split('_')[1]
         if CREATE and session:
             # create a new report job for students by session
+            faccode = faccode_depcode.split('_')[0]
+            depcode = faccode_depcode.split('_')[1]
             container = self.context.__parent__
             user_id = self.request.principal.id
@@ -208 +208 @@
             ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
             grok.getSite().logger.info(
-                '%s - report %s created: %s (session=%s, mode=%s)' % (
-                ob_class, job_id, self.context.title, session, mode))
+                '%s - report %s created: %s (faculty=%s, department=%s, session=%s, level=%s)' % (
+                ob_class, job_id, self.context.title, faccode, depcode, session, level))
             self.redirect(self.parent_url)
             return
@@ -225 +225 @@
 
     def _set_faccode_depcode_values(self):
-        # Not yet implemented
-        self.faccode_depcodes = None
-        return
-
+        faccode_depcodes = []
+        faculties = grok.getSite()['faculties']
+        for fac in faculties.values():
+            for dep in fac.values():
+                faccode_depcodes.append(
+                    ('%s (%s)' %(dep.longtitle(), fac.longtitle()),
+                     '%s_%s' %(fac.code, dep.code)))
+        self.faccode_depcodes = sorted(
+            faccode_depcodes, key=lambda value: value[0])
+        return
 
 class LevelReportPDFView(grok.View):
@@ -237 +243 @@
 
     def render(self):
-        filename = 'LevelReport_%s_%s_%s.pdf' % (
-            self.context.session, self.context.mode,
+        filename = 'LevelReport_%s_%s_%s_%s_%s.pdf' % (
+            self.context.faccode, self.context.depcode,
+            self.context.sessioncode, self.context.levelcode,
             self.context.creation_dt_string)
         filename = filename.replace(