Changeset 9023 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

19 Jul 2012, 10:32:40 (12 years ago)

Author:

Henrik Bettermann

Message:

Give access to processed (finished) import files.

Location:

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

Files:

• batchprocessing.txt (modified) (1 diff)
• pages.py (modified) (2 diffs)
• static/actionicon_finished.png (added)
• templates/datacenterfinishedpage.pt (added)
• templates/datacenterpage.pt (modified) (1 diff)
• viewlets.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/batchprocessing.txt

@@ -619 +619 @@
     'users_zope.mgr.create.finished.csv', 'users_zope.mgr.csv']
 
+Processed (finished) Files
+==========================
+
+    >>> browser.open('http://localhost/app/datacenter/processed')
+    >>> '<a href="download?filename=finished/certificates_zope.mgr.csv">' in browser.contents
+    True
 
 Log Files

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

@@ -810 +810 @@
         return
 
+class DatacenterFinishedPage(KofaEditFormPage):
+    grok.context(IDataCenter)
+    grok.name('processed')
+    grok.require('waeup.manageDataCenter')
+    label = _(u'Processed Files')
+    pnav = 0
+
+    def update(self):
+        datatable.need()
+        return super(DatacenterFinishedPage, self).update()
+
 class DatacenterUploadPage(KofaPage):
     grok.context(IDataCenter)
@@ -898 +909 @@
 
     def getFiles(self):
-        files = self.context.getFiles(sort='date')
+        files = self.context.getPendingFiles(sort='date')
         for file in files:
             name = file.name

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterpage.pt

@@ -21 +21 @@
       </thead>
       <tbody>
-        <tr tal:repeat="file context/getFiles" class="gradeC">
+        <tr tal:repeat="file context/getPendingFiles" class="gradeC">
           <td>
             <input type="checkbox" name="val_id"

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

@@ -386 +386 @@
     grok.require('waeup.manageDataCenter')
     text = _('Edit settings')
+    grok.order(1)
 
 class ManageFacultiesContainerActionButton(ManageActionButton):
@@ -458 +459 @@
     text = _('Edit certificate course')
 
-#
-# Add actions...
-#
-
 class AddUserActionButton(AddActionButton):
     grok.require('waeup.manageUsers')
@@ -468 +465 @@
     text = _('Add user')
 
-#
-# Actions with a 'browse' icon...
-#
-class BrowseActionButton(ActionButton):
-    grok.baseclass()
-    grok.context(IKofaObject)
-    grok.template('actionbutton')
-    grok.viewletmanager(ActionBar)
+class BrowseDatacenterLogs(ActionButton):
+    grok.context(IDataCenter)
     grok.require('waeup.manageDataCenter')
-    icon = 'actionicon_manage.png' # File must exist in static/
-    target = '@@show' # link to this viewname.
-    text = _('Show logs') # Text to display on the button
-
-class BrowseDatacenterLogs(BrowseActionButton):
-    grok.context(IDataCenter)
     grok.view(DatacenterPage)
-    grok.order(4)
+    grok.order(2)
     icon = 'actionicon_info.png'
     target = '@@logs'
     text = _('Show logs')
 
-#
-# Misc. buttons...
-#
+class UploadCSVButton(ActionButton):
+    grok.context(IDataCenter)
+    grok.view(DatacenterPage)
+    grok.require('waeup.manageDataCenter')
+    grok.order(3)
+    icon = 'actionicon_up.png'
+    target = '@@upload'
+    text = _('Upload CSV file')
+
 class BatchOpButton(ActionButton):
     grok.context(IDataCenter)
     grok.view(DatacenterPage)
     grok.require('waeup.importData')
-    grok.order(6)
+    grok.order(4)
     icon = 'actionicon_gear.png'
     target = '@@import1'
     text = _('Batch processing')
 
-class UploadCSVButton(ActionButton):
+class ExportCSVButton(ActionButton):
     grok.context(IDataCenter)
     grok.view(DatacenterPage)
     grok.require('waeup.manageDataCenter')
     grok.order(5)
-    icon = 'actionicon_up.png'
-    target = '@@upload'
-    text = _('Upload CSV file')
-
-class ExportCSVButton(ActionButton):
-    grok.context(IDataCenter)
-    grok.view(DatacenterPage)
-    grok.require('waeup.manageDataCenter')
-    grok.order(7)
     icon = 'actionicon_down.png'
     target = '@@export'
     text = _('Export CSV file')
+
+class BrowseFinishedFiles(ActionButton):
+    grok.context(IDataCenter)
+    grok.require('waeup.manageDataCenter')
+    grok.view(DatacenterPage)
+    grok.order(6)
+    icon = 'actionicon_finished.png'
+    target = '@@processed'
+    text = _('Processed Files')
 
 #