Changeset 16412

Timestamp:

10 Mar 2021, 12:25:31 (4 years ago)

Author:

Henrik Bettermann

Message:

Allow lecturers to export all course tickets, not only those of current academic session.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (2 diffs)
• src/waeup/kofa/students/export.py (modified) (3 diffs)
• src/waeup/kofa/students/student.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Allow lecturers to export all course tickets, not only
+  those of current academic session.
 
 * Disable clearance request button if not in state 'clearance started'.

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

@@ -4429 +4429 @@
         return
 
+    # Disabled on 10/03/21
+    #def _set_session_values(self):
+    #    # We allow only current academic session
+    #    academic_session = grok.getSite()['configuration'].current_academic_session
+    #    if not academic_session:
+    #        self.sessions = []
+    #        return
+    #    x = academic_sessions_vocab.getTerm(academic_session)
+    #    self.sessions = [(x.title, x.token)]
+    #    return
+
     def _set_session_values(self):
-        # We allow only current academic session
-        academic_session = grok.getSite()['configuration'].current_academic_session
-        if not academic_session:
-            self.sessions = []
-            return
-        x = academic_sessions_vocab.getTerm(academic_session)
-        self.sessions = [(x.title, x.token)]
+        vocab_terms = academic_sessions_vocab.by_value.values()
+        self.sessions = sorted(
+            [(x.title, x.token) for x in vocab_terms], reverse=True)
+        self.sessions += [('All Sessions', 'all')]
         return
 
@@ -4449 +4457 @@
         self._set_mode_values()
         self._set_exporter_values()
-        if not self.sessions:
-            self.flash(
-                _('Academic session not set. '
-                  'Please contact the administrator.'),
-                type='danger')
-            self.redirect(self.url(self.context))
-            return
+        # Disabled on 10/03/21
+        #if not self.sessions:
+        #    self.flash(
+        #        _('Academic session not set. '
+        #          'Please contact the administrator.'),
+        #        type='danger')
+        #    self.redirect(self.url(self.context))
+        #    return
         if START is None:
             return

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

@@ -114 +114 @@
     """Get course tickets of `students`.
     Filter course tickets which belong to this course code and
-    which are editable by lecturers.
+    which are editable by lecturers. The latter requirement was disabled
+    on 10/03/21.
     """
     tickets = []
@@ -124 +125 @@
             if ticket.code != code:
                 continue
-            if not ticket.editable_by_lecturer:
-                continue
+            # Disabled on 10/03/21
+            #if not ticket.editable_by_lecturer:
+            #    continue
             if level not in ('all', None):
                 if level_obj.level in (10, 999, None)  \
@@ -545 +547 @@
     tickets catalog and exports those course tickets which belong to the
     given course code, meet level and session passed through at the
-    same time, and which are editable by lecturers. This exporter can only
-    be called at course level in the academic section.
+    same time, and which are editable by lecturers (disabled on 10/03/21).
+    This exporter can only be called at course level in the academic section.
     """
     grok.name('lecturer')

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

@@ -235 +235 @@
     @property
     def current_verdict(self):
-        level = getattr(
+        current_verdict = getattr(
             self.get('studycourse', None), 'current_verdict', None)
-        return level
+        return current_verdict
 
     @property

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

@@ -4520 +4520 @@
         self.browser.open(course1_path)
         self.browser.getLink("Export student data").click()
-        self.browser.getControl("Set export parameters").click()
-        self.assertTrue(
-            'Academic session not set. Please contact the administrator.'
-            in self.browser.contents)
-        self.app['configuration'].current_academic_session = 2004
+        # Disabled on 10/03/21
+        #self.browser.getControl("Set export parameters").click()
+        #self.assertTrue(
+        #    'Academic session not set. Please contact the administrator.'
+        #    in self.browser.contents)
+        #self.app['configuration'].current_academic_session = 2004
         self.browser.getControl("Set export parameters").click()
         self.browser.getControl(name="exporter").value = ['lecturer']