From 43a3b8ae0a68e0ea58f56753f91f26a1ddf202c2 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 11 Feb 2017 17:46:06 -0600 Subject: [PATCH] Use `pretty_hours()` function where applicable --- tailbone/views/shifts/lib.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tailbone/views/shifts/lib.py b/tailbone/views/shifts/lib.py index 3172a65a..fd37d4bb 100644 --- a/tailbone/views/shifts/lib.py +++ b/tailbone/views/shifts/lib.py @@ -33,6 +33,7 @@ import sqlalchemy as sa from rattail import enum from rattail.db import model, api from rattail.time import localtime, make_utc, get_sunday +from rattail.util import pretty_hours import formencode as fe from pyramid_simpleform import Form @@ -396,15 +397,13 @@ class TimeSheetView(View): hours = empday['{}_hours'.format(shift_type)] if hours: - minutes = (hours.days * 1440) + (hours.seconds / 60) - empday['{}_hours_display'.format(shift_type)] = '{}:{:02d}'.format(minutes // 60, minutes % 60) + empday['{}_hours_display'.format(shift_type)] = pretty_hours(hours) employee.weekdays[i].update(empday) hours = getattr(employee, '{}_hours'.format(shift_type)) if hours: - minutes = (hours.days * 1440) + (hours.seconds / 60) setattr(employee, '{}_hours_display'.format(shift_type), - '{}:{:02d}'.format(minutes // 60, minutes % 60)) + pretty_hours(hours)) @classmethod def defaults(cls, config):