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

Expose more Member data, relationships with Customer, Person

Browse source
This commit is contained in:
Lance Edgar 2020-03-18 13:15:11 -05:00
parent eb57ebe62b
commit 0ea4b98b1f
5 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tailbone/views/members.py
View file

@ -143,7 +143,7 @@ class MemberView(MasterView):
f.set_label('person_uuid', "Person")
else:
f.set_readonly('person')
# f.set_renderer('person', self.render_person)
f.set_renderer('person', self.render_person)
# customer
if self.creating or self.editing:

39
tailbone/views/people.py
View file

@ -79,6 +79,7 @@ class PeopleView(MasterView):
'address',
'employee',
'customers',
'members',
'users',
]
@ -241,6 +242,13 @@ class PeopleView(MasterView):
f.set_readonly('customers')
f.set_renderer('customers', self.render_customers)
# members
if self.creating:
f.remove_field('members')
else:
f.set_readonly('members')
f.set_renderer('members', self.render_members)
# users
if self.creating:
f.remove_field('users')
@ -264,15 +272,30 @@ class PeopleView(MasterView):
for customer in customers:
customer = customer.customer
text = six.text_type(customer)
if customer.id:
if customer.number:
text = "(#{}) {}".format(customer.number, text)
elif customer.id:
text = "({}) {}".format(customer.id, text)
elif customer.number:
text = "({}) {}".format(customer.number, text)
route = '{}customers.view'.format('mobile.' if self.mobile else '')
url = self.request.route_url(route, uuid=customer.uuid)
items.append(HTML.tag('li', c=[tags.link_to(text, url)]))
return HTML.tag('ul', c=items)
def render_members(self, person, field):
members = person.members
if not members:
return ""
items = []
for member in members:
text = six.text_type(member)
if member.number:
text = "(#{}) {}".format(member.number, text)
elif member.id:
text = "({}) {}".format(member.id, text)
url = self.request.route_url('members.view', uuid=member.uuid)
items.append(HTML.tag('li', c=[tags.link_to(text, url)]))
return HTML.tag('ul', c=items)
def render_users(self, person, field):
use_buefy = self.get_use_buefy()
users = person.users
@ -382,6 +405,11 @@ class PeopleView(MasterView):
return list(data.values())
def get_context_member(self, member):
profile_url = None
if member.person:
profile_url = self.request.route_url('people.view_profile',
uuid=member.person_uuid)
return {
'uuid': member.uuid,
'number': member.number,
@ -389,8 +417,13 @@ class PeopleView(MasterView):
'active': member.active,
'joined': six.text_type(member.joined) if member.joined else None,
'withdrew': six.text_type(member.withdrew) if member.withdrew else None,
'customer_uuid': member.customer_uuid,
'customer_name': member.customer.name if member.customer else None,
'person_uuid': member.person_uuid,
'display': six.text_type(member),
'person_display_name': member.person.display_name if member.person else None,
'view_url': self.request.route_url('members.view', uuid=member.uuid),
'view_profile_url': profile_url,
}
def get_context_employee_history(self, employee):