diff --git a/tailbone/helpers.py b/tailbone/helpers.py index 83c79518..67e90fb5 100644 --- a/tailbone/helpers.py +++ b/tailbone/helpers.py @@ -30,7 +30,7 @@ import datetime from decimal import Decimal from rattail.time import localtime, make_utc -from rattail.util import pretty_quantity +from rattail.util import pretty_quantity, pretty_hours from webhelpers2.html import * from webhelpers2.html.tags import * diff --git a/tailbone/subscribers.py b/tailbone/subscribers.py index df9e3078..a6a62ffa 100644 --- a/tailbone/subscribers.py +++ b/tailbone/subscribers.py @@ -28,6 +28,7 @@ from __future__ import unicode_literals, absolute_import import six import json +import datetime import rattail from rattail.db import model @@ -84,6 +85,7 @@ def before_render(event): renderer_globals['enum'] = request.rattail_config.get_enum() renderer_globals['six'] = six renderer_globals['json'] = json + renderer_globals['datetime'] = datetime def add_inbox_count(event): diff --git a/tailbone/templates/shifts/base.mako b/tailbone/templates/shifts/base.mako index 051e57db..fd608d86 100644 --- a/tailbone/templates/shifts/base.mako +++ b/tailbone/templates/shifts/base.mako @@ -218,10 +218,10 @@ %def> -<%def name="timesheet(render_day=None)"> +<%def name="timesheet(render_day=None, extra_columns=0)"> @@ -233,6 +233,7 @@