rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add "?" for daily time sheet total if partial shift present

Browse source
This commit is contained in:
Lance Edgar 2018-07-10 17:45:33 -05:00
parent 16ab8b6ffa
commit 699536b1ab
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tailbone/views/shifts/lib.py
View file

@ -442,6 +442,7 @@ class TimeSheetView(View):
'{}_shifts'.format(shift_type): [], '{}_shifts'.format(shift_type): [],
'{}_hours'.format(shift_type): datetime.timedelta(0), '{}_hours'.format(shift_type): datetime.timedelta(0),
'{}_hours_display'.format(shift_type): '', '{}_hours_display'.format(shift_type): '',
'hours_incomplete': False,
} }
while employee_shifts: while employee_shifts:
@ -457,6 +458,7 @@ class TimeSheetView(View):
getattr(employee, '{}_hours'.format(shift_type)) + shift.length) getattr(employee, '{}_hours'.format(shift_type)) + shift.length)
else: else:
hours_incomplete = True hours_incomplete = True
empday['hours_incomplete'] = True
del employee_shifts[0] del employee_shifts[0]
else: else:
break break
@ -464,9 +466,12 @@ class TimeSheetView(View):
hours = empday['{}_hours'.format(shift_type)] hours = empday['{}_hours'.format(shift_type)]
if hours: if hours:
if hours_style == 'pretty': if hours_style == 'pretty':
empday['{}_hours_display'.format(shift_type)] = pretty_hours(hours) display = pretty_hours(hours)
else: # decimal else: # decimal
empday['{}_hours_display'.format(shift_type)] = six.text_type(hours_as_decimal(hours)) display = six.text_type(hours_as_decimal(hours))
if empday['hours_incomplete']:
display = '{} ?'.format(display)
empday['{}_hours_display'.format(shift_type)] = display
employee.weekdays[i].update(empday) employee.weekdays[i].update(empday)
hours = getattr(employee, '{}_hours'.format(shift_type)) hours = getattr(employee, '{}_hours'.format(shift_type))