Add support for viewing single employee's schedule / time sheet
A little sloppy perhaps, here and there..but seems to do the job.
This commit is contained in:
Lance Edgar
parent
c6ab3b80f9
commit
1e0ef53aea
4 changed files with 153 additions and 44 deletions
|
|
@ -48,6 +48,13 @@ class ShiftFilter(fe.Schema):
|
|||
date = fe.validators.DateConverter()
|
||||
|
||||
|
||||
class EmployeeShiftFilter(fe.Schema):
|
||||
allow_extra_fields = True
|
||||
filter_extra_fields = True
|
||||
employee = forms.validators.ValidEmployee()
|
||||
date = fe.validators.DateConverter()
|
||||
|
||||
|
||||
class TimeSheetView(View):
|
||||
"""
|
||||
Base view for time sheets.
|
||||
|
|
@ -85,14 +92,21 @@ class TimeSheetView(View):
|
|||
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:
|
||||
if store_key in self.request.session or department_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)
|
||||
else: # no store/department in session
|
||||
if self.default_filter_store:
|
||||
store = self.rattail_config.get('rattail', 'store')
|
||||
if store:
|
||||
store = api.get_store(Session(), store)
|
||||
|
||||
date_key = 'timesheet.{}.date'.format(self.key)
|
||||
if date_key in self.request.session:
|
||||
date_value = self.request.session.get(date_key)
|
||||
if date_value:
|
||||
try:
|
||||
|
|
@ -100,12 +114,6 @@ class TimeSheetView(View):
|
|||
except ValueError:
|
||||
pass
|
||||
|
||||
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)\
|
||||
.filter(model.EmployeeStore.store == store)
|
||||
|
|
@ -117,7 +125,51 @@ class TimeSheetView(View):
|
|||
if not date:
|
||||
date = localtime(self.rattail_config).date()
|
||||
|
||||
return self.render(date, employees.all(), store=store, department=department, form=form)
|
||||
return self.render_full(date, employees.all(), store=store, department=department, form=form)
|
||||
|
||||
def employee(self):
|
||||
"""
|
||||
View time sheet for single employee.
|
||||
"""
|
||||
date = None
|
||||
employee = None
|
||||
if not self.request.has_perm('{}.viewall'.format(self.key)):
|
||||
# force current user if not allowed to view all data
|
||||
employee = self.request.user.employee
|
||||
assert employee
|
||||
form = Form(self.request, schema=EmployeeShiftFilter)
|
||||
if self.request.method == 'POST':
|
||||
if form.validate():
|
||||
if self.request.has_perm('{}.viewall'.format(self.key)):
|
||||
employee = form.data['employee']
|
||||
self.request.session['timesheet.{}.employee'.format(self.key)] = employee.uuid if employee else None
|
||||
date = form.data['date']
|
||||
self.request.session['timesheet.{}.employee.date'.format(self.key)] = date.strftime('%m/%d/%Y') if date else None
|
||||
return self.redirect(self.request.current_route_url())
|
||||
|
||||
else:
|
||||
if self.request.has_perm('{}.viewall'.format(self.key)):
|
||||
employee_key = 'timesheet.{}.employee'.format(self.key)
|
||||
if employee_key in self.request.session:
|
||||
employee_uuid = self.request.session.get(employee_key)
|
||||
if employee_uuid:
|
||||
employee = Session.query(model.Employee).get(employee_uuid)
|
||||
else: # no employee in session
|
||||
if self.request.user:
|
||||
employee = self.request.user.employee
|
||||
|
||||
date_key = 'timesheet.{}.employee.date'.format(self.key)
|
||||
if date_key in self.request.session:
|
||||
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
|
||||
|
||||
if not date:
|
||||
date = localtime(self.rattail_config).date()
|
||||
return self.render_single(date, employee, form=form)
|
||||
|
||||
def crossview(self):
|
||||
"""
|
||||
|
|
@ -125,10 +177,19 @@ class TimeSheetView(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))
|
||||
|
||||
# TODO: this check is pretty hacky..
|
||||
# employee time sheet
|
||||
if 'employee' in self.request.get_referrer():
|
||||
self.session_put('employee', self.session_get('employee'), mainkey=other_key)
|
||||
self.session_put('employee.date', self.session_get('employee.date'), mainkey=other_key)
|
||||
return self.redirect(self.request.route_url('{}.employee'.format(other_key)))
|
||||
|
||||
else: # full time sheet
|
||||
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:
|
||||
|
|
@ -167,7 +228,7 @@ class TimeSheetView(View):
|
|||
options.insert(0, ('', "(all)"))
|
||||
return options
|
||||
|
||||
def render(self, date, employees, store=None, department=None, form=None):
|
||||
def render_full(self, date, employees, store=None, department=None, form=None):
|
||||
"""
|
||||
Render a time sheet for one or more employees, for the week which
|
||||
includes the specified date.
|
||||
|
|
@ -192,6 +253,7 @@ class TimeSheetView(View):
|
|||
department_options = self.get_department_options(departments)
|
||||
|
||||
return {
|
||||
'page_title': "Full {}".format(self.get_title()),
|
||||
'form': forms.FormRenderer(form) if form else None,
|
||||
'employees': employees,
|
||||
'stores': stores,
|
||||
|
|
@ -205,6 +267,39 @@ class TimeSheetView(View):
|
|||
'prev_sunday': sunday - datetime.timedelta(days=7),
|
||||
'next_sunday': sunday + datetime.timedelta(days=7),
|
||||
'weekdays': weekdays,
|
||||
'permission_prefix': self.key,
|
||||
}
|
||||
|
||||
def render_single(self, date, employee, form=None):
|
||||
"""
|
||||
Render a time sheet for one employee, for the week which includes the
|
||||
specified date.
|
||||
"""
|
||||
sunday = get_sunday(date)
|
||||
weekdays = [sunday]
|
||||
for i in range(1, 7):
|
||||
weekdays.append(sunday + datetime.timedelta(days=i))
|
||||
|
||||
saturday = weekdays[-1]
|
||||
if saturday.year == sunday.year:
|
||||
week_of = '{} - {}'.format(sunday.strftime('%a %b %d'), saturday.strftime('%a %b %d, %Y'))
|
||||
else:
|
||||
week_of = '{} - {}'.format(sunday.strftime('%a %b %d, Y'), saturday.strftime('%a %b %d, %Y'))
|
||||
|
||||
if employee:
|
||||
self.modify_employees([employee], weekdays)
|
||||
|
||||
return {
|
||||
'page_title': "Employee {}".format(self.get_title()),
|
||||
'form': forms.FormRenderer(form) if form else None,
|
||||
'employee': employee,
|
||||
'employees': [employee],
|
||||
'week_of': week_of,
|
||||
'sunday': sunday,
|
||||
'prev_sunday': sunday - datetime.timedelta(days=7),
|
||||
'next_sunday': sunday + datetime.timedelta(days=7),
|
||||
'weekdays': weekdays,
|
||||
'permission_prefix': self.key,
|
||||
}
|
||||
|
||||
def modify_employees(self, employees, weekdays):
|
||||
|
|
@ -267,7 +362,7 @@ class TimeSheetView(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, '{}.view'.format(cls.key), "View employee {}".format(title))
|
||||
config.add_tailbone_permission(cls.key, '{}.viewall'.format(cls.key), "View full {}".format(title))
|
||||
|
||||
# full time sheet
|
||||
|
|
@ -276,11 +371,11 @@ class TimeSheetView(View):
|
|||
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))
|
||||
# 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'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue