Changeset 14169 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

20 Sep 2016, 08:33:44 (8 years ago)

Author:

Henrik Bettermann

Message:

Add report purge button.

Location:

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

Files:

• reports/tests/test_student_statistics.py (modified) (2 diffs)
• student.py (modified) (2 diffs)

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

@@ -1 +1 @@
 # Tests for student related reports
 import os
+from datetime import datetime, timedelta
 from zc.async.testing import wait_for_result
 from zope.interface.verify import verifyClass, verifyObject
 from zope.component import getUtility
-from waeup.kofa.interfaces import IJobManager
+from waeup.kofa.interfaces import IJobManager, IKofaUtils
 from waeup.kofa.students.reports.student_statistics import (
     get_student_stats, StudentStatisticsReport, IStudentStatisticsReport)
@@ -207 +208 @@
             )
         return
+
+    def test_report_purge(self):
+        self.trigger_report_creation()
+        job_id = self.wait_for_report_job_completed()
+        self.browser.open('http://localhost/app/reports')
+        self.browser.getControl("Purge").click()
+        self.assertTrue('0 report(s) purged' in self.browser.contents)
+        job_id, gen_name, user = self.app['reports'].get_running_report_jobs(user_id=None)[0]
+        job = getUtility(IJobManager).get(job_id)
+        tz = getUtility(IKofaUtils).tzinfo
+        delta = timedelta(weeks=5)
+        setattr(job, '_begin_after', datetime.now(tz) - delta)
+        self.browser.getControl("Purge").click()
+        self.assertTrue('1 report(s) purged' in self.browser.contents)
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'main.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'INFO - zope.mgr - browser.reports.ReportsContainerPage - '
+            'report %s purged' % job_id in logcontent
+            )
+        return

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

@@ -37 +37 @@
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
     IKofaUtils, registration_states_vocab, IExtFileStore,
-    CREATED, ADMITTED, CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
+    CREATED, ADMITTED, CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING,
+    GRADUATED)
 from waeup.kofa.students.accommodation import StudentAccommodation
 from waeup.kofa.students.interfaces import (
@@ -218 +219 @@
     @property
     def before_payment(self):
-        non_fresh_states = (PAID, REGISTERED, VALIDATED, RETURNING, )
+        non_fresh_states = (PAID, REGISTERED, VALIDATED, RETURNING, GRADUATED)
         if self.is_fresh and self.state not in non_fresh_states:
             return True