From 1a8550995beb975e427128e88ba6adb2b94202f7 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Mon, 7 Jul 2014 12:41:58 +0200
Subject: [PATCH] allow editing of workitems on report

---
 expert/browser/results.pt | 11 +++++++++++
 expert/field.py           | 15 ++++++++++++++-
 organize/work/README.txt  |  2 +-
 organize/work/report.py   |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/expert/browser/results.pt b/expert/browser/results.pt
index e64f96f..748dfc0 100644
--- a/expert/browser/results.pt
+++ b/expert/browser/results.pt
@@ -80,6 +80,17 @@
 </metal:state>
 
 
+<metal:state define-macro="workitem_state">
+  <tal:column define="value python:col.getDisplayValue(row)"
+              condition="value">
+    <tal:action repeat="action value/actions">
+      <metal:action tal:condition="action"
+                    use-macro="action/macro" />
+    </tal:action>
+  </tal:column>
+</metal:state>
+
+
 <metal:target define-macro="target">
   <tal:column define="value python:col.getDisplayValue(row)">
     <a tal:omit-tag="python:
diff --git a/expert/field.py b/expert/field.py
index f744776..9448d0f 100644
--- a/expert/field.py
+++ b/expert/field.py
@@ -32,6 +32,7 @@ from cybertools.util.date import timeStamp2Date
 from cybertools.util.format import formatDate
 from loops.common import baseObject
 from loops.expert.report import ReportInstance
+from loops.organize.work.browser import WorkItemDetails
 from loops import util
 
 
@@ -109,7 +110,7 @@ class DateField(Field):
 
 class StateField(Field):
 
-    statesDefinition = 'workItemStates'
+    statesDefinition = None
     renderer = 'state'
 
     def getDisplayValue(self, row):
@@ -126,6 +127,18 @@ class StateField(Field):
                     icon='cybertools.icons/' + icon)
 
 
+class WorkItemStateField(Field):
+
+    statesDefinition = 'workItemStates'
+    renderer = 'workitem_state'
+
+    def getDisplayValue(self, row):
+        if row.context is None:
+            return None
+        details = WorkItemDetails(row.parent.context.view, row.context)
+        return dict(actions=details.actions())
+
+
 class VocabularyField(Field):
 
     vocabulary = None
diff --git a/organize/work/README.txt b/organize/work/README.txt
index bc9b5d4..eeff6bf 100644
--- a/organize/work/README.txt
+++ b/organize/work/README.txt
@@ -229,7 +229,7 @@ The user interface is a ReportConceptView subclass that is directly associated w
   08/12/28 19:00 20:15
     {'url': '.../home/.36', 'title': u'loops Development'}
     {'url': '.../home/.33', 'title': u'john'}  01:15 00:15
-    {'icon': 'cybertools.icons/ledgreen.png', 'title': u'finished'}
+    {'actions': [...]}
 
   >>> results.totals.data
   {'effort': 900}
diff --git a/organize/work/report.py b/organize/work/report.py
index 8ccc515..0691da5 100644
--- a/organize/work/report.py
+++ b/organize/work/report.py
@@ -37,6 +37,7 @@ from loops.expert.field import Field, TargetField, DateField, StateField, \
                             TextField, HtmlTextField, UrlField
 from loops.expert.field import SubReport, SubReportField
 from loops.expert.field import TrackDateField, TrackTimeField
+from loops.expert.field import WorkItemStateField
 from loops.expert.report import ReportInstance
 from loops import util
 
@@ -122,7 +123,7 @@ duration = DurationField('duration', u'Duration',
 effort = DurationField('effort', u'Effort',
                 description=u'The effort of the work.',
                 executionSteps=['output', 'totals'])
-state = StateField('state', u'State',
+state = WorkItemStateField('state', u'State',
                 description=u'The state of the work.',
                 cssClass='center',
                 statesDefinition='workItemStates',