Skip to content

Commit ddfde91

Browse files
task/wp-373-admin-submitter-entity-name (#243)
Co-authored-by: edmondsgarrett <[email protected]>
1 parent c5a13e0 commit ddfde91

File tree

4 files changed

+7
-45
lines changed

4 files changed

+7
-45
lines changed

apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1>View Submissions</h1>
5050
{% for r in page %}
5151
<tr>
5252
<td>{{r.received_timestamp}}</td>
53-
<td>{{r.org_name}}</td>
53+
<td>{{r.entity_name}}</td>
5454
<td colspan="2">{{r.file_name}}</td>
5555
<td>{{r.outcome}}</td>
5656
<td>{{r.status}}</td>

apcd-cms/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ <h4>Logs</h4>
2323
<dl class="c-data-list--is-vert c-data-list--is-wide">
2424
<dt class="c-data-list__key">Log ID</dt>
2525
<dd class="c-data-list__value">{{log.log_id}}</dd>
26-
<dt class="c-data-list__key">Organization</dt>
27-
<dd class="c-data-list__value">{{r.org_name}}</dd>
26+
<dt class="c-data-list__key">Entity Organization</dt>
27+
<dd class="c-data-list__value">{{r.entity_name}}</dd>
2828
<dt class="c-data-list__key">File Type</dt>
2929
<dd class="c-data-list__value">{{log.file_type_name}}</dd>
3030
<dt class="c-data-list__key">Validation Suite</dt>

apcd-cms/src/apps/admin_submissions/views.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def getDate(row):
5555
# on the current page using offset and limit
5656
for s in submission_content[offset:offset + limit]:
5757
s['status'] = title_case(s['status'])
58+
s['entity_name'] = title_case(s['entity_name'])
5859
s['outcome'] = title_case(s['outcome'])
5960
s['received_timestamp'] = parser.parse(s['received_timestamp']) if s['received_timestamp'] else None
6061
s['updated_at'] = parser.parse(s['updated_at']) if s['updated_at'] else None
@@ -63,7 +64,7 @@ def getDate(row):
6364
'outcome': title_case(t['outcome'])
6465
} for t in (s['view_modal_content'] or [])]
6566

66-
context['header'] = ['Received', 'Organization', 'File Name', ' ', 'Outcome', 'Status', 'Last Updated', 'Actions']
67+
context['header'] = ['Received', 'Entity Organization', 'File Name', ' ', 'Outcome', 'Status', 'Last Updated', 'Actions']
6768
context['filter_options'] = ['All', 'In Process', 'Complete']
6869
context['sort_options'] = {'newDate': 'Newest Received', 'oldDate': 'Oldest Received'}
6970

apcd-cms/src/apps/utils/apcd_database.py

+2-41
Original file line numberDiff line numberDiff line change
@@ -1020,44 +1020,6 @@ def get_user_submissions_and_logs(user):
10201020
if conn is not None:
10211021
conn.close()
10221022

1023-
1024-
def get_all_submissions():
1025-
cur = None
1026-
conn = None
1027-
try:
1028-
conn = psycopg2.connect(
1029-
host=APCD_DB['host'],
1030-
dbname=APCD_DB['database'],
1031-
user=APCD_DB['user'],
1032-
password=APCD_DB['password'],
1033-
port=APCD_DB['port'],
1034-
sslmode='require'
1035-
)
1036-
query = """
1037-
SELECT
1038-
submissions.submission_id,
1039-
submissions.apcd_id,
1040-
submissions.submitter_id,
1041-
submissions.zip_file_name,
1042-
submissions.status,
1043-
submissions.outcome,
1044-
submissions.received_timestamp,
1045-
submissions.updated_at,
1046-
apcd_orgs.official_name
1047-
FROM submissions
1048-
JOIN apcd_orgs
1049-
ON submissions.apcd_id = apcd_orgs.apcd_id
1050-
ORDER BY submissions.received_timestamp DESC
1051-
"""
1052-
cur = conn.cursor()
1053-
cur.execute(query)
1054-
return cur.fetchall()
1055-
finally:
1056-
if cur is not None:
1057-
cur.close()
1058-
if conn is not None:
1059-
conn.close()
1060-
10611023
def get_all_submissions_and_logs():
10621024
cur = None
10631025
conn = None
@@ -1073,14 +1035,13 @@ def get_all_submissions_and_logs():
10731035
query = """
10741036
SELECT json_build_object(
10751037
'submission_id', submissions.submission_id,
1076-
'apcd_id', submissions.apcd_id,
1038+
'entity_name', submitters.entity_name,
10771039
'submitter_id', submissions.submitter_id,
10781040
'file_name', submissions.zip_file_name,
10791041
'status', submissions.status,
10801042
'outcome', submissions.outcome,
10811043
'received_timestamp', submissions.received_timestamp,
10821044
'updated_at', submissions.updated_at,
1083-
'org_name', submitters.org_name,
10841045
'view_modal_content', (
10851046
SELECT COALESCE(json_agg(json_build_object(
10861047
'log_id', submission_logs.log_id,
@@ -1101,7 +1062,7 @@ def get_all_submissions_and_logs():
11011062
ON submitters.submitter_id = submissions.submitter_id
11021063
LEFT JOIN submission_logs
11031064
ON submissions.submission_id = submission_logs.submission_id
1104-
GROUP BY (submissions.submission_id, submitters.org_name)
1065+
GROUP BY (submissions.submission_id, submitters.entity_name)
11051066
ORDER BY submissions.received_timestamp DESC
11061067
"""
11071068
cur = conn.cursor()

0 commit comments

Comments
 (0)