diff --git a/organize/work/README.txt b/organize/work/README.txt index c33bbc6..fb58f72 100644 --- a/organize/work/README.txt +++ b/organize/work/README.txt @@ -99,16 +99,18 @@ by calling the form controller's update method 'created': ..., 'creator': '33', 'assigned': ..., 'start': 1230487200, 'duration': 4500, 'effort': 900}>] - >>> from loops.organize.work.browser import WorkItemView + >>> from loops.organize.work.browser import WorkItemView, WorkItemsView >>> wi01 = workItems['0000001'] >>> view = WorkItemView(wi01, TestRequest()) >>> view.taskUrl 'http://127.0.0.1/loops/concepts/loops_dev/@@SelectedManagementView.html' + >>> itemsView = WorkItemsView(home, request) + >>> from loops.organize.work.browser import WorkItemDetails - >>> view = WorkItemDetails(nodeView, wi01) - >>> view.start, view.end - (u'08/12/28 19:00', u'20:15') + >>> view = WorkItemDetails(itemsView, wi01) + >>> view.day, view.start, view.end + (u'08/12/28', u'19:00', u'20:15') Fin de partie diff --git a/organize/work/browser.py b/organize/work/browser.py index fa871db..33cdc32 100644 --- a/organize/work/browser.py +++ b/organize/work/browser.py @@ -52,7 +52,7 @@ class BaseWorkItemsView(object): columns = set(['Task', 'User', 'Title', 'Start', 'End', 'Duration']) - lastMonth = None + lastMonth = lastDay = None def __init__(self, context, request): self.context = context @@ -73,7 +73,7 @@ class WorkItemsView(BaseWorkItemsView, NodeView): """ Standard view for showing work items for a node's target. """ - columns = set(['User', 'Title', 'Start', 'End', 'Duration']) + columns = set(['User', 'Title', 'Day', 'Start', 'End', 'Duration']) @Lazy def allWorkItems(self): @@ -91,7 +91,7 @@ class UserWorkItems(BaseWorkItemsView, ConceptView): """ A query view showing work items for a person, the query's parent. """ - columns = set(['Task', 'Title', 'Start', 'End', 'Duration']) + columns = set(['Task', 'Title', 'Day', 'Start', 'End', 'Duration']) @property def macro(self): @@ -121,7 +121,7 @@ class WorkItemDetails(TrackDetails): @Lazy def start(self): - return self.formatTimeStamp(self.track.start) + return self.formatTimeStamp(self.track.start, 'time') @Lazy def end(self): diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt index 08a49af..4210c93 100644 --- a/organize/work/work_macros.pt +++ b/organize/work/work_macros.pt @@ -14,7 +14,7 @@ + ('Day', 'Start', 'End', 'Duration', 'Task', 'User', 'Title')"> @@ -27,8 +27,9 @@ tal:content="row/month">2009-01 - - + + +
Task
2007-03-302007-03-302007-03-3017:3020:00 2:30