entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 39 Releases Activity

misc: change |age_in_working_days so it can return negative values (#71759) #609

Merged
fpeters merged 1 commits from wip/71759-working-days-future into main 2023-09-04 09:25:25 +02:00
Conversation 2 Commits 1 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_templates.py
View File

@ -1162,9 +1162,9 @@ def test_age_in_working_days_settings(settings, pub, freezer):
assert t.render({'value': '2020-07-12'}) == '2'
settings.WORKING_DAY_CALENDAR = 'workalendar.europe.France'
t = Template('{{ value|age_in_working_days }}')
assert t.render({'value': '2020-07-12'}) == '7'
assert t.render({'value': '2020-07-12'}) == '-7'
t = Template('{{ value|age_in_working_days_with_saturday }}')
assert t.render({'value': '2020-07-12'}) == '9'
assert t.render({'value': '2020-07-12'}) == '-9'
pub.site_options.set('options', 'working_day_calendar', 'foobar')
with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:

5
wcs/qommon/templatetags/qommon.py
View File

@ -482,7 +482,10 @@ def age_in_working_days(value, arg=None, saturday_is_a_working_day=False):
if not cal:
return ''
return cal.get_working_days_delta(value, arg)
delta = cal.get_working_days_delta(value, arg)
if arg.timetuple() < value.timetuple():
delta = -delta
return delta
@register.filter(expects_localtime=True)