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

Timestamp:

18 Jun 2018, 05:20:14 (7 years ago)

Author:

Henrik Bettermann

Message:

Add payment session filter to payment exporters.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/exportconfig.pt (modified) (2 diffs)
• export.py (modified) (3 diffs)
• tests/test_browser.py (modified) (5 diffs)

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

@@ -3437 +3437 @@
     def update(self, START=None, session=None, level=None, mode=None,
                payments_start=None, payments_end=None, ct_level=None, 
-               ct_session=None, paycat=None, exporter=None):
+               ct_session=None, paycat=None, paysession=None, exporter=None):
         self._set_session_values()
         self._set_level_values()
@@ -3476 +3476 @@
                                           payments_end = payments_end,
                                           paycat=paycat,
+                                          paysession=paysession,
                                           ct_level = ct_level,
                                           ct_session = ct_session,
@@ -3491 +3492 @@
                                           payments_end = payments_end,
                                           paycat=paycat,
+                                          paysession=paysession,
                                           ct_level = ct_level,
                                           ct_session = ct_session,)
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.logger.info(
-            '%s - exported: %s (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s), job_id=%s'
+            '%s - exported: %s (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s), job_id=%s'
             % (ob_class, exporter, session, level, mode, self.faccode,
             self.depcode, self.certcode, payments_start, payments_end,
-            ct_level, ct_session, paycat, job_id))
+            ct_level, ct_session, paycat, paysession, job_id))
         self.flash(_('Export started for students with') +
                    ' current_session=%s, current_level=%s, study_mode=%s' % (

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

@@ -81 +81 @@
   </span>
 
+  <span id="paysession" style="display: none;">
+    <br />
+    <label for="paysession" i18n:translate="">
+      Payment Sessions
+    </label>
+    <select name="paysession" class="form-control half">
+      <option tal:repeat="item view/sessions"
+              tal:attributes="value python:item[1]">
+        <span tal:replace="python: item[0]">2018/2019</span>
+      </option>
+    </select>
+    <br />
+  </span>
+
   <span id="ct_data" style="display: none;">
     <br />
@@ -120 +134 @@
           document.getElementById('paycat').style.display = 'block';
           document.getElementById('ct_data').style.display = 'none';
+          document.getElementById('paysession').style.display = 'block';
+
       } else if (document.getElementById('exporter').value == 'coursetickets')  {
           document.getElementById('ct_data').style.display = 'block';
           document.getElementById('payment_dates').style.display = 'none';
           document.getElementById('paycat').style.display = 'none';
+          document.getElementById('paysession').style.display = 'none';
+
       } else {
           document.getElementById('ct_data').style.display = 'none';
           document.getElementById('payment_dates').style.display = 'none';
           document.getElementById('paycat').style.display = 'none';
+          document.getElementById('paysession').style.display = 'none';
       }
   }

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

@@ -136 +136 @@
     p_end = kw.get('payments_end')
     paycat = kw.get('paycat')
+    paysession = kw.get('paysession')
     for student in students:
         for payment in student.get('payments', {}).values():
@@ -152 +153 @@
                 continue
             if paycat not in ('all', None) and payment.p_category != paycat:
+                continue
+            if paysession not in ('all', None) and payment.p_session != paysession:
                 continue
             payments.append(payment)
@@ -206 +209 @@
             del kw['payments_end']
             del kw['paycat']
+            del kw['paysession']
         except KeyError:
             pass
-        # Coursetickets can be filtered level and session.
+        # Coursetickets can be filtered by level and session.
         # These parameters are not keys of the catalog and must thus be
         # removed from kw.

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

@@ -3539 +3539 @@
             'zope.mgr - students.browser.DatacenterExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3635 +3635 @@
             'zope.mgr - students.browser.FacultiesExportJobContainerJobConfig '
             '- exported: bursary (2004, 100, ug_ft, None, None, None, '
-            '13/12/2012, 14/12/2012, all, all, schoolfee), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, schoolfee, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3696 +3696 @@
             'zope.mgr - students.browser.FacultyExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, fac1, None, None, '
-            '13/12/2012, 14/12/2012, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3748 +3748 @@
             'zope.mgr - students.browser.DepartmentExportJobContainerJobConfig '
             '- exported: students (2004, 100, ug_ft, None, dep1, None, '
-            '13/12/2012, 14/12/2012, all, all, all), job_id=%s'
+            '13/12/2012, 14/12/2012, all, all, all, all), job_id=%s'
             % job_id in logcontent
             )
@@ -3795 +3795 @@
             'zope.mgr - students.browser.CertificateExportJobContainerJobConfig '
             '- exported: students '
-            '(2004, 100, None, None, None, CERT1, , , None, None, None), '
+            '(2004, 100, None, None, None, CERT1, , , None, None, None, None), '
             'job_id=%s'
             % job_id in logcontent