From 1bfb7a8a3969faf1678093a26844c494aa30f4db Mon Sep 17 00:00:00 2001 From: sophia-massie <96220951+sophia-massie@users.noreply.github.com> Date: Wed, 8 Nov 2023 11:42:03 -0600 Subject: [PATCH] Task/wp 372 admin except extend entity name (#241) * task/wp-372-Admin-Except-Extend-Entity-Name - Updated query for get_all_exceptions and get_all_extensions - Updated view and template for extensions to pull entity name from submitters table * Left org name as the parameter for filter but changed value to entity_name from submitters table * Updated to entity organization so users will know to use filter by organization * Allow None to be an outcome listed in the edit modals but only if it's a NoneType object and not a string --------- Co-authored-by: edmondsgarrett <43251554+edmondsgarrett@users.noreply.github.com> --- .../static/admin_exception/css/table.css | 7 ++----- .../templates/edit_exception_modal.html | 6 +++--- .../templates/list_admin_exception.html | 2 +- .../templates/view_admin_exception_modal.html | 4 ++-- apcd-cms/src/apps/admin_exception/views.py | 17 ++++++++--------- .../static/admin_extension/css/table.css | 7 ++----- .../templates/edit_extension_modal.html | 8 +++++--- .../templates/list_admin_extension.html | 2 +- .../templates/view_admin_extension_modal.html | 6 +++--- apcd-cms/src/apps/admin_extension/views.py | 14 +++++++------- apcd-cms/src/apps/utils/apcd_database.py | 4 ++-- 11 files changed, 36 insertions(+), 41 deletions(-) diff --git a/apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css b/apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css index dbb94a2a..fca1dec9 100644 --- a/apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css +++ b/apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css @@ -1,16 +1,13 @@ -.modal-cell { - padding-left: 0px; -} /* SEE: https://css-tricks.com/responsive-data-tables/ */ @media (max-width: 767px) { /* To label the cells */ /* RFE: Add `data-label` to each cell so we can use `attr(data-label)` */ .exception-table td:nth-of-type(1):before { content: "Created"; } - .exception-table td:nth-of-type(2):before { content: "Organization"; } + .exception-table td:nth-of-type(2):before { content: "Entity Organization"; } .exception-table td:nth-of-type(3):before { content: "Requestor Name"; } .exception-table td:nth-of-type(4):before { content: "Exception Type"; } .exception-table td:nth-of-type(5):before { content: "Outcome"; } .exception-table td:nth-of-type(6):before { content: "Status"; } - .exception-table td:nth-of-type(7):before { content: "Actions"; } + .exception-table td:nth-of-type(7):before {content:"Actions";} } diff --git a/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html b/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html index 5a938335..7ded5ab4 100644 --- a/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html +++ b/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html @@ -7,7 +7,7 @@
-

Edit Exception ID: {{r.exception_id}} for {{r.org_name}}

+

Edit Exception ID {{r.exception_id}} for {{r.entity_name}}

@@ -94,8 +94,8 @@

Current Exception Information

Created
{{r.created_at}}
-
Organization
-
{{r.org_name}}
+
Entity Organization
+
{{r.entity_name}}
Requestor
{{r.requestor_name}}
Requestor Email
diff --git a/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html b/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html index 90a3a9f4..5d68c1cd 100644 --- a/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html +++ b/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html @@ -44,7 +44,7 @@

View Exception Requests

{{r.created_at}} - {{r.org_name}} + {{r.entity_name}} {{r.requestor_name}} {{r.request_type}} {{r.outcome}} diff --git a/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html b/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html index a67d1791..ad088f39 100644 --- a/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html +++ b/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html @@ -20,8 +20,8 @@

Details

Created
{{r.created_at}}
-
Organization
-
{{r.org_name}}
+
Entity Organization
+
{{r.entity_name}}
Requestor
{{r.requestor_name}}
Requestor Email
diff --git a/apcd-cms/src/apps/admin_exception/views.py b/apcd-cms/src/apps/admin_exception/views.py index 4a638ecd..3b1b1177 100644 --- a/apcd-cms/src/apps/admin_exception/views.py +++ b/apcd-cms/src/apps/admin_exception/views.py @@ -85,11 +85,11 @@ def _set_exceptions(exception): 'approved_expiration_date': exception[18], 'status': title_case(exception[19])if exception[3] else None, 'notes': exception[20], - 'org_name': exception[21], + 'entity_name': exception[21], 'data_file_name': exception[22] } - context['header'] = ['Created', 'Organization', 'Requestor Name', 'Exception Type', 'Outcome', 'Status', 'Actions'] + context['header'] = ['Created', 'Entity Organization', 'Requestor Name', 'Exception Type', 'Outcome', 'Status', 'Actions'] context['status_options'] = ['All'] context['org_options'] = ['All'] context['outcome_options'] = [] @@ -109,11 +109,11 @@ def getDate(row): exception_table_entries.append(_set_exceptions(exception)) # to be able to access any exception in a template using exceptions var in the future context['exceptions'].append(_set_exceptions(exception)) - org_name = title_case(exception[21]) + entity_name = title_case(exception[21]) status = title_case(exception[19]) outcome = title_case(exception[5]) - if org_name not in context['org_options']: - context['org_options'].append(org_name) + if entity_name not in context['org_options']: + context['org_options'].append(entity_name) # to make sure All is first in the dropdown filter options after sorting alphabetically context['org_options'] = sorted(context['org_options'], key=lambda x: (x != 'All', x)) if status not in context['status_options']: @@ -122,9 +122,8 @@ def getDate(row): # to make sure All is first in the dropdown filter options after sorting alphabetically context['status_options'] = sorted(context['status_options'], key=lambda x: (x != 'All', x)) if outcome not in context['outcome_options']: - if outcome != None: - context['outcome_options'].append(outcome) - context['outcome_options'] = sorted(context['outcome_options']) + context['outcome_options'].append(outcome) + context['outcome_options'] = sorted(context['outcome_options'], key=lambda x: (x is not None, x)) context['selected_status'] = None if status_filter is not None and status_filter != 'All': @@ -136,7 +135,7 @@ def getDate(row): if org_filter is not None and org_filter != 'All': context['selected_org'] = org_filter queryStr += f'&org={org_filter}' - exception_table_entries = table_filter(org_filter.replace("(", "").replace(")",""), exception_table_entries, 'org_name') + exception_table_entries = table_filter(org_filter.replace("(", "").replace(")",""), exception_table_entries, 'entity_name') context['query_str'] = queryStr context.update(paginator(self.request, exception_table_entries)) diff --git a/apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css b/apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css index f55f0b3d..e19cb6e9 100644 --- a/apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css +++ b/apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css @@ -1,16 +1,13 @@ -.modal-cell { - padding-left: 0px; -} /* SEE: https://css-tricks.com/responsive-data-tables/ */ @media (max-width: 767px) { /* To label the cells */ /* RFE: Add `data-label` to each cell so we can use `attr(data-label)` */ .extension-table td:nth-of-type(1):before { content: "Created"; } - .extension-table td:nth-of-type(2):before { content: "Organization"; } + .extension-table td:nth-of-type(2):before { content: "Entity Organization"; } .extension-table td:nth-of-type(3):before { content: "Requestor Name"; } .extension-table td:nth-of-type(4):before { content: "Extension Type"; } .extension-table td:nth-of-type(5):before { content: "Outcome"; } .extension-table td:nth-of-type(6):before { content: "Status"; } .extension-table td:nth-of-type(7):before { content: "Approved Expiration"; } .extension-table td:nth-of-type(8):before { content: "Actions"; } -} +} \ No newline at end of file diff --git a/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html b/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html index 54c593f7..336f922a 100644 --- a/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html +++ b/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html @@ -7,7 +7,7 @@
-

