Changeset 13218 for main/waeup.kofa/trunk

Timestamp:

24 Aug 2015, 08:44:35 (9 years ago)

Author:

Henrik Bettermann

Message:

Add UI components to purge applicants containers.

Location:

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

Files:

• applicants/browser.py (modified) (3 diffs)
• applicants/browser_templates/prefillcontainer.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/prefill_container.pt)
• applicants/browser_templates/purgecontainer.pt (added)
• applicants/interfaces.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (2 diffs)
• applicants/viewlets.py (modified) (3 diffs)
• documents/browser.py (modified) (1 diff)

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

@@ -477 +477 @@
 
 class ApplicantsContainerPrefillFormPage(KofaAddFormPage):
-    """Add-form to pre-fill applicants containers.
+    """Form to pre-fill applicants containers.
     """
     grok.context(IApplicantsContainer)
     grok.require('waeup.manageApplication')
     grok.name('prefill')
-    grok.template('prefill_container')
+    grok.template('prefillcontainer')
     label = _('Pre-fill container')
     pnav = 3
@@ -497 +497 @@
 
     @action(_('Pre-fill now'), style='primary')
-    def addApplicants(self, **data):
+    def addApplicants(self):
         form = self.request.form
         if 'number' in form and form['number']:
@@ -506 +506 @@
         self.flash(_('%s application records created.' % number))
         self.context.writeLogMessage(self, '%s applicants created' % (number))
+        self.redirect(self.url(self.context, 'index'))
+        return
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+class ApplicantsContainerPurgeFormPage(KofaEditFormPage):
+    """Form to pre-fill applicants containers.
+    """
+    grok.context(IApplicantsContainer)
+    grok.require('waeup.manageApplication')
+    grok.name('purge')
+    grok.template('purgecontainer')
+    label = _('Purge container')
+    pnav = 3
+    doclink = DOCLINK + '/applicants.html'
+
+    @action(_('Remove initialized records'), style='primary')
+    def purgeInitialized(self):
+        form = self.request.form
+        purged = 0
+        keys = [key for key in self.context.keys()]
+        for key in keys:
+            if self.context[key].state == 'initialized':
+                del self.context[key]
+                purged += 1
+        self.flash(_('%s application records purged.' % purged))
+        self.context.writeLogMessage(self, '%s applicants purged' % (purged))
         self.redirect(self.url(self.context, 'index'))
         return

main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py

@@ -333 +333 @@
     translated_state = Attribute('Real name of the application state')
     special = Attribute('True if special application')
-    application_number = Attribute('The key under which the record is stored')
 
     application_date = Attribute('UTC datetime of submission, used for export only')

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

@@ -467 +467 @@
         return
 
-    def test_prefill_container(self):
+    def test_prefill_purge_container(self):
         # Managers can pre-fill containers in create mode
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -500 +500 @@
             {'not admitted': 0, 'started': 0, 'created': 0,
             'admitted': 0, 'submitted': 0, 'initialized': 1, 'paid': 0})
+        # Container can be purged
+        self.browser.open(self.container_manage_path)
+        self.browser.getLink("Purge").click()
+        self.browser.getControl("Remove").click()
+        self.assertTrue('11 application records purged' in self.browser.contents)
+        self.assertEqual(self.applicantscontainer.counts[0], 0)
+        self.assertEqual(self.applicantscontainer.counts[1], 0)
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -116 +116 @@
     target = 'addapplicant'
 
-class ApplicantsContainerPrefillActionButton(AddActionButton):
+class ApplicantsContainerPrefillActionButton(ManageActionButton):
     grok.order(2)
     grok.context(IApplicantsContainer)
@@ -125 +125 @@
     target = 'prefill'
 
+class ApplicantsContainerPurgeActionButton(ManageActionButton):
+    grok.order(3)
+    grok.context(IApplicantsContainer)
+    grok.view(ApplicantsContainerManageFormPage)
+    grok.require('waeup.manageApplication')
+    icon = 'actionicon_sweep.png'
+    text = _('Purge container')
+    target = 'purge'
+
 class ApplicantsContainerStatisticsActionButton(ManageActionButton):
-    grok.order(3)
+    grok.order(4)
     grok.context(IApplicantsContainer)
     grok.view(ApplicantsContainerManageFormPage)
@@ -136 +145 @@
 class ApplicantsContainerStatisticsActionButton2(
         ApplicantsContainerStatisticsActionButton):
-    grok.order(4)
+    grok.order(5)
     grok.view(ApplicantsContainerPage)
 

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

@@ -21 +21 @@
 import sys
 import grok
-import pytz
 from urllib import urlencode
 from datetime import datetime