cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workstatement report: the default for start date (day from) can now be set via type option 'workitem_dayfrom_default'

Browse source
This commit is contained in:
Helmut Merz 2016-02-21 11:52:29 +01:00
parent 711488a412
commit b87dee5c35
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
organize/work/report.py
View file

@ -114,8 +114,12 @@ class PartyStateField(StateField):
return None return None
def yesterday(context): def daysAgoByOption(context):
return (date.today() - timedelta(1)).isoformat() days = 7
opt = context.view.typeOptions('workitem_dayfrom_default')
if opt and opt[0].isdigit():
days = int(opt[0])
return (date.today() - timedelta(days)).isoformat()
# common fields # common fields
@ -134,7 +138,7 @@ deadline = TrackDateField('deadline', u'Deadline',
dayFrom = TrackDateField('dayFrom', u'Start Day', dayFrom = TrackDateField('dayFrom', u'Start Day',
description=u'The first day from which to select work.', description=u'The first day from which to select work.',
fieldType='date', fieldType='date',
default=yesterday, default=daysAgoByOption,
operator=u'ge', operator=u'ge',
executionSteps=['query']) executionSteps=['query'])
dayTo = TrackDateField('dayTo', u'End Day', dayTo = TrackDateField('dayTo', u'End Day',