From 12e477909305a1f2ed4b7e4ba2b421ab727c782e Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 28 Aug 2023 20:43:31 -0500 Subject: [PATCH] Fairly massive overhaul of the Profile view; standardize tabs etc. much cleaner and more consistent interface now, between the main ProfileInfo component, and various *Tab components also cleaner interface between client-side JS and server view methods to my knowledge this is complete and breaks nothing..we'll see! --- tailbone/templates/members/configure.mako | 14 + tailbone/templates/page.mako | 7 +- .../templates/people/view_profile_buefy.mako | 1830 +++++++++-------- tailbone/views/members.py | 5 + tailbone/views/people.py | 397 ++-- 5 files changed, 1234 insertions(+), 1019 deletions(-) diff --git a/tailbone/templates/members/configure.mako b/tailbone/templates/members/configure.mako index c0e0355d..465bf611 100644 --- a/tailbone/templates/members/configure.mako +++ b/tailbone/templates/members/configure.mako @@ -36,6 +36,20 @@ + +

Relationships

+
+ + + + Limit one (1) Member account per Person + + + +
<%def name="modify_this_page_vars()"> diff --git a/tailbone/templates/page.mako b/tailbone/templates/page.mako index b5ac8773..bf799440 100644 --- a/tailbone/templates/page.mako +++ b/tailbone/templates/page.mako @@ -38,7 +38,12 @@ }, computed: {}, watch: {}, - methods: {}, + methods: { + + changeContentTitle(newTitle) { + this.$emit('change-content-title', newTitle) + }, + }, } let ThisPageData = { diff --git a/tailbone/templates/people/view_profile_buefy.mako b/tailbone/templates/people/view_profile_buefy.mako index e1da8661..5574088e 100644 --- a/tailbone/templates/people/view_profile_buefy.mako +++ b/tailbone/templates/people/view_profile_buefy.mako @@ -119,17 +119,17 @@
- - - @@ -210,38 +210,38 @@
- - - - - - @@ -298,7 +298,7 @@

- {{ phoneUUID ? "Edit Phone" : "Add Phone" }} + {{ editPhoneUUID ? "Edit" : "Add" }} Phone

@@ -306,7 +306,7 @@ - + - - + @@ -335,7 +335,7 @@ :disabled="editPhoneSaveDisabled" icon-pack="fas" icon-left="save"> - {{ editPhoneSaveText }} + {{ editPhoneSaving ? "Working..." : "Save" }} Cancel @@ -372,12 +372,12 @@ Edit - Delete - Set Preferred @@ -415,7 +415,7 @@

- {{ emailUUID ? "Edit Email" : "Add Email" }} + {{ editEmailUUID ? "Edit" : "Add" }} Email

@@ -423,7 +423,7 @@ - + - - - + - - + @@ -461,7 +461,7 @@ :disabled="editEmailSaveDisabled" icon-pack="fas" icon-left="save"> - {{ editEmailSaveText }} + {{ editEmailSaving ? "Working, please wait..." : "Save" }} Cancel @@ -504,12 +504,12 @@ Edit - Delete - Set Preferred @@ -541,10 +541,12 @@
% if request.has_perm('people.view'): - ${h.link_to("View Person", url('people.view', uuid=person.uuid), class_='button')} + + View Person + % endif
- + @@ -553,294 +555,336 @@ - + + :max-lengths="maxLengths"> +<%def name="render_member_tab_template()"> + + + <%def name="render_member_tab()"> - -
- -
-

{{ person.display_name }} has {{ members.length }} member account{{ members.length == 1 ? '' : 's' }}

-
- -
- - -
- - - {{ member._key }} - {{ member.display }} -
- -
-
-
- - - {{ member._key }} - - - - - {{ member.person_display_name }} - - - {{ member.person_display_name }} - - - - - - {{ member.membership_type_name }} - - - {{ member.membership_type_name }} - - - - - {{ member.active ? "Yes" : "No" }} - - - - {{ member.joined }} - - - - {{ member.withdrew }} - - - - {{ member.equity_total_display }} - - -
-
- ${self.render_member_panel_buttons(member)} -
-
-
- -
- -
-

{{ person.display_name }} does not have a member account.

-
- + :icon="tabchecks.member ? 'check' : null"> + + -<%def name="render_member_panel_buttons(member)"> - % for button in member_xref_buttons: - ${button} - % endfor - % if request.has_perm('members.view'): - - View Member - - % endif +<%def name="render_customer_tab_template()"> + <%def name="render_customer_tab()"> - -
- -
-

{{ person.display_name }} has {{ customers.length }} customer account{{ customers.length == 1 ? '' : 's' }}

-
- -
- - -
- - - {{ customer._key }} - {{ customer.name }} -
- -
-
-
- - - {{ customer._key }} - - - - {{ customer.name }} - - - % if expose_customer_shoppers: - - - - % endif - - % if expose_customer_people: - - - - % endif - - - {{ address.display }} - - -
-
- ${self.render_customer_panel_buttons(customer)} -
-
-
- -
- -
-

{{ person.display_name }} does not have a customer account.

-
- - + :icon="tabchecks.customer ? 'check' : null"> + + + -<%def name="render_customer_panel_buttons(customer)"> - - {{ link.label }} - - % if request.has_perm('customers.view'): - - View Customer - - % endif +<%def name="render_shopper_tab_template()"> + <%def name="render_shopper_tab()"> - -
- -
-

{{ person.display_name }} is shopper for {{ shoppers.length }} customer account{{ shoppers.length == 1 ? '' : 's' }}

-
- -
- - -
- - - {{ shopper.customer_key }} - {{ shopper.customer_name }} -
- -
-
-
- - - {{ shopper.customer_key }} - - - - {{ shopper.customer_name }} - - - - - {{ shopper.account_holder_name }} - - - {{ shopper.account_holder_name }} - - - -
-##
-## ${self.render_shopper_panel_buttons(shopper)} -##
-
-
- -
- -
-

{{ person.display_name }} is not a shopper.

-
- - + :icon="tabchecks.shopper ? 'check' : null"> + + + <%def name="render_employee_tab_template()"> @@ -863,11 +907,11 @@ + @click="editEmployeeIdInit()"> Edit ID + :active.sync="editEmployeeIdShowDialog">
@@ -876,20 +920,20 @@
- +
- + Cancel - {{ editEmployeeIDSaveButtonText }} + :disabled="editEmployeeIdSaving" + @click="editEmployeeIdSave()"> + {{ editEmployeeIdSaving ? "Working, please wait..." : "Save" }}
@@ -934,7 +978,7 @@ - + Edit @@ -964,7 +1008,7 @@ + @click="stopEmployeeInit()"> ${person} is no longer an Employee @@ -978,10 +1022,10 @@
- + - +
@@ -990,8 +1034,8 @@ Cancel @@ -999,7 +1043,7 @@ + :active.sync="stopEmployeeShowDialog">
@@ -1008,22 +1052,22 @@
- + :type="stopEmployeeEndDate ? null : 'is-danger'"> + - +
- + Cancel
@@ -1033,7 +1077,7 @@ % if request.has_perm('people_profile.edit_employee_history'): + :active.sync="editEmployeeHistoryShowDialog">
@@ -1042,22 +1086,22 @@
- + - +
- + Cancel
@@ -1076,6 +1120,7 @@
+ @@ -1084,12 +1129,10 @@ - + :icon="tabchecks.employee ? 'check' : null"> + @@ -1101,7 +1144,7 @@ % if request.has_perm('people_profile.add_note'): Add Note @@ -1144,13 +1187,13 @@ % if request.has_perm('people_profile.edit_note'): - + Edit % endif % if request.has_perm('people_profile.delete_note'): - Delete @@ -1161,68 +1204,71 @@ - + % if request.has_any_perm('people_profile.add_note', 'people_profile.edit_note', 'people_profile.delete_note'): + -
+
-
-

- {{ noteDialogTitle }} -

-
+
+

+ {{ editNoteUUID ? (editNoteDelete ? "Delete" : "Edit") : "New" }} Note +

+
-
+
- - - - - + + + + + - - - - + + + + - - - - + + + + - - Are you sure you wish to delete this note? - + + Are you sure you wish to delete this note? + -
+
-
- - {{ noteSaving ? "Working, please wait..." : noteSaveText }} - - - Cancel - -
+
+ + {{ editNoteSaving ? "Working..." : (editNoteDelete ? "Delete" : "Save") }} + + + Cancel + +
-
- +
+ + % endif + @@ -1231,70 +1277,79 @@ - - + :icon="tabchecks.notes ? 'check' : null"> + - +<%def name="render_user_tab_template()"> + + + <%def name="render_user_tab()"> - -
- -

{{ person.display_name }} has {{ users.length }} user account{{ users.length == 1 ? '' : 's' }}

-
-
- - - -
- {{ user.username }} -
- -
-
- -
-
-
- -
- {{ user.username }} -
-
-
-
- -
- % if request.has_perm('users.view'): - - View User - - % endif -
- -
-
- -
-
- -
-

{{ person.display_name }} does not have a user account.

-
- + :icon="tabchecks.user ? 'check' : null"> + + + <%def name="render_profile_tabs()"> @@ -1302,7 +1357,7 @@ ${self.render_member_tab()} ${self.render_customer_tab()} % if expose_customer_shoppers: - ${self.render_shopper_tab()} + ${self.render_shopper_tab()} % endif ${self.render_employee_tab()} ${self.render_notes_tab()} @@ -1422,8 +1477,14 @@ <%def name="render_this_page_template()"> ${parent.render_this_page_template()} ${self.render_personal_tab_template()} + ${self.render_member_tab_template()} + ${self.render_customer_tab_template()} + % if expose_customer_shoppers: + ${self.render_shopper_tab_template()} + % endif ${self.render_employee_tab_template()} ${self.render_notes_tab_template()} + ${self.render_user_tab_template()} ${self.render_profile_info_template()} @@ -1431,127 +1492,95 @@ +<%def name="declare_member_tab_vars()"> + + + +<%def name="make_member_tab_component()"> + ${self.declare_member_tab_vars()} + + + +<%def name="declare_customer_tab_vars()"> + + + +<%def name="make_customer_tab_component()"> + ${self.declare_customer_tab_vars()} + + + +<%def name="declare_shopper_tab_vars()"> + + + +<%def name="make_shopper_tab_component()"> + ${self.declare_shopper_tab_vars()} + + + <%def name="declare_employee_tab_vars()"> +<%def name="declare_user_tab_vars()"> + + + +<%def name="make_user_tab_component()"> + ${self.declare_user_tab_vars()} + + + <%def name="declare_profile_info_vars()"> @@ -2232,54 +2340,48 @@