do not pre-fill date field for new work item type 'checkup'
This commit is contained in:
parent
576a69e78b
commit
2b80ebefdd
1 changed files with 19 additions and 9 deletions
|
@ -379,25 +379,35 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView):
|
||||||
return time.strftime('%Y-%m-%d', time.localtime(ts))
|
return time.strftime('%Y-%m-%d', time.localtime(ts))
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
|
@Lazy
|
||||||
|
def defaultTimeStamp(self):
|
||||||
|
if self.workItemType.prefillDate:
|
||||||
|
return getTimeStamp()
|
||||||
|
return None
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def date(self):
|
def date(self):
|
||||||
ts = self.track.start or getTimeStamp()
|
ts = self.track.start or self.defaultTimeStamp
|
||||||
return time.strftime('%Y-%m-%d', time.localtime(ts))
|
if ts:
|
||||||
|
return time.strftime('%Y-%m-%d', time.localtime(ts))
|
||||||
|
return ''
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def startTime(self):
|
def startTime(self):
|
||||||
ts = self.track.start or getTimeStamp()
|
ts = self.track.start or self.defaultTimeStamp
|
||||||
#return time.strftime('%Y-%m-%dT%H:%M', time.localtime(ts))
|
if ts:
|
||||||
return time.strftime('T%H:%M', time.localtime(ts))
|
return time.strftime('T%H:%M', time.localtime(ts))
|
||||||
|
return ''
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def endTime(self):
|
def endTime(self):
|
||||||
if self.state == 'running':
|
if self.state == 'running':
|
||||||
ts = getTimeStamp()
|
ts = self.defaultTimeStamp
|
||||||
else:
|
else:
|
||||||
ts = self.track.end or getTimeStamp()
|
ts = self.track.end or self.defaultTimeStamp
|
||||||
#return time.strftime('%Y-%m-%dT%H:%M', time.localtime(ts))
|
if ts:
|
||||||
return time.strftime('T%H:%M', time.localtime(ts))
|
return time.strftime('T%H:%M', time.localtime(ts))
|
||||||
|
return ''
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
def state(self):
|
def state(self):
|
||||||
|
|
Loading…
Add table
Reference in a new issue