Summary Updates

backend/config/settings.py

@@ -97,6 +97,7 @@
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
+    "django.contrib.humanize",
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.postgres",

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, [])

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

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,
         )

backend/dissemination/views.py

@@ -11,11 +11,13 @@
 from dissemination.models import (
     General,
     FederalAward,
-    Passthrough,
     Finding,
     FindingText,
     CapText,
     Note,
+    SecondaryAuditor,
+    AdditionalEin,
+    AdditionalUei,
 )
 
 
@@ -97,20 +99,22 @@ 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 = {}
 
         data["Awards"] = [
             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 +123,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
 

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';

backend/templates/audit-metadata.html

@@ -1,4 +1,4 @@
-<!-- Audit metadata. Included at the bottom of several screens. -->
+{% comment %} Audit metadata. Included at the bottom of several screens. {% endcomment %}
 <div class="audit-metadata">
     <div class="grid-container">
         <dl class="grid-row grid-gap">