From 96850f110ca02a249912d7bc5e044c6287afe05e Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 4 Aug 2012 18:19:11 +0200 Subject: [PATCH] indicator attribute depending on work item type: background color for event --- browser/skin/lobo/lobo.css | 6 ++++++ organize/work/browser.py | 13 +++++++++---- organize/work/work_macros.pt | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css index 3ce5c26..693b38b 100644 --- a/browser/skin/lobo/lobo.css +++ b/browser/skin/lobo/lobo.css @@ -510,6 +510,12 @@ img.notselected { text-align: right; } +/* work */ + +.work_event { + background-color: #f3f3ff; +} + /* lobo layout-specific classes */ .legend { diff --git a/organize/work/browser.py b/organize/work/browser.py index b10a057..3d606f9 100644 --- a/organize/work/browser.py +++ b/organize/work/browser.py @@ -63,6 +63,10 @@ class WorkItemDetails(TrackDetails): """ Render a single work item. """ + @Lazy + def workItemType(self): + return self.track.getWorkItemType() + @Lazy def description(self): return self.track.description @@ -81,11 +85,13 @@ class WorkItemDetails(TrackDetails): @Lazy def start(self): - return self.formatTimeStamp(self.track.start, 'time') + result = self.formatTimeStamp(self.track.start, 'time') + return result != '00:00' and result or '' @Lazy def end(self): - return self.formatTimeStamp(self.track.end, 'time') + result = self.formatTimeStamp(self.track.end, 'time') + return result != '00:00' and result or '' @Lazy def duration(self): @@ -349,8 +355,7 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView): @Lazy def workItemType(self): - name = self.track.workItemType - return (name and workItemTypes[name] or self.workItemTypes[0]) + return self.track.getWorkItemType() or self.workItemTypes[0] @Lazy def workItemTypes(self): diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt index e67654c..0d67bbc 100644 --- a/organize/work/work_macros.pt +++ b/organize/work/work_macros.pt @@ -24,8 +24,8 @@ 2009-01 - +