Edit Extension ID: {{r.extension_id}} for {{r.org_name}}

+

Edit Extension ID {{r.extension_id}} for {{r.entity_name}}

@@ -62,7 +62,9 @@

Edit Selected Extension

@@ -92,8 +94,8 @@

Current Extension Information

Created
{{r.created_at}}
-
Organization
-
{{r.org_name}}
+
Entity Organization
+
{{r.entity_name}}
Requestor
{{r.requestor_name}}
Requestor Email
diff --git a/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html b/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html index 94372e46..e50c6e55 100644 --- a/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html +++ b/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html @@ -43,7 +43,7 @@

View Extension Requests

{% for r in page %} {{r.created_at}} - {{r.org_name}} - {{r.submitter_id}} + {{r.entity_name}} {{r.requestor_name}} {{r.extension_type}} {{r.outcome}} diff --git a/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html b/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html index b5fdf742..4da1ad77 100644 --- a/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html +++ b/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html @@ -7,7 +7,7 @@
-

Extension Details ID: {{r.extension_id}} for {{r.org_name}}

+

Extension Details ID {{r.extension_id}} for {{r.entity_name}}

@@ -20,8 +20,8 @@

Details

Created
{{r.created_at}}
-
Organization
-
{{r.org_name}}
+
Entity Organization
+
{{r.entity_name}}
Requestor
{{r.requestor_name}}
Requestor Email
diff --git a/apcd-cms/src/apps/admin_extension/views.py b/apcd-cms/src/apps/admin_extension/views.py index 90fd59a6..421d7f9a 100644 --- a/apcd-cms/src/apps/admin_extension/views.py +++ b/apcd-cms/src/apps/admin_extension/views.py @@ -78,9 +78,9 @@ def _set_extensions(extension): 'requestor_email': extension[15], 'explanation_justification': extension[16], 'notes': extension[17], - 'org_name': extension[18] + 'entity_name': extension[18] } - context['header'] = ['Created', 'Organization', 'Requestor Name', 'Extension Type', 'Outcome', 'Status', 'Approved Expiration', 'Actions'] + context['header'] = ['Created', 'Entity Organization', 'Requestor Name', 'Extension Type', 'Outcome', 'Status', 'Approved Expiration', 'Actions'] context['status_options'] = ['All'] context['org_options'] = ['All'] context['outcome_options'] = [] @@ -103,18 +103,18 @@ def getDate(row): extension_table_entries.append(_set_extensions(extension)) # to be able to access any extension in a template context['extensions'].append(_set_extensions(extension)) - org_name = title_case(extension[18]) + entity_name = title_case(extension[18]) status = title_case(extension[7]) outcome = title_case(extension[8]) - if org_name not in context['org_options']: - context['org_options'].append(org_name) + if entity_name not in context['org_options']: + context['org_options'].append(entity_name) context['org_options'] = sorted(context['org_options'], key=lambda x: (x != 'All', x)) if status not in context['status_options']: context['status_options'].append(status) context['status_options'] = sorted(context['status_options'], key=lambda x: (x != 'All', x)) if outcome not in context['outcome_options']: context['outcome_options'].append(outcome) - context['outcome_options'] = context['outcome_options'] + context['outcome_options'] = sorted(context['outcome_options'], key=lambda x: (x is not None, x)) queryStr = '' status_filter = self.request.GET.get('status') @@ -130,7 +130,7 @@ def getDate(row): if org_filter is not None and org_filter != 'All': context['selected_org'] = org_filter queryStr += f'&org={org_filter}' - extension_table_entries = table_filter(org_filter.replace("(", "").replace(")",""), extension_table_entries, 'org_name') + extension_table_entries = table_filter(org_filter.replace("(", "").replace(")",""), extension_table_entries, 'entity_name') context['query_str'] = queryStr context.update(paginator(self.request, extension_table_entries)) diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py index 0e215815..3243dcae 100644 --- a/apcd-cms/src/apps/utils/apcd_database.py +++ b/apcd-cms/src/apps/utils/apcd_database.py @@ -1372,7 +1372,7 @@ def get_all_extensions(): extensions.requestor_email, extensions.explanation_justification, extensions.notes, - submitters.org_name + submitters.entity_name FROM extensions JOIN submitters ON extensions.submitter_id = submitters.submitter_id @@ -1423,7 +1423,7 @@ def get_all_exceptions(): exceptions.approved_expiration_date, exceptions.status, exceptions.notes, - submitters.org_name, + submitters.entity_name, standard_codes.item_value FROM exceptions JOIN submitters