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

Timestamp:

19 Jul 2012, 17:33:30 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename buttons in datacenter.

Provide a table of available processors with available fields on DatacenterUploadPage? (work in progress).

Location:

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

Files:

• batchprocessing.txt (modified) (15 diffs)
• browser.txt (modified) (1 diff)
• pages.py (modified) (2 diffs)
• templates/datacenteruploadpage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (4 diffs)

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

@@ -75 +75 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('faculties.csv', 'rb').read())
@@ -84 +84 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'faculties_zope.mgr.csv', browser)
@@ -177 +177 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('departments.csv', 'rb').read())
@@ -186 +186 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'departments_zope.mgr.csv', browser)
@@ -242 +242 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('courses.csv', 'rb').read())
@@ -251 +251 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'courses_zope.mgr.csv', browser)
@@ -307 +307 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('certificates.csv', 'rb').read())
@@ -316 +316 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'certificates_zope.mgr.csv', browser)
@@ -373 +373 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('mycertcourses.csv', 'rb').read())
@@ -382 +382 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'mycertcourses_zope.mgr.csv', browser)
@@ -438 +438 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('users.csv', 'rb').read())
@@ -447 +447 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'users_zope.mgr.csv', browser)
@@ -510 +510 @@
 
     >>> import cStringIO
-    >>> browser.getLink('Upload CSV file').click()
+    >>> browser.getLink('Upload data').click()
     >>> filecontents = cStringIO.StringIO(
     ...   open('newfaculties.csv', 'rb').read())
@@ -519 +519 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'newfaculties_zope.mgr.csv', browser)
@@ -581 +581 @@
 
     >>> browser.open('http://localhost/app/datacenter')
-    >>> browser.getLink('Batch processing').click()
+    >>> browser.getLink('Process data').click()
     >>> button = lookup_submit_value(
     ...   'select', 'newfaculties_zope.mgr.create.pending.csv', browser)

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

@@ -1218 +1218 @@
 page:
 
-  >>> browser.getLink('Upload CSV file').click()
+  >>> browser.getLink('Upload data').click()
 
 and enter the appropriate data in the form:

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

@@ -825 +825 @@
     grok.name('upload')
     grok.require('waeup.manageDataCenter')
-    label = _(u'Upload file')
+    label = _(u'Upload portal data as CSV file')
     pnav = 0
     upload_button =_(u'Upload')
@@ -875 +875 @@
         base, ext = os.path.splitext(filename)
         return '%s_%s%s' % (base, filtered_username, ext.lower())
+
+    def getImporters(self):
+        importers = getAllUtilitiesRegisteredFor(IBatchProcessor)
+        importers = sorted(
+            [dict(title=x.name, name=x.util_name, fields=x.available_fields)
+            for x in importers], key=lambda k: k['title'])
+        return importers
 
 class FileDownloadView(UtilityView, grok.View):

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

@@ -9 +9 @@
   </div>
 </form>
+
+<br /><br />
+
+<h2 i18n:translate="">Available Processors (Importers)</h2>
+
+<table i18n:domain="waeup.kofa">
+  <thead>
+    <tr>
+      <th i18n:translate="">Processor</th>
+      <th i18n:translate="">Available Fields</th>
+    </tr>
+  </thead>
+  <tr tal:repeat="importer view/getImporters">
+    <td tal:content="importer/title"></td>
+    <td>
+        <span tal:repeat="field python:sorted(importer['fields'])">
+            <span tal:replace="field"></span>,
+        </span>
+    </td>
+  </tr>
+</table>

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

@@ -122 +122 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.datacenter_path)
-        self.browser.getLink("Upload CSV file").click()
+        self.browser.getLink("Upload data").click()
         file = open(SAMPLE_FILE)
         ctrl = self.browser.getControl(name='uploadfile:file')
@@ -154 +154 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.datacenter_path)
-        self.browser.getLink("Export CSV file").click()
+        self.browser.getLink("Export data").click()
         self.browser.getControl(name="exporter").value = ['faculties']
         self.browser.getControl("Download").click()

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

@@ -481 +481 @@
     icon = 'actionicon_up.png'
     target = '@@upload'
-    text = _('Upload CSV file')
+    text = _('Upload data')
 
 class BatchOpButton(ActionButton):
@@ -490 +490 @@
     icon = 'actionicon_gear.png'
     target = '@@import1'
-    text = _('Batch processing')
+    text = _('Process data')
 
 class ExportCSVButton(ActionButton):
@@ -499 +499 @@
     icon = 'actionicon_down.png'
     target = '@@export'
-    text = _('Export CSV file')
+    text = _('Export data')
 
 class BrowseFinishedFiles(ActionButton):
@@ -508 +508 @@
     icon = 'actionicon_finished.png'
     target = '@@processed'
-    text = _('Processed Files')
+    text = _('View processed files')
 
 #