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

Cleanup 'phone' filter/sort logic for Employees grid

Browse source 
per newer conventions etc.  needed to override some of this for a client
This commit is contained in:
Lance Edgar 2019-07-25 16:05:10 -05:00
parent e756ae3c8f
commit 6e1f925944
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tailbone/views/employees.py
View file

@ -49,6 +49,7 @@ class EmployeesView(MasterView):
labels = { labels = {
'id': "ID", 'id': "ID",
'phone': "Phone Number",
} }
grid_columns = [ grid_columns = [
@ -79,9 +80,15 @@ class EmployeesView(MasterView):
super(EmployeesView, self).configure_grid(g) super(EmployeesView, self).configure_grid(g)
route_prefix = self.get_route_prefix() route_prefix = self.get_route_prefix()
g.joiners['phone'] = lambda q: q.outerjoin(model.EmployeePhoneNumber, sa.and_( # phone
g.set_joiner('phone', lambda q: q.outerjoin(model.EmployeePhoneNumber, sa.and_(
model.EmployeePhoneNumber.parent_uuid == model.Employee.uuid, model.EmployeePhoneNumber.parent_uuid == model.Employee.uuid,
model.EmployeePhoneNumber.preference == 1)) model.EmployeePhoneNumber.preference == 1)))
g.set_filter('phone', model.EmployeePhoneNumber.number,
label="Phone Number",
factory=grids.filters.AlchemyPhoneNumberFilter)
g.set_sorter('phone', model.EmployeePhoneNumber.number)
g.joiners['email'] = lambda q: q.outerjoin(model.EmployeeEmailAddress, sa.and_( g.joiners['email'] = lambda q: q.outerjoin(model.EmployeeEmailAddress, sa.and_(
model.EmployeeEmailAddress.parent_uuid == model.Employee.uuid, model.EmployeeEmailAddress.parent_uuid == model.Employee.uuid,
model.EmployeeEmailAddress.preference == 1)) model.EmployeeEmailAddress.preference == 1))
@ -91,9 +98,6 @@ class EmployeesView(MasterView):
g.filters['email'] = g.make_filter('email', model.EmployeeEmailAddress.address, g.filters['email'] = g.make_filter('email', model.EmployeeEmailAddress.address,
label="Email Address") label="Email Address")
g.set_filter('phone', model.EmployeePhoneNumber.number,
label="Phone Number",
factory=grids.filters.AlchemyPhoneNumberFilter)
# id # id
if self.request.has_perm('{}.edit'.format(route_prefix)): if self.request.has_perm('{}.edit'.format(route_prefix)):
@ -123,11 +127,9 @@ class EmployeesView(MasterView):
g.sorters['last_name'] = lambda q, d: q.order_by(getattr(model.Person.last_name, d)()) g.sorters['last_name'] = lambda q, d: q.order_by(getattr(model.Person.last_name, d)())
g.sorters['email'] = lambda q, d: q.order_by(getattr(model.EmployeeEmailAddress.address, d)()) g.sorters['email'] = lambda q, d: q.order_by(getattr(model.EmployeeEmailAddress.address, d)())
g.sorters['phone'] = lambda q, d: q.order_by(getattr(model.EmployeePhoneNumber.number, d)())
g.set_sort_defaults('first_name') g.set_sort_defaults('first_name')
g.set_label('phone', "Phone Number")
g.set_label('email', "Email Address") g.set_label('email', "Email Address")
g.set_link('first_name') g.set_link('first_name')
@ -191,7 +193,6 @@ class EmployeesView(MasterView):
f.set_readonly('email') f.set_readonly('email')
f.set_label('display_name', "Short Name") f.set_label('display_name', "Short Name")
f.set_label('phone', "Phone Number")
f.set_label('email', "Email Address") f.set_label('email', "Email Address")
if not self.viewing: if not self.viewing: