Changeset 9023

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

Files:

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

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')
 
 #

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py

@@ -66 +66 @@
         return os.path.join(self.storage, 'deleted')
 
-    def getFiles(self, sort='name'):
+    def getPendingFiles(self, sort='name'):
         """Get a list of files stored in `storage`.
 
@@ -81 +81 @@
                 continue
             result.append(DataCenterFile(fullpath))
+        if sort == 'date':
+            # sort results in newest-first order...
+            result = sorted(result, key=lambda x: x.getTimeStamp(),
+                            reverse=True)
+        return result
+
+    def getFinishedFiles(self, sort='name'):
+        """Get a list of files stored in `finished` subfolder of `storage`.
+
+        Files are sorted by basename.
+        """
+        result = []
+        finished_dir = os.path.join(self.storage, 'finished')
+        if not os.path.exists(finished_dir):
+            return result
+        for filename in sorted(os.listdir(finished_dir)):
+            fullpath = os.path.join(finished_dir, filename)
+            if not os.path.isfile(fullpath):
+                continue
+            if not filename.endswith('.csv'):
+                continue
+            result.append(DataCenterFile(fullpath, 'finished'))
         if sort == 'date':
             # sort results in newest-first order...
@@ -300 +322 @@
     grok.implements(IDataCenterFile)
 
-    def __init__(self, context):
+    def __init__(self, context, folder_name=''):
         self.context = context
         self.name = os.path.basename(self.context)
+        self.rel_path = os.path.join(folder_name, self.name)
         self.size = self.getSize()
         self.uploaddate = self.getDate()

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.txt

@@ -83 +83 @@
 We can get a list of files stored in that location:
 
-    >>> mydatacenter.getFiles()
+    >>> mydatacenter.getPendingFiles()
     []
 
@@ -94 +94 @@
 Now we can find a file:
 
-    >>> mydatacenter.getFiles()
+    >>> mydatacenter.getPendingFiles()
     [<waeup.kofa.datacenter.DataCenterFile object at 0x...>]
 
@@ -102 +102 @@
 pages:
 
-    >>> datafile = mydatacenter.getFiles()[0]
+    >>> datafile = mydatacenter.getPendingFiles()[0]
     >>> datafile.getSize()
     '13 bytes'
@@ -272 +272 @@
 finished-subdirectory remain.
 
+
+We can get a list of imported files stored in the finished subfolder:
+
+    >>> mydatacenter.getFinishedFiles()
+    [<waeup.kofa.datacenter.DataCenterFile object at ...>, <waeup.kofa.datacenter.DataCenterFile object at ...>]
+
+    >>> datafile = mydatacenter.getFinishedFiles()[0]
+    >>> datafile.getSize()
+    '2 bytes'
+
+    >>> datafile.getDate() # Nearly current datetime...
+    '...'
+
+
 Clean up:
 

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

@@ -641 +641 @@
         )
 
-    def getFiles(sort='name'):
+    def getPendingFiles(sort='name'):
         """Get a list of files stored in `storage` sorted by basename.
         """
+
+    def getFinishedFiles(sort='name'):
+        """Get a list of files stored in `finished` subfolder of `storage`
+        sorted by basename.
+        """
+
     def setStoragePath(path, move=False, overwrite=False):
         """Set the path where to store files.