work in progress: configurable reports - basic interfaces and classes, example report (work_report)

browser/common.py

@@ -829,27 +829,6 @@ class SimpleTerms(object):
         return (token, self.terms[token])
 
 
-class AdapterTerms(SimpleTerms):
-    """ Allows the selection of a named adapter from a list of tuples
-        (name, adapter).
-
-        The adapter class may have a 'label' attribute for display.
-        The translation domain may be overridden by subclasses.
-    """
-
-    translate = _
-
-    def getTerm(self, value):
-        token, adapter = value
-        adapter = removeSecurityProxy(adapter)
-        label = getattr(adapter.__class__, 'label', token)
-        return SimpleTerm(token, token, self.translate(label))
-
-    def getValue(self, token):
-        # just store the name of the adapter
-        return (token, token)
-
-
 class LoopsTerms(object):
     """ Provide the ITerms interface, e.g. for usage in selection
         lists.

expert/README.txt

@@ -227,15 +227,15 @@ Reports
 
   >>> report = Report(None)
 
-  >>> from loops.expert.report import DefaultConceptReportInstance
+  >>> from loops.expert.report import IReportInstance, DefaultConceptReportInstance
   >>> component.provideAdapter(DefaultConceptReportInstance,
+  ...                          provides=IReportInstance,
   ...                          name='default_concept_report')
 
   >>> from loops.expert.report import ReportTypeSourceList
   >>> source = ReportTypeSourceList(report)
   >>> list(source)
-  [(u'default_concept_report',
+  [(u'default_concept_report', u'Default Concept Report')]
-    <loops.expert.report.DefaultConceptReportInstance object at ...>)]
 
 
 Fin de partie

expert/browser/configure.zcml

@@ -57,7 +57,7 @@
   <!-- reporting -->
 
   <zope:adapter
-        factory="loops.browser.common.AdapterTerms"
+        factory="loops.browser.common.SimpleTerms"
         for="loops.expert.report.ReportTypeSourceList
              zope.publisher.interfaces.browser.IBrowserRequest" />
 

expert/configure.zcml

@@ -22,13 +22,14 @@
            provides="loops.expert.report.IReport" trusted="True" />
   <class class="loops.expert.report.Report">
     <require permission="zope.View"
-             interface="loops.expert.report.IReport" />
+             interface="loops.expert.report.IReportSchema" />
     <require permission="zope.ManageContent"
-             set_schema="loops.expert.report.IReport" />
+             set_schema="loops.expert.report.IReportSchema" />
   </class>
 
   <adapter factory="loops.expert.report.DefaultConceptReportInstance"
            name="default_concept_report"
+           provides="loops.expert.report.IReportInstance"
            trusted="True" />
   <class class="loops.expert.report.DefaultConceptReportInstance">
     <require permission="zope.View"

organize/work/README.txt

@@ -180,6 +180,16 @@ So we use the PersonWorkItems view, assigning john to the query.
     'creator': '33'}>]
 
 
+Work Reports
+============
+
+  >>> from loops.organize.work.report import WorkReportInstance
+  >>> from loops.expert.report import IReportInstance
+  >>> component.provideAdapter(WorkReportInstance,
+  ...                          provides=IReportInstance,
+  ...                          name='work_report')
+
+
 Fin de partie
 =============
 

organize/work/configure.zcml

@@ -73,6 +73,19 @@
       class="loops.organize.work.browser.WorkItemInfo"
       permission="zope.View" />
 
+  <!-- reporting -->
+
+  <zope:adapter factory="loops.organize.work.report.WorkReportInstance"
+           name="work_report"
+           provides="loops.expert.report.IReportInstance"
+           trusted="True" />
+  <zope:class class="loops.organize.work.report.WorkReportInstance">
+    <require permission="zope.View"
+             interface="loops.expert.report.IReportInstance" />
+    <require permission="zope.ManageContent"
+             set_schema="loops.expert.report.IReportInstance" />
+  </zope:class>
+
   <!-- setup -->
 
   <zope:adapter factory="loops.organize.work.setup.SetupManager"