Changeset 11730 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

4 Jul 2014, 07:46:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Filter payment ticket data exports by specifying the payment_date period.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (4 diffs)

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

@@ -3176 +3176 @@
 
     def update(self, START=None, session=None, level=None, mode=None,
+               payments_start=None, payments_end=None,
                exporter=None):
         self._set_session_values()
@@ -3183 +3184 @@
         if START is None:
             return
+        if payments_start or payments_end:
+            date_format = '%d/%m/%Y'
+            try:
+                dummy = datetime.strptime(payments_start, date_format)
+                dummy = datetime.strptime(payments_end, date_format)
+            except ValueError:
+                self.flash(_('Payment dates do not match format d/m/Y.'),
+                           type="danger")
+                return
         if session == 'all':
             session=None
@@ -3189 +3199 @@
         if mode == 'all':
             mode = None
+        if payments_start == '':
+            payments_start = None
+        if payments_end == '':
+            payments_end = None
         if (mode, level, session,
             self.depcode, self.certcode) == (None, None, None, None, None):
             # Export all students including those without certificate
             job_id = self.context.start_export_job(exporter,
-                                          self.request.principal.id)
+                                          self.request.principal.id,
+                                          payments_start = payments_start,
+                                          payments_end = payments_end)
         else:
             job_id = self.context.start_export_job(exporter,
@@ -3201 +3217 @@
                                           current_mode=mode,
                                           depcode=self.depcode,
-                                          certcode=self.certcode)
+                                          certcode=self.certcode,
+                                          payments_start = payments_start,
+                                          payments_end = payments_end)
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.logger.info(
-            '%s - exported: %s (%s, %s, %s, %s, %s), job_id=%s'
+            '%s - exported: %s (%s, %s, %s, %s, %s, %s, %s), job_id=%s'
             % (ob_class, exporter, session, level, mode, self.depcode,
-            self.certcode, job_id))
+            self.certcode, payments_start, payments_end, job_id))
         self.flash(_('Export started for students with') +
                    ' current_session=%s, current_level=%s, study_mode=%s' % (