Add support for "full" schedule and time sheet views
Temporarily removes support for viewing current user's time sheet; that will be added back in soon.
This commit is contained in:
Lance Edgar
parent
181123dfaa
commit
123f5ce0c6
11 changed files with 327 additions and 165 deletions
|
|
@ -28,6 +28,8 @@ from __future__ import unicode_literals
|
|||
|
||||
from rattail.db import model
|
||||
|
||||
from pyramid import httpexceptions
|
||||
|
||||
from tailbone.db import Session
|
||||
|
||||
|
||||
|
|
@ -56,6 +58,12 @@ class View(object):
|
|||
if uuid:
|
||||
return Session.query(model.User).get(uuid)
|
||||
|
||||
def redirect(self, url):
|
||||
"""
|
||||
Convenience method to return a HTTP 302 response.
|
||||
"""
|
||||
return httpexceptions.HTTPFound(location=url)
|
||||
|
||||
|
||||
def fake_error(request):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -396,12 +396,6 @@ class MasterView(View):
|
|||
"""
|
||||
return kwargs
|
||||
|
||||
def redirect(self, url):
|
||||
"""
|
||||
Convenience method to return a HTTP 302 response.
|
||||
"""
|
||||
return httpexceptions.HTTPFound(location=url)
|
||||
|
||||
##############################
|
||||
# Grid Stuff
|
||||
##############################
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ class ShiftLengthField(formalchemy.Field):
|
|||
super(ShiftLengthField, self).__init__(name, **kwargs)
|
||||
|
||||
def shift_length(self, shift):
|
||||
if not shift.punch_in or not shift.punch_out:
|
||||
if not shift.start_time or not shift.end_time:
|
||||
return
|
||||
if shift.punch_out < shift.punch_in:
|
||||
if shift.end_time < shift.start_time:
|
||||
return "??"
|
||||
return humanize.naturaldelta(shift.punch_out - shift.punch_in)
|
||||
return humanize.naturaldelta(shift.end_time - shift.start_time)
|
||||
|
||||
|
||||
class ScheduledShiftsView(MasterView):
|
||||
|
|
@ -61,22 +61,26 @@ class ScheduledShiftsView(MasterView):
|
|||
def configure_grid(self, g):
|
||||
g.default_sortkey = 'start_time'
|
||||
g.default_sortdir = 'desc'
|
||||
g.append(ShiftLengthField('length'))
|
||||
g.configure(
|
||||
include=[
|
||||
g.employee,
|
||||
g.store,
|
||||
g.start_time,
|
||||
g.end_time,
|
||||
g.length,
|
||||
],
|
||||
readonly=True)
|
||||
|
||||
def configure_fieldset(self, fs):
|
||||
fs.append(ShiftLengthField('length'))
|
||||
fs.configure(
|
||||
include=[
|
||||
fs.employee,
|
||||
fs.store,
|
||||
fs.start_time,
|
||||
fs.end_time,
|
||||
fs.length,
|
||||
])
|
||||
|
||||
|
||||
|
|
@ -88,15 +92,18 @@ class WorkedShiftsView(MasterView):
|
|||
url_prefix = '/shifts/worked'
|
||||
|
||||
def configure_grid(self, g):
|
||||
g.default_sortkey = 'punch_in'
|
||||
# TODO: these sorters should be automatic once we fix the schema
|
||||
g.sorters['start_time'] = g.make_sorter(model.WorkedShift.punch_in)
|
||||
g.sorters['end_time'] = g.make_sorter(model.WorkedShift.punch_out)
|
||||
g.default_sortkey = 'start_time'
|
||||
g.default_sortdir = 'desc'
|
||||
g.append(ShiftLengthField('length'))
|
||||
g.configure(
|
||||
include=[
|
||||
g.employee,
|
||||
g.store,
|
||||
g.punch_in,
|
||||
g.punch_out,
|
||||
g.start_time,
|
||||
g.end_time,
|
||||
g.length,
|
||||
],
|
||||
readonly=True)
|
||||
|
|
@ -107,8 +114,8 @@ class WorkedShiftsView(MasterView):
|
|||
include=[
|
||||
fs.employee,
|
||||
fs.store,
|
||||
fs.punch_in,
|
||||
fs.punch_out,
|
||||
fs.start_time,
|
||||
fs.end_time,
|
||||
fs.length,
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -45,38 +45,66 @@ class ShiftFilter(fe.Schema):
|
|||
filter_extra_fields = True
|
||||
store = forms.validators.ValidStore()
|
||||
department = forms.validators.ValidDepartment()
|
||||
date = fe.validators.DateConverter()
|
||||
|
||||
|
||||
class TimeSheetView(View):
|
||||
"""
|
||||
Base view for time sheets.
|
||||
"""
|
||||
key = None
|
||||
title = None
|
||||
model_class = None
|
||||
|
||||
# Set this to False to avoid the default behavior of auto-filtering by
|
||||
# current store.
|
||||
default_filter_store = True
|
||||
|
||||
def __call__(self):
|
||||
date = self.get_date()
|
||||
@classmethod
|
||||
def get_title(cls):
|
||||
return cls.title or cls.key.capitalize()
|
||||
|
||||
def full(self):
|
||||
date = None
|
||||
store = None
|
||||
department = None
|
||||
employees = Session.query(model.Employee)\
|
||||
.filter(model.Employee.status == enum.EMPLOYEE_STATUS_CURRENT)
|
||||
|
||||
form = Form(self.request, schema=ShiftFilter)
|
||||
if form.validate():
|
||||
store = form.data['store']
|
||||
department = form.data['department']
|
||||
if self.request.method == 'POST':
|
||||
if form.validate():
|
||||
store = form.data['store']
|
||||
self.request.session['timesheet.{}.store'.format(self.key)] = store.uuid if store else None
|
||||
department = form.data['department']
|
||||
self.request.session['timesheet.{}.department'.format(self.key)] = department.uuid if department else None
|
||||
date = form.data['date']
|
||||
self.request.session['timesheet.{}.date'.format(self.key)] = date.strftime('%m/%d/%Y') if date else None
|
||||
return self.redirect(self.request.current_route_url())
|
||||
|
||||
elif self.request.method != 'POST' and self.default_filter_store:
|
||||
store = self.rattail_config.get('rattail', 'store')
|
||||
if store:
|
||||
store = api.get_store(Session(), store)
|
||||
else:
|
||||
store_key = 'timesheet.{}.store'.format(self.key)
|
||||
department_key = 'timesheet.{}.department'.format(self.key)
|
||||
date_key = 'timesheet.{}.date'.format(self.key)
|
||||
if store_key in self.request.session or department_key in self.request.session or date_key in self.request.session:
|
||||
store_uuid = self.request.session.get(store_key)
|
||||
if store_uuid:
|
||||
store = Session.query(model.Store).get(store_uuid) if store_uuid else None
|
||||
department_uuid = self.request.session.get(department_key)
|
||||
if department_uuid:
|
||||
department = Session.query(model.Department).get(department_uuid)
|
||||
date_value = self.request.session.get(date_key)
|
||||
if date_value:
|
||||
try:
|
||||
date = datetime.datetime.strptime(date_value, '%m/%d/%Y').date()
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
# TODO:
|
||||
# store = Session.query(model.Store).filter_by(id='003').one()
|
||||
# department = Session.query(model.Department).filter_by(number=6).one()
|
||||
else: # nothing stored in session
|
||||
if self.default_filter_store:
|
||||
store = self.rattail_config.get('rattail', 'store')
|
||||
if store:
|
||||
store = api.get_store(Session(), store)
|
||||
|
||||
if store:
|
||||
employees = employees.join(model.EmployeeStore)\
|
||||
|
|
@ -86,25 +114,49 @@ class TimeSheetView(View):
|
|||
employees = employees.join(model.EmployeeDepartment)\
|
||||
.filter(model.EmployeeDepartment.department == department)
|
||||
|
||||
return self.render(date, employees.all(), store=store, department=department, form=form)
|
||||
|
||||
def get_date(self):
|
||||
date = None
|
||||
if 'date' in self.request.params:
|
||||
try:
|
||||
date = datetime.datetime.strptime(self.request.params['date'], '%Y-%m-%d').date()
|
||||
except ValueError:
|
||||
self.request.session.flash("The specified date is not valid: {}".format(self.request.params['date']), 'error')
|
||||
if not date:
|
||||
date = localtime(self.rattail_config).date()
|
||||
return date
|
||||
|
||||
return self.render(date, employees.all(), store=store, department=department, form=form)
|
||||
|
||||
def crossview(self):
|
||||
"""
|
||||
Update session storage to so 'other' view reflects current view
|
||||
filters, then redirect to other view.
|
||||
"""
|
||||
other_key = 'timesheet' if self.key == 'schedule' else 'schedule'
|
||||
self.session_put('store', self.session_get('store'), mainkey=other_key)
|
||||
self.session_put('department', self.session_get('department'), mainkey=other_key)
|
||||
self.session_put('date', self.session_get('date'), mainkey=other_key)
|
||||
return self.redirect(self.request.route_url(other_key))
|
||||
|
||||
# def session_has(self, key, mainkey=None):
|
||||
# if mainkey is None:
|
||||
# mainkey = self.key
|
||||
# return 'timesheet.{}.{}'.format(mainkey, key) in self.request.session
|
||||
|
||||
# def session_has_any(self, *keys, **kwargs):
|
||||
# for key in keys:
|
||||
# if self.session_has(key, **kwargs):
|
||||
# return True
|
||||
# return False
|
||||
|
||||
def session_get(self, key, mainkey=None):
|
||||
if mainkey is None:
|
||||
mainkey = self.key
|
||||
return self.request.session.get('timesheet.{}.{}'.format(mainkey, key))
|
||||
|
||||
def session_put(self, key, value, mainkey=None):
|
||||
if mainkey is None:
|
||||
mainkey = self.key
|
||||
self.request.session['timesheet.{}.{}'.format(mainkey, key)] = value
|
||||
|
||||
def get_stores(self):
|
||||
return Session.query(model.Store).order_by(model.Store.id).all()
|
||||
|
||||
def get_store_options(self, stores):
|
||||
options = [(s.uuid, "{} - {}".format(s.id, s.name)) for s in stores]
|
||||
options.insert(0, (None, "(all)"))
|
||||
options.insert(0, ('', "(all)"))
|
||||
return options
|
||||
|
||||
def get_departments(self):
|
||||
|
|
@ -112,7 +164,7 @@ class TimeSheetView(View):
|
|||
|
||||
def get_department_options(self, departments):
|
||||
options = [(d.uuid, d.name) for d in departments]
|
||||
options.insert(0, (None, "(all)"))
|
||||
options.insert(0, ('', "(all)"))
|
||||
return options
|
||||
|
||||
def render(self, date, employees, store=None, department=None, form=None):
|
||||
|
|
@ -184,8 +236,10 @@ class TimeSheetView(View):
|
|||
break
|
||||
elif shift.get_date(self.rattail_config) == day:
|
||||
empday['shifts'].append(shift)
|
||||
empday['hours'] += shift.length
|
||||
employee.hours += shift.length
|
||||
length = shift.length
|
||||
if length is not None:
|
||||
empday['hours'] += shift.length
|
||||
employee.hours += shift.length
|
||||
del employee_shifts[0]
|
||||
else:
|
||||
break
|
||||
|
|
@ -198,3 +252,38 @@ class TimeSheetView(View):
|
|||
if employee.hours:
|
||||
minutes = (employee.hours.days * 1440) + (employee.hours.seconds / 60)
|
||||
employee.hours_display = '{}:{:02d}'.format(minutes // 60, minutes % 60)
|
||||
|
||||
@classmethod
|
||||
def defaults(cls, config):
|
||||
"""
|
||||
Provide default configuration for a time sheet view.
|
||||
"""
|
||||
cls._defaults(config)
|
||||
|
||||
@classmethod
|
||||
def _defaults(cls, config):
|
||||
"""
|
||||
Provide default configuration for a time sheet view.
|
||||
"""
|
||||
title = cls.get_title()
|
||||
config.add_tailbone_permission_group(cls.key, title)
|
||||
# config.add_tailbone_permission(cls.key, '{}.view'.format(cls.key), "View personal {}".format(title))
|
||||
config.add_tailbone_permission(cls.key, '{}.viewall'.format(cls.key), "View full {}".format(title))
|
||||
|
||||
# full time sheet
|
||||
config.add_route(cls.key, '/{}/'.format(cls.key))
|
||||
config.add_view(cls, attr='full', route_name=cls.key,
|
||||
renderer='/shifts/{}.mako'.format(cls.key),
|
||||
permission='{}.viewall'.format(cls.key))
|
||||
|
||||
# # single employee time sheet
|
||||
# config.add_route('{}.employee'.format(cls.key), '/{}/employee/'.format(cls.key))
|
||||
# config.add_view(cls, attr='employee', route_name='{}.employee'.format(cls.key),
|
||||
# renderer='/shifts/{}.mako'.format(cls.key),
|
||||
# permission='{}.view'.format(cls.key))
|
||||
|
||||
# goto cross-view (view 'timesheet' as 'schedule' or vice-versa)
|
||||
other_key = 'timesheet' if cls.key == 'schedule' else 'schedule'
|
||||
config.add_route('{}.goto.{}'.format(cls.key, other_key), '/{}/goto-{}'.format(cls.key, other_key))
|
||||
config.add_view(cls, attr='crossview', route_name='{}.goto.{}'.format(cls.key, other_key),
|
||||
permission='{}.view'.format(other_key))
|
||||
|
|
|
|||
|
|
@ -26,10 +26,8 @@ Views for employee schedules
|
|||
|
||||
from __future__ import unicode_literals, absolute_import
|
||||
|
||||
from rattail import enum
|
||||
from rattail.db import model
|
||||
|
||||
from tailbone.db import Session
|
||||
from tailbone.views.shifts.lib import TimeSheetView
|
||||
|
||||
|
||||
|
|
@ -37,14 +35,9 @@ class ScheduleView(TimeSheetView):
|
|||
"""
|
||||
Simple view for current user's schedule.
|
||||
"""
|
||||
key = 'schedule'
|
||||
model_class = model.ScheduledShift
|
||||
|
||||
|
||||
def includeme(config):
|
||||
|
||||
config.add_tailbone_permission('schedule', 'schedule.view', "View Schedule")
|
||||
|
||||
# current user's schedule
|
||||
config.add_route('schedule', '/schedule/')
|
||||
config.add_view(ScheduleView, route_name='schedule',
|
||||
renderer='/shifts/schedule.mako', permission='schedule.view')
|
||||
ScheduleView.defaults(config)
|
||||
|
|
|
|||
|
|
@ -35,20 +35,21 @@ class TimeSheetView(TimeSheetView):
|
|||
"""
|
||||
Simple view for current user's time sheet.
|
||||
"""
|
||||
key = 'timesheet'
|
||||
title = "Time Sheet"
|
||||
model_class = model.WorkedShift
|
||||
|
||||
def __call__(self):
|
||||
date = self.get_date()
|
||||
employee = self.request.user.employee
|
||||
assert employee
|
||||
return self.render(date, [employee])
|
||||
# def __call__(self):
|
||||
# date = self.get_date()
|
||||
# employee = self.request.user.employee
|
||||
# assert employee
|
||||
# return self.render(date, [employee])
|
||||
|
||||
|
||||
def includeme(config):
|
||||
|
||||
config.add_tailbone_permission('timesheet', 'timesheet.view', "View Time Sheet")
|
||||
TimeSheetView.defaults(config)
|
||||
|
||||
# current user's time sheet
|
||||
config.add_route('timesheet', '/timesheet/')
|
||||
config.add_view(TimeSheetView, route_name='timesheet',
|
||||
renderer='/shifts/timesheet.mako', permission='timesheet.view')
|
||||
# config.add_route('timesheet', '/timesheet/')
|
||||
# config.add_view(TimeSheetView, route_name='timesheet',
|
||||
# renderer='/shifts/timesheet.mako', permission='timesheet.view')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue