-
-
+
+ {% comment %} The grey box of doom {% endcomment %}
+ {{ auditee_name }} ({{ auditee_uei }})
-- Report ID:{{ report_id }} + {% comment %} Title & Header {% endcomment %} +
+
+
+
+
+
+
+
- + Report ID: {{ report_id }}
- Submission date:{{ general.submitted_date }} + Submission date: {{ general.submitted_date }}
- Fiscal Year:{{ general.fy_start_date }} to {{ general.fy_end_date }} + Fiscal Year: {{ general.fy_start_date }} to {{ general.fy_end_date }}
-
+ General Information
-
-
+
- {% for k, v in general.items %}
-
- - {{ k|field_name_to_label }}: {{ v }} -
- {% endfor %} -
+
- {% for section_key, section_list in data.items %}
-
+
-
-
- {% endfor %}
-
+ {{ section_key }}
- | - {{ section_list|length }} - -
-
-
-
-
- | {{ k|field_name_to_label }} | {% endfor %} -|
|---|---|
| - | - {% else %} -{{ v }} | - {% endif %} - {% endfor %} -
+
- {% include "audit-metadata.html" %}
{% endblock content %}
diff --git a/backend/dissemination/templatetags/getkey.py b/backend/dissemination/templatetags/getkey.py
new file mode 100644
index 0000000000..39075e0927
--- /dev/null
+++ b/backend/dissemination/templatetags/getkey.py
@@ -0,0 +1,14 @@
+"""
+Custom tag to pull a key with a space out of a dictionary.
+Example:
+{{ data.'Notes to SEFA' }} does not work.
+Instead, {{ data|getkey:"Notes to SEFA" }}
+"""
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name="getkey")
+def getkey(value, arg):
+ return value.get(arg, [])
diff --git a/backend/dissemination/test_search.py b/backend/dissemination/test_search.py
index 013fbaf744..e17e9cc46d 100644
--- a/backend/dissemination/test_search.py
+++ b/backend/dissemination/test_search.py
@@ -251,5 +251,3 @@ def test_audit_year(self):
audit_years=[2020, 2021, 2022],
)
self.assertEqual(len(results), 3)
-
- return
diff --git a/backend/dissemination/tests.py b/backend/dissemination/tests.py
index 92b72c0807..86607de84e 100644
--- a/backend/dissemination/tests.py
+++ b/backend/dissemination/tests.py
@@ -13,7 +13,6 @@
from dissemination.models import (
General,
FederalAward,
- Passthrough,
Finding,
FindingText,
CapText,
@@ -124,7 +123,6 @@ def test_summary_context(self):
"""
baker.make(General, report_id="2022-12-GSAFAC-0000000001", is_public=True)
award = baker.make(FederalAward, report_id="2022-12-GSAFAC-0000000001")
- passthrough = baker.make(Passthrough, report_id="2022-12-GSAFAC-0000000001")
finding = baker.make(Finding, report_id="2022-12-GSAFAC-0000000001")
finding_text = baker.make(FindingText, report_id="2022-12-GSAFAC-0000000001")
cap_text = baker.make(CapText, report_id="2022-12-GSAFAC-0000000001")
@@ -139,10 +137,6 @@ def test_summary_context(self):
response.context["data"]["Awards"][0]["additional_award_identification"],
award.additional_award_identification,
)
- self.assertEquals(
- response.context["data"]["Passthrough Entities"][0]["award_reference"],
- passthrough.award_reference,
- )
self.assertEquals(
response.context["data"]["Audit Findings"][0]["reference_number"],
finding.reference_number,
@@ -158,6 +152,6 @@ def test_summary_context(self):
cap_text.contains_chart_or_table,
)
self.assertEquals(
- response.context["data"]["Notes"][0]["accounting_policies"],
+ response.context["data"]["Notes to SEFA"][0]["accounting_policies"],
note.accounting_policies,
)
diff --git a/backend/dissemination/views.py b/backend/dissemination/views.py
index 6ed9a7717c..a51e6a15a9 100644
--- a/backend/dissemination/views.py
+++ b/backend/dissemination/views.py
@@ -1,4 +1,5 @@
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import BadRequest, PermissionDenied
+from django.core.paginator import Paginator
from django.http import Http404
from django.shortcuts import get_object_or_404, redirect, render
from django.views.generic import View
@@ -11,11 +12,13 @@
from dissemination.models import (
General,
FederalAward,
- Passthrough,
Finding,
FindingText,
CapText,
Note,
+ SecondaryAuditor,
+ AdditionalEin,
+ AdditionalUei,
)
@@ -28,6 +31,7 @@ def get(self, request, *args, **kwargs):
def post(self, request, *args, **kwargs):
form = SearchForm(request.POST)
results = []
+ context = {}
if form.is_valid():
names = form.cleaned_data["entity_name"].splitlines()
@@ -40,6 +44,11 @@ def post(self, request, *args, **kwargs):
int(year) for year in form.cleaned_data["audit_year"]
] # Cast strings from HTML to int
+ # TODO: Add a limit choice field to the form
+ limit = form.cleaned_data["limit"] or 30
+ # Changed in the form via pagination links
+ page = form.cleaned_data["page"] or 1
+
results = search_general(
names,
uei_or_eins,
@@ -49,13 +58,32 @@ def post(self, request, *args, **kwargs):
agency_name,
audit_years,
)
+ results_count = results.count() # Total result count
+ paginator = Paginator(
+ results, per_page=limit
+ ) # Paginator object handles results splicing, page count, and pagination buttons
+ results = paginator.get_page(page) # Results for a given page
+ results.adjusted_elided_pages = paginator.get_elided_page_range(
+ page, on_each_side=1
+ ) # Pagination buttons, adjust ellipses around the current page
+
# Reformat these so the date-picker elements in HTML prepopulate
if form.cleaned_data["start_date"]:
form.cleaned_data["start_date"] = start_date.strftime("%Y-%m-%d")
if form.cleaned_data["end_date"]:
form.cleaned_data["end_date"] = end_date.strftime("%Y-%m-%d")
+ else:
+ raise BadRequest("Form data validation error.", form.errors)
+
+ context = context | {
+ "form": form,
+ "limit": limit,
+ "results": results,
+ "results_count": results_count,
+ "page": page,
+ }
- return render(request, "search.html", {"form": form, "results": results})
+ return render(request, "search.html", context)
class AuditSummaryView(View):
@@ -97,11 +125,13 @@ def get_audit_content(self, report_id):
further. I.e. remove DB ids or something.
"""
awards = FederalAward.objects.filter(report_id=report_id)
- passthrough_entities = Passthrough.objects.filter(report_id=report_id)
audit_findings = Finding.objects.filter(report_id=report_id)
audit_findings_text = FindingText.objects.filter(report_id=report_id)
corrective_action_plan = CapText.objects.filter(report_id=report_id)
notes_to_sefa = Note.objects.filter(report_id=report_id)
+ secondary_auditors = SecondaryAuditor.objects.filter(report_id=report_id)
+ additional_ueis = AdditionalUei.objects.filter(report_id=report_id)
+ additional_eins = AdditionalEin.objects.filter(report_id=report_id)
data = {}
@@ -109,8 +139,8 @@ def get_audit_content(self, report_id):
x for x in awards.values()
] # Take QuerySet to a list of objects
- if passthrough_entities.exists():
- data["Passthrough Entities"] = [x for x in passthrough_entities.values()]
+ if notes_to_sefa.exists():
+ data["Notes to SEFA"] = [x for x in notes_to_sefa.values()]
if audit_findings.exists():
data["Audit Findings"] = [x for x in audit_findings.values()]
if audit_findings_text.exists():
@@ -119,13 +149,12 @@ def get_audit_content(self, report_id):
data["Corrective Action Plan"] = [
x for x in corrective_action_plan.values()
]
- if notes_to_sefa.exists():
- data["Notes"] = [x for x in notes_to_sefa.values()]
-
- for key in data:
- for item in data[key]:
- del item["id"]
- del item["report_id"]
+ if secondary_auditors.exists():
+ data["Secondary Auditors"] = [x for x in secondary_auditors.values()]
+ if additional_ueis.exists():
+ data["Additional UEIs"] = [x for x in additional_ueis.values()]
+ if additional_eins.exists():
+ data["Additional EINs"] = [x for x in additional_eins.values()]
return data
diff --git a/backend/dissemination/workbooklib/additional_eins.py b/backend/dissemination/workbooklib/additional_eins.py
index 58eecdc6a2..a0d46316bb 100644
--- a/backend/dissemination/workbooklib/additional_eins.py
+++ b/backend/dissemination/workbooklib/additional_eins.py
@@ -8,7 +8,6 @@
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
import openpyxl as pyxl
@@ -29,7 +28,6 @@ def generate_additional_eins(dbkey, year, outfile):
wb = pyxl.load_workbook(templates["AdditionalEINs"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "additional-eins-workbook")
addl_eins = Eins.select().where(Eins.dbkey == g.dbkey)
map_simple_columns(wb, mappings, addl_eins)
diff --git a/backend/dissemination/workbooklib/additional_ueis.py b/backend/dissemination/workbooklib/additional_ueis.py
index 52d3952d0b..98fb382116 100644
--- a/backend/dissemination/workbooklib/additional_ueis.py
+++ b/backend/dissemination/workbooklib/additional_ueis.py
@@ -8,7 +8,6 @@
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
import openpyxl as pyxl
@@ -28,7 +27,6 @@ def generate_additional_ueis(dbkey, year, outfile):
Gen = dynamic_import("Gen", year)
wb = pyxl.load_workbook(templates["AdditionalUEIs"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "additional-ueis-workbook")
if int(year) >= 22:
Ueis = dynamic_import("Ueis", year)
addl_ueis = Ueis.select().where(Ueis.dbkey == g.dbkey)
diff --git a/backend/dissemination/workbooklib/corrective_action_plan.py b/backend/dissemination/workbooklib/corrective_action_plan.py
index 049fa19534..febde0382d 100644
--- a/backend/dissemination/workbooklib/corrective_action_plan.py
+++ b/backend/dissemination/workbooklib/corrective_action_plan.py
@@ -8,7 +8,6 @@
test_pfix,
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
@@ -33,7 +32,6 @@ def generate_corrective_action_plan(dbkey, year, outfile):
]
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "corrective-action-plan-workbook")
captexts = Captext.select().where(Captext.dbkey == g.dbkey)
diff --git a/backend/dissemination/workbooklib/excel_creation.py b/backend/dissemination/workbooklib/excel_creation.py
index becac8b609..6e2dc21207 100644
--- a/backend/dissemination/workbooklib/excel_creation.py
+++ b/backend/dissemination/workbooklib/excel_creation.py
@@ -6,7 +6,6 @@
import logging
from datetime import date
from config import settings
-import re
import json
logger = logging.getLogger(__name__)
@@ -211,12 +210,3 @@ def extract_metadata(sheet_json, range):
if ("range_name" in scell) and (scell["range_name"] == range):
result = scell["formula"]
return result
-
-
-def insert_version_and_sheet_name(wb, sheet_json):
- ver_cell = extract_metadata(sheet_json, "version")
- ver_re = re.search('"(.*?)"', ver_cell)[1]
- wb_name_cell = extract_metadata(sheet_json, "section_name")
- wb_name_re = re.search('"(.*?)"', wb_name_cell)[1]
- set_single_cell_range(wb, "version", ver_re)
- set_single_cell_range(wb, "section_name", wb_name_re)
diff --git a/backend/dissemination/workbooklib/federal_awards.py b/backend/dissemination/workbooklib/federal_awards.py
index fe19b012af..24f6d71e99 100644
--- a/backend/dissemination/workbooklib/federal_awards.py
+++ b/backend/dissemination/workbooklib/federal_awards.py
@@ -9,7 +9,6 @@
set_range,
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
from config import settings
@@ -78,20 +77,32 @@ def int_or_na(o):
def _generate_cluster_names(Cfda, cfdas, valid_json):
cluster_names = []
+ state_cluster_names = []
other_cluster_names = []
cfda: Cfda
for cfda in cfdas:
if cfda.clustername is None:
cluster_names.append("N/A")
other_cluster_names.append("")
+ state_cluster_names.append("")
+ elif cfda.clustername == "STATE CLUSTER":
+ cluster_names.append(cfda.clustername)
+ state_cluster_names.append(cfda.stateclustername)
+ other_cluster_names.append("")
+ elif cfda.clustername == "OTHER CLUSTER NOT LISTED ABOVE":
+ cluster_names.append(cfda.clustername)
+ other_cluster_names.append(cfda.otherclustername)
+ state_cluster_names.append("")
elif cfda.clustername in valid_json["cluster_names"]:
cluster_names.append(cfda.clustername)
other_cluster_names.append("")
+ state_cluster_names.append("")
else:
logger.debug(f"Cluster {cfda.clustername} not in the list. Replacing.")
cluster_names.append("OTHER CLUSTER NOT LISTED ABOVE")
other_cluster_names.append(f"{cfda.clustername}")
- return (cluster_names, other_cluster_names)
+ state_cluster_names.append("")
+ return (cluster_names, other_cluster_names, state_cluster_names)
def _fix_addl_award_identification(Cfda, cfdas, dbkey):
@@ -190,7 +201,6 @@ def generate_federal_awards(dbkey, year, outfile):
# In sheet : in DB
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "federal-awards-workbook")
cfdas = Cfda.select().where(Cfda.dbkey == dbkey).order_by(Cfda.index)
map_simple_columns(wb, mappings, cfdas)
@@ -199,10 +209,8 @@ def generate_federal_awards(dbkey, year, outfile):
# they wanted.
valid_file = open(f"{settings.BASE_DIR}/schemas/source/base/ClusterNames.json")
valid_json = json.load(valid_file)
- # This was removed from the CSV...
- valid_json["cluster_names"].append("STATE CLUSTER")
- (cluster_names, other_cluster_names) = _generate_cluster_names(
+ (cluster_names, other_cluster_names, state_cluster_names) = _generate_cluster_names(
Cfda, cfdas, valid_json
)
set_range(wb, "cluster_name", cluster_names)
@@ -220,6 +228,20 @@ def generate_federal_awards(dbkey, year, outfile):
# We need a `cfda_key` as a magic column for the summation logic to work/be checked.
set_range(wb, "cfda_key", full_cfdas, conversion_fun=str)
+ # We need `uniform_state_cluster_name` and `uniform_other_cluster_name` magic columns for cluster summation logic to work/be checked.
+ set_range(
+ wb,
+ "uniform_state_cluster_name",
+ [s.strip().upper() for s in state_cluster_names],
+ conversion_fun=str,
+ )
+ set_range(
+ wb,
+ "uniform_other_cluster_name",
+ [s.strip().upper() for s in other_cluster_names],
+ conversion_fun=str,
+ )
+
(passthrough_names, passthrough_ids) = _fix_passthroughs(
Cfda, Passthrough, cfdas, dbkey
)
diff --git a/backend/dissemination/workbooklib/findings.py b/backend/dissemination/workbooklib/findings.py
index 453b800739..54e767a030 100644
--- a/backend/dissemination/workbooklib/findings.py
+++ b/backend/dissemination/workbooklib/findings.py
@@ -7,7 +7,6 @@
set_range,
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
@@ -55,11 +54,40 @@ def sorted_string(s):
"N/A",
str,
),
- # FIXME: We have to calculate, and patch in, is_valid
- # is_valid is computed in the workbook
]
+def _get_findings_grid(findings_list):
+ # The original copy of allowed_combos is in audit/intakelib/checks/check_findings_grid_validation.py
+ allowed_combos = {
+ "YNNNN",
+ "YNYNN",
+ "YNNYN",
+ "NYNNN",
+ "NYYNN",
+ "NYNYN",
+ "NNYNN",
+ "NNNYN",
+ "NNNNY",
+ }
+
+ attributes = [
+ "modifiedopinion",
+ "othernoncompliance",
+ "materialweakness",
+ "significantdeficiency",
+ "otherfindings",
+ ]
+
+ return [
+ "Y"
+ if "".join((getattr(finding, attr, "") or "").strip() for attr in attributes)
+ in allowed_combos
+ else "N"
+ for finding in findings_list
+ ]
+
+
def generate_findings(dbkey, year, outfile):
logger.info(f"--- generate findings {dbkey} {year} ---")
Gen = dynamic_import("Gen", year)
@@ -67,7 +95,6 @@ def generate_findings(dbkey, year, outfile):
Cfda = dynamic_import("Cfda", year)
wb = pyxl.load_workbook(templates["AuditFindings"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "federal-awards-audit-findings-workbook")
cfdas = Cfda.select().where(Cfda.dbkey == g.dbkey).order_by(Cfda.index)
# For each of them, I need to generate an elec -> award mapping.
@@ -88,6 +115,9 @@ def generate_findings(dbkey, year, outfile):
map_simple_columns(wb, mappings, findings)
set_range(wb, "award_reference", award_references)
+ grid = _get_findings_grid(findings)
+ # We need a magic "is_valid" column, which is computed in the workbook.
+ set_range(wb, "is_valid", grid, conversion_fun=str)
wb.save(outfile)
table = generate_dissemination_test_table(
diff --git a/backend/dissemination/workbooklib/findings_text.py b/backend/dissemination/workbooklib/findings_text.py
index 89a9711093..afbdeeb76a 100644
--- a/backend/dissemination/workbooklib/findings_text.py
+++ b/backend/dissemination/workbooklib/findings_text.py
@@ -8,7 +8,6 @@
test_pfix,
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
import openpyxl as pyxl
@@ -33,7 +32,6 @@ def generate_findings_text(dbkey, year, outfile):
wb = pyxl.load_workbook(templates["AuditFindingsText"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "audit-findings-text-workbook")
ftexts = Findingstext.select().where(Findingstext.dbkey == g.dbkey)
map_simple_columns(wb, mappings, ftexts)
diff --git a/backend/dissemination/workbooklib/notes_to_sefa.py b/backend/dissemination/workbooklib/notes_to_sefa.py
index fe6c0e6649..ac2cf5eee8 100644
--- a/backend/dissemination/workbooklib/notes_to_sefa.py
+++ b/backend/dissemination/workbooklib/notes_to_sefa.py
@@ -9,7 +9,6 @@
)
from dissemination.workbooklib.excel_creation import (
- insert_version_and_sheet_name,
set_range,
)
from dissemination.workbooklib.census_models.census import dynamic_import
@@ -47,7 +46,6 @@ def generate_notes_to_sefa(dbkey, year, outfile):
wb = pyxl.load_workbook(templates["SEFA"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "notes-to-sefa-workbook")
# The mapping is weird.
# https://facdissem.census.gov/Documents/DataDownloadKey.xlsx
diff --git a/backend/dissemination/workbooklib/secondary_auditors.py b/backend/dissemination/workbooklib/secondary_auditors.py
index 090151e146..fadc77711e 100644
--- a/backend/dissemination/workbooklib/secondary_auditors.py
+++ b/backend/dissemination/workbooklib/secondary_auditors.py
@@ -7,7 +7,6 @@
test_pfix,
)
-from dissemination.workbooklib.excel_creation import insert_version_and_sheet_name
from dissemination.workbooklib.census_models.census import dynamic_import
@@ -58,7 +57,6 @@ def generate_secondary_auditors(dbkey, year, outfile):
wb = pyxl.load_workbook(templates["SecondaryAuditors"])
g = set_uei(Gen, wb, dbkey)
- insert_version_and_sheet_name(wb, "secondary-auditors-workbook")
sec_cpas = Cpas.select().where(Cpas.dbkey == g.dbkey)
diff --git a/backend/excel_templates/CorrectiveActionPlanTemplate2019-2022.xlsx b/backend/excel_templates/CorrectiveActionPlanTemplate2019-2022.xlsx
deleted file mode 100644
index c336470e9f..0000000000
Binary files a/backend/excel_templates/CorrectiveActionPlanTemplate2019-2022.xlsx and /dev/null differ
diff --git a/backend/excel_templates/FederalAwardsExpendedTemplateUG2019.xlsx b/backend/excel_templates/FederalAwardsExpendedTemplateUG2019.xlsx
deleted file mode 100644
index c526114687..0000000000
Binary files a/backend/excel_templates/FederalAwardsExpendedTemplateUG2019.xlsx and /dev/null differ
diff --git a/backend/excel_templates/FindingsText2019-2022.xlsx b/backend/excel_templates/FindingsText2019-2022.xlsx
deleted file mode 100644
index 8e1e52da09..0000000000
Binary files a/backend/excel_templates/FindingsText2019-2022.xlsx and /dev/null differ
diff --git a/backend/excel_templates/FindingsUniformGuidanceTemplate2019-2022.xlsx b/backend/excel_templates/FindingsUniformGuidanceTemplate2019-2022.xlsx
deleted file mode 100644
index 4b1d285924..0000000000
Binary files a/backend/excel_templates/FindingsUniformGuidanceTemplate2019-2022.xlsx and /dev/null differ
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 97858ef217..672c354c11 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -40,7 +40,6 @@ exclude_dirs = [
"audit/test_validators.py",
"node_modules",
"dissemination/test_search.py",
- "dissemination/tests.py",
]
[tool.djlint]
diff --git a/backend/report_submission/storages.py b/backend/report_submission/storages.py
index 2acb85004d..e3022a8df1 100644
--- a/backend/report_submission/storages.py
+++ b/backend/report_submission/storages.py
@@ -13,4 +13,5 @@ class S3PrivateStorage(S3Boto3Storage):
bucket_name = settings.AWS_PRIVATE_STORAGE_BUCKET_NAME
access_key = settings.AWS_PRIVATE_ACCESS_KEY_ID
secret_key = settings.AWS_PRIVATE_SECRET_ACCESS_KEY
+ default_acl = settings.AWS_PRIVATE_DEFAULT_ACL
location = ""
diff --git a/backend/schemas/output/excel/json/additional-eins-workbook.json b/backend/schemas/output/excel/json/additional-eins-workbook.json
index 13e4f0628b..16de065a52 100644
--- a/backend/schemas/output/excel/json/additional-eins-workbook.json
+++ b/backend/schemas/output/excel/json/additional-eins-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"AdditionalEins\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "AdditionalEins",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/additional-ueis-workbook.json b/backend/schemas/output/excel/json/additional-ueis-workbook.json
index 35be3b3bd5..2e908dbc18 100644
--- a/backend/schemas/output/excel/json/additional-ueis-workbook.json
+++ b/backend/schemas/output/excel/json/additional-ueis-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"AdditionalUeis\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "AdditionalUeis",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/audit-findings-text-workbook.json b/backend/schemas/output/excel/json/audit-findings-text-workbook.json
index fcbdbb9bf7..b945052611 100644
--- a/backend/schemas/output/excel/json/audit-findings-text-workbook.json
+++ b/backend/schemas/output/excel/json/audit-findings-text-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"FindingsText\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "FindingsText",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/corrective-action-plan-workbook.json b/backend/schemas/output/excel/json/corrective-action-plan-workbook.json
index 6f94975b68..b7f45277b9 100644
--- a/backend/schemas/output/excel/json/corrective-action-plan-workbook.json
+++ b/backend/schemas/output/excel/json/corrective-action-plan-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"CorrectiveActionPlan\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "CorrectiveActionPlan",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json b/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json
index e8e0085638..f1ef772e6c 100644
--- a/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json
+++ b/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"FindingsUniformGuidance\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "FindingsUniformGuidance",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/federal-awards-workbook.json b/backend/schemas/output/excel/json/federal-awards-workbook.json
index 12666aee9d..5012ef02f6 100644
--- a/backend/schemas/output/excel/json/federal-awards-workbook.json
+++ b/backend/schemas/output/excel/json/federal-awards-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"FederalAwardsExpended\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "FederalAwardsExpended",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/notes-to-sefa-workbook.json b/backend/schemas/output/excel/json/notes-to-sefa-workbook.json
index 904f770e5a..d7b22087d8 100644
--- a/backend/schemas/output/excel/json/notes-to-sefa-workbook.json
+++ b/backend/schemas/output/excel/json/notes-to-sefa-workbook.json
@@ -31,7 +31,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -45,11 +44,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"NotesToSefa\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -63,6 +62,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "NotesToSefa",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/json/secondary-auditors-workbook.json b/backend/schemas/output/excel/json/secondary-auditors-workbook.json
index 224270d9c5..4dda398239 100644
--- a/backend/schemas/output/excel/json/secondary-auditors-workbook.json
+++ b/backend/schemas/output/excel/json/secondary-auditors-workbook.json
@@ -29,7 +29,6 @@
"single_cells": [
{
"format": "text",
- "formula": "=\"1.0.2\"",
"help": {
"link": "https://fac.gov/documentation/validation/#plain_text",
"text": "Only plain text is allowed, no emoji, formatting, or other special additions"
@@ -43,11 +42,11 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "1.0.3",
"width": 48
},
{
"format": "text",
- "formula": "=\"SecondaryAuditors\"",
"help": {
"link": "https://fac.gov/documentation/validation/#section_name",
"text": "The workbook you tried to upload is for a different section."
@@ -61,6 +60,7 @@
"validation": {
"type": "NOVALIDATION"
},
+ "value": "SecondaryAuditors",
"width": 48
},
{
diff --git a/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx b/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx
index 10f50d2b9b..d7976d5900 100644
Binary files a/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx and b/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx b/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx
index ec85bf1fb6..a93d06e528 100644
Binary files a/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx and b/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx b/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx
index 63a2a61738..d4b99dbba9 100644
Binary files a/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx and b/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx b/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx
index 3d514c7306..37183107db 100644
Binary files a/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx and b/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx b/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx
index f7f7b163a9..2651a6b4fe 100644
Binary files a/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx and b/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx b/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx
index 3df883a8ff..1cca51fb80 100644
Binary files a/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx and b/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx b/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx
index 86ba5413a9..df5eebb4bd 100644
Binary files a/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx and b/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx differ
diff --git a/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx b/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx
index 995f46636d..9bd8ab0986 100644
Binary files a/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx and b/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx differ
diff --git a/backend/schemas/scripts/parse.py b/backend/schemas/scripts/parse.py
index 3f48e70c75..83d5870219 100644
--- a/backend/schemas/scripts/parse.py
+++ b/backend/schemas/scripts/parse.py
@@ -15,13 +15,13 @@
Sheet = NT(
"Sheet",
- "name single_cells meta_cells open_ranges header_inclusion text_ranges header_height row_height hide_col_from hide_row_from",
+ "name single_cells meta_cells open_ranges text_ranges header_height row_height hide_col_from hide_row_from",
)
Posn = NT(
"Posn",
"title title_cell range_name range_cell width keep_locked format last_range_cell",
)
-SingleCell = NT("SingleCell", "posn validation formula help")
+SingleCell = NT("SingleCell", "posn validation formula help value")
MetaCell = NT("MetaCell", "posn formula help")
MergeableCell = NT("MergeableCell", "start_row end_row start_column end_column")
MergedUnreachable = NT("MergedUnreachable", "columns")
@@ -85,6 +85,7 @@ def parse_single_cell(spec):
parse_validation(get(spec, "validation")),
get(spec, "formula"),
parse_help(get(spec, "help")),
+ get(spec, "value", default=None),
)
@@ -163,7 +164,7 @@ def parse_text_range(spec):
def parse_sheet(spec): # noqa: C901
- sc, mtc, opr, hi, tr = None, None, None, None, None
+ sc, mtc, opr, tr = None, None, None, None
name = get(spec, "name", default="Unnamed Sheet")
if "single_cells" in spec:
sc = list(map(parse_single_cell, get(spec, "single_cells", default=[])))
@@ -177,10 +178,6 @@ def parse_sheet(spec): # noqa: C901
opr = list(map(parse_open_range, get(spec, "open_ranges", default=[])))
else:
opr = []
- if "header_inclusion" in spec:
- hi = parse_header_inclusion(get(spec, "header_inclusion"))
- else:
- hi = HeaderInclusion([])
if "text_ranges" in spec:
tr = list(map(parse_text_range, get(spec, "text_ranges", default=[])))
else:
@@ -201,7 +198,7 @@ def parse_sheet(spec): # noqa: C901
hrf = get(spec, "hide_row_from")
else:
hrf = None
- return Sheet(name, sc, mtc, opr, hi, tr, hh, rh, hcf, hrf)
+ return Sheet(name, sc, mtc, opr, tr, hh, rh, hcf, hrf)
def parse_spec(spec):
diff --git a/backend/schemas/scripts/render.py b/backend/schemas/scripts/render.py
index 6ab011968a..5c23b5fe2e 100644
--- a/backend/schemas/scripts/render.py
+++ b/backend/schemas/scripts/render.py
@@ -26,7 +26,7 @@
"name,column,label_row,range_start_row,range_start,abs_range_start,full_range",
)
-MAX_ROWS = 5000
+MAX_ROWS = 10000
XLSX_MAX_ROWS = 1048576 # Excel has a maximum of 1048576 rows
XLSX_MAX_COLS = 16384 # Excel has a maximum of 16384 columns
@@ -98,8 +98,6 @@ def process_spec(WBNT):
unlock_data_entry_cells(WBNT.title_row, ws, sheet)
set_column_widths(wb, ws, sheet)
set_row_heights(wb, ws, sheet)
- if sheet.header_inclusion is not None:
- apply_header_cell_style(ws, sheet.header_inclusion)
set_wb_security(wb, password)
return wb
@@ -374,6 +372,10 @@ def process_single_cells(wb, ws, sheet):
row = int(o.posn.title_cell[1])
ws.row_dimensions[row].height = sheet.header_height
+ if o.value:
+ cell_reference = o.posn.range_cell
+ ws[cell_reference] = o.value
+
def process_meta_cells(wb, ws, sheet):
print("---- process_meta_cells ----")
@@ -429,14 +431,6 @@ def configure_header_cell(ws, r):
the_cell.alignment = Alignment(wrapText=True, wrap_text=True)
-def apply_header_cell_style(ws, additional_header_cells):
- print("---- apply_header_cell_style ----")
- print(additional_header_cells)
- for ahc in additional_header_cells.cells:
- the_cell = ws[ahc]
- the_cell.fill = header_row_fill
-
-
def process_text_ranges(wb, ws, sheet):
print("---- parse_text_ranges ----")
max_width = 72
@@ -462,7 +456,7 @@ def unlock_data_entry_cells(header_row, ws, sheet):
for r in sheet.open_ranges:
if not r.posn.keep_locked:
coords = make_range(r)
- for rowndx in range(coords.range_start_row, MAX_ROWS):
+ for rowndx in range(coords.range_start_row, MAX_ROWS + 1):
cell_reference = f"${coords.column}${rowndx}"
cell = ws[cell_reference]
cell.protection = Protection(locked=False)
diff --git a/backend/schemas/source/excel/libs/Sheets.libsonnet b/backend/schemas/source/excel/libs/Sheets.libsonnet
index 6562838f0e..187b028c94 100644
--- a/backend/schemas/source/excel/libs/Sheets.libsonnet
+++ b/backend/schemas/source/excel/libs/Sheets.libsonnet
@@ -41,7 +41,7 @@ local section_names = {
};
// All workbooks should get the same version number.
-local WORKBOOKS_VERSION = '1.0.2';
+local WORKBOOKS_VERSION = '1.0.3';
{
single_cell: single_cell,
diff --git a/backend/schemas/source/excel/templates/additional-eins-workbook.jsonnet b/backend/schemas/source/excel/templates/additional-eins-workbook.jsonnet
index 8c7424453e..6183ff8232 100644
--- a/backend/schemas/source/excel/templates/additional-eins-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/additional-eins-workbook.jsonnet
@@ -31,7 +31,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.ADDITIONAL_EINS + '"',
+ value: Sheets.section_names.ADDITIONAL_EINS,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/additional-ueis-workbook.jsonnet b/backend/schemas/source/excel/templates/additional-ueis-workbook.jsonnet
index 410e3e5600..65ad75e11d 100644
--- a/backend/schemas/source/excel/templates/additional-ueis-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/additional-ueis-workbook.jsonnet
@@ -31,7 +31,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.ADDITIONAL_UEIS + '"',
+ value: Sheets.section_names.ADDITIONAL_UEIS,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/audit-findings-text-workbook.jsonnet b/backend/schemas/source/excel/templates/audit-findings-text-workbook.jsonnet
index a891ee49e4..82f075f5dd 100644
--- a/backend/schemas/source/excel/templates/audit-findings-text-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/audit-findings-text-workbook.jsonnet
@@ -31,7 +31,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.AUDIT_FINDINGS_TEXT + '"',
+ value: Sheets.section_names.AUDIT_FINDINGS_TEXT,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/corrective-action-plan-workbook.jsonnet b/backend/schemas/source/excel/templates/corrective-action-plan-workbook.jsonnet
index 072ebd3187..931fe75731 100644
--- a/backend/schemas/source/excel/templates/corrective-action-plan-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/corrective-action-plan-workbook.jsonnet
@@ -31,7 +31,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.CORRECTIVE_ACTION_PLAN + '"',
+ value: Sheets.section_names.CORRECTIVE_ACTION_PLAN,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/federal-awards-audit-findings-workbook.jsonnet b/backend/schemas/source/excel/templates/federal-awards-audit-findings-workbook.jsonnet
index 9d6982c95b..ca9e86d911 100644
--- a/backend/schemas/source/excel/templates/federal-awards-audit-findings-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/federal-awards-audit-findings-workbook.jsonnet
@@ -33,7 +33,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -45,7 +45,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.FEDERAL_AWARDS_AUDIT_FINDINGS + '"',
+ value: Sheets.section_names.FEDERAL_AWARDS_AUDIT_FINDINGS,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/federal-awards-workbook.jsonnet b/backend/schemas/source/excel/templates/federal-awards-workbook.jsonnet
index 36d4b5260c..3dc28db39d 100644
--- a/backend/schemas/source/excel/templates/federal-awards-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/federal-awards-workbook.jsonnet
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -55,7 +55,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.FEDERAL_AWARDS + '"',
+ value: Sheets.section_names.FEDERAL_AWARDS,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/notes-to-sefa-workbook.jsonnet b/backend/schemas/source/excel/templates/notes-to-sefa-workbook.jsonnet
index 1a94c9aac7..1899cdb8e7 100644
--- a/backend/schemas/source/excel/templates/notes-to-sefa-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/notes-to-sefa-workbook.jsonnet
@@ -32,7 +32,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -44,7 +44,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.NOTES_TO_SEFA + '"',
+ value: Sheets.section_names.NOTES_TO_SEFA,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/schemas/source/excel/templates/secondary-auditors-workbook.jsonnet b/backend/schemas/source/excel/templates/secondary-auditors-workbook.jsonnet
index ab5f44da1b..87f5663e79 100644
--- a/backend/schemas/source/excel/templates/secondary-auditors-workbook.jsonnet
+++ b/backend/schemas/source/excel/templates/secondary-auditors-workbook.jsonnet
@@ -31,7 +31,7 @@ local single_cells = [
title_cell: 'A2',
range_cell: 'B2',
format: 'text',
- formula: '="' + Sheets.WORKBOOKS_VERSION + '"',
+ value: Sheets.WORKBOOKS_VERSION,
help: Help.plain_text,
validation: SV.NoValidation,
},
@@ -43,7 +43,7 @@ local single_cells = [
title_cell: 'A3',
range_cell: 'B3',
format: 'text',
- formula: '="' + Sheets.section_names.SECONDARY_AUDITORS + '"',
+ value: Sheets.section_names.SECONDARY_AUDITORS,
help: Help.wrong_workbook_template,
validation: SV.NoValidation,
},
diff --git a/backend/static/js/search-results-pagination.js b/backend/static/js/search-results-pagination.js
new file mode 100644
index 0000000000..9a103df2ba
--- /dev/null
+++ b/backend/static/js/search-results-pagination.js
@@ -0,0 +1,38 @@
+var FORM = document.forms[1];
+const pagination_links = document.querySelectorAll('[aria-label^="Page"]');
+const next_page_link = document.querySelectorAll('[aria-label="Next page"]');
+const previous_page_link = document.querySelectorAll(
+ '[aria-label="Previous page"]'
+);
+
+function attachEventHandlers() {
+ // If any pagination links are clicked, set the form element and submit it for a reload
+ pagination_links.forEach((link) => {
+ link.addEventListener('click', (e) => {
+ e.preventDefault();
+ FORM.elements['page'].value = link.textContent;
+ FORM.submit();
+ });
+ });
+ // If the next or previous page buttons are clicked, set the form element to be +/- 1 and submit for a reload
+ if (next_page_link[0]) {
+ next_page_link[0].addEventListener('click', (e) => {
+ e.preventDefault();
+ FORM.elements['page'].value = parseInt(FORM.elements['page'].value) + 1;
+ FORM.submit();
+ });
+ }
+ if (previous_page_link[0]) {
+ previous_page_link[0].addEventListener('click', (e) => {
+ e.preventDefault();
+ FORM.elements['page'].value = parseInt(FORM.elements['page'].value) - 1;
+ FORM.submit();
+ });
+ }
+}
+
+function init() {
+ attachEventHandlers();
+}
+
+window.onload = init;
diff --git a/backend/static/scss/main.scss b/backend/static/scss/main.scss
index 7bebb9a9bc..4e3d7c130b 100644
--- a/backend/static/scss/main.scss
+++ b/backend/static/scss/main.scss
@@ -3,9 +3,11 @@
$theme-font-path: '../fonts',
$theme-image-path: '../img',
$theme-font-type-sans: 'public-sans',
+ $theme-font-weight-semibold: 600,
$theme-type-scale-md: 7,
$theme-type-scale-2xl: 13,
$theme-color-success-lighter: #eef8eb,
+ $theme-color-base-lighter: #efefef,
);
@forward 'uswds';
@use '_home.scss';
diff --git a/backend/templates/audit-metadata.html b/backend/templates/audit-metadata.html
index 203930b3a4..1797cfb12b 100644
--- a/backend/templates/audit-metadata.html
+++ b/backend/templates/audit-metadata.html
@@ -1,4 +1,4 @@
-
+{% comment %} Audit metadata. Included at the bottom of several screens. {% endcomment %}
+
+ {% comment %} Auditee {% endcomment %}
+
+
+
+
+ {% comment %} Auditor {% endcomment %}
+
+
+
+
+ {% comment %} Summary {% endcomment %}
+
+
+
Auditee
+|
+ + Contact Name: {{ general.auditee_contact_name }} + + |
+
+ + Contact title: {{ general.auditee_contact_title }} + + |
+
|
+ + Email: {{ general.auditee_email }} + + |
+
+ + Phone: {{ general.auditee_phone }} + + |
+
|
+ + Address: {{ general.auditee_address_line_1 }} + + |
+
+ + City and state: {{ general.auditee_city }}, {{ general.auditee_state }} + + |
+
|
+ + Zip code: {{ general.auditee_zip }} + + |
+
+ + Additional UEIs? + {% if data|getkey:"Additional UEIs" %} + Y + {% else %} + N + {% endif %} + + {% if not data|getkey:"Additional UEIs" %} + + + Download workbook 6 + + {% else %} + + + Download workbook 6 + + {% endif %} + + |
+
|
+ + EIN: {{ general.auditee_ein }} + + |
+
+ + + Additional EINs? + {% if data|getkey:"Additional EINs" %} + Y + {% else %} + N + {% endif %} + + {% if not data|getkey:"Additional EINs" %} + + + Download workbook 8 + + {% else %} + + + Download workbook 8 + + {% endif %} + + |
+
|
+ + Certifying name: {{ general.auditee_certify_name }} + + |
+
+ + Certifying title: {{ general.auditee_certify_title }} + + |
+
Auditor
+|
+ + Contact Name: {{ general.auditor_contact_name }} + + |
+
+ + Contact title: {{ general.auditor_contact_title }} + + |
+
|
+ + Email: {{ general.auditor_email }} + + |
+
+ + Phone: {{ general.auditor_phone }} + + |
+
|
+ + Address: {{ general.auditor_address_line_1 }} + + |
+
+ + City and state: {{ general.auditor_city }}, {{ general.auditor_state }} + + |
+
|
+ + Zip code: {{ general.auditor_zip }} + + |
+
+ + Secondary Auditors? + {% if data|getkey:"Secondary Auditors" %} + Y + {% else %} + N + {% endif %} + + {% if not data|getkey:"Secondary Auditors" %} + + + Download workbook 7 + + {% else %} + + + Download workbook 7 + + {% endif %} + + |
+
Summary
+|
+ + Federal awards: + {{ data|getkey:"Awards"|length }} + + + + Download workbook 1 + + + |
+
+ + Notes to SEFA: + {{ data|getkey:"Notes to SEFA"|length }} + + {% if not data|getkey:"Notes to SEFA" %} + + + Download workbook 2 + + {% else %} + + + Download workbook 2 + + {% endif%} + + |
+
|
+ + Findings: + {{ data|getkey:"Audit Findings"|length }} + + {% if not data|getkey:"Audit Findings" %} + + + Download workbook 3 + + {% else %} + + + Download workbook 3 + + {% endif %} + + |
+ {% comment %} Findings text - If none, show the gray box with no link. {% endcomment %}
+
+ + Findings text: + {{ data|getkey:"Audit Findings Text"|length }} + + {% if not data|getkey:"Audit Findings Text" %} + + + Download workbook 4 + + {% else %} + + + Download workbook 4 + + {% endif %} + + |
+
|
+ + CAP: + {{ data|getkey:"Corrective Action Plan"|length }} + + {% if not data|getkey:"Corrective Action Plan" %} + + + Download workbook 5 + + {% else %} + + + Download workbook 5 + + {% endif %} + + |
+
+ + Total federal expenditure: + + ${{ general.total_amount_expended|intcomma }} + + + |
+