From 4c13744a0cd28e380c6d3add7e587734b125884b Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 18 May 2015 10:54:58 +0200 Subject: [PATCH] set date/time fields correctly when selecting 'start' action --- browser/loops.js | 9 +++++++++ organize/work/browser.py | 10 ++++++++++ organize/work/work_macros.pt | 14 +++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/browser/loops.js b/browser/loops.js index bb24e2c..0f200a4 100644 --- a/browser/loops.js +++ b/browser/loops.js @@ -47,6 +47,15 @@ function showIfIn(node, conditions) { }) } +function setIfIn(node, conditions) { + dojo.forEach(conditions, function(cond) { + if (node.value == cond[0]) { + target = dojo.byId(cond[1]); + target.value = cond[2]; + } + }) +} + function destroyWidgets(node) { dojo.forEach(dojo.query('[widgetId]', node), function(n) { w = dijit.byNode(n); diff --git a/organize/work/browser.py b/organize/work/browser.py index 4e0f67d..8eef9a8 100644 --- a/organize/work/browser.py +++ b/organize/work/browser.py @@ -476,6 +476,16 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView): return getTimeStamp() return None + @Lazy + def defaultDate(self): + return format.formatDate(date.today(), 'date', 'medium', + self.languageInfo.language) + #return time.strftime('%Y-%m-%d', time.localtime(getTimeStamp())) + + @Lazy + def defaultTime(self): + return time.strftime('%H:%M', time.localtime(getTimeStamp())) + @Lazy def date(self): ts = self.track.start or self.defaultTimeStamp diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt index 959a814..41ca9c2 100644 --- a/organize/work/work_macros.pt +++ b/organize/work/work_macros.pt @@ -120,12 +120,21 @@ + +