Skip to content

Commit

Permalink
Merge pull request #3530 from GSA-TTS/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@jadudm
jadudm authored Mar 19, 2024
2 parents 1d2fae2 + 52d30fb commit 2cf3607
Show file tree
Hide file tree
Showing 15 changed files with 452 additions and 301 deletions.
14 changes: 14 additions & 0 deletions backend/dissemination/templates/search-alert-performance.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% load sprite_helper %}
<div class="usa-alert usa-alert--warning">
<div class="usa-alert__body">
<h4 class="usa-alert__heading">Warning status</h4>
<p class="usa-alert__text padding-bottom-2">
Audit search is currently limited to UEI-only. You can search your UEI to confirm your audit submission is complete. The PDF report will still be available for download but summary report workbooks won't.
</p>
<p class="usa-alert__text">
For more information, visit
<a href="{{ STATIC_SITE_URL }}status/" target="_blank">the FAC system status page</a>
.
</p>
</div>
</div>
63 changes: 56 additions & 7 deletions backend/dissemination/templates/search.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
{% extends "base.html" %}
{% load static %}
{% load sprite_helper %}

{% comment %}
All input fields besides UEI/EIN are commented out pending a performance investigation and fix.
Summary report downloads are also disabled.
Alerts have been put in place.

To undo this action, complete the following steps.
Search filters:
1. Uncomment the search filters
Warnings:
1. Remove search-alert-performance.html and its imports.
2. Remove the warning banner in header.html
Summary report downloads:
1. Uncomment the summary report download button here
2. Uncomment the SF-SAC download button in summary.html
3. Remove the forced Http404 in SingleSummaryReportDownloadView (dissemination/views.py)

See https://github.com/GSA-TTS/FAC/issues/3526 for more information.
{% endcomment %}

{% block content %}
<div class="desktop:padding-x-10">
<div class="grid-row">
Expand All @@ -22,6 +42,7 @@ <h3>Filters</h3>
<div class="usa-accordion usa-accordion--multiselectable"
data-allow-multiple>
{% comment %} Audit Year {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded="true"
Expand All @@ -38,31 +59,42 @@ <h3>Filters</h3>
</div>
{% endfor %}
</div>
{% endcomment %}

{% comment %} UEI/EIN {% endcomment %}
<label for="uei-or-ein">
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.uei_or_ein %}"true"{% else %}"false"{% endif %}
aria-expanded="true"
{% comment %} aria-expanded={% if form_user_input.uei_or_ein %}"true"{% else %}"false"{% endif %} {% endcomment %}
aria-controls="uei-or-ein">UEI or EIN</button>
</label>
<textarea class="usa-textarea" id="uei-or-ein" name="uei_or_ein">{{form_user_input.uei_or_ein}}</textarea>
<textarea class="usa-textarea width-card-lg" id="uei-or-ein" name="uei_or_ein">{{form_user_input.uei_or_ein}}</textarea>

{% comment %} ALN/CFDA {% endcomment %}
{% comment %}
<label for="aln">
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.aln %}"true"{% else %}"false"{% endif %}
aria-controls="aln">Assistance Listing Number (formerly CFDA)</button>
</label>
<textarea class="usa-textarea" id="aln" name="aln">{{form_user_input.aln}}</textarea>
{% endcomment %}

{% comment %} Name {% endcomment %}
{% comment %}
<label for="entity-name">
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.entity_name %}"true"{% else %}"false"{% endif %}
aria-controls="entity-name">Name (Entity, Auditee, or Auditor)</button>
</label>
<textarea class="usa-textarea" id="entity-name" name="entity_name">{{form_user_input.entity_name}}</textarea>
{% endcomment %}

{% comment %} Release Date(s) {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.start_date or form_user_input.end_date %}"true"{% else %}"false"{% endif %}
Expand Down Expand Up @@ -93,7 +125,10 @@ <h3>Filters</h3>
</div>
</div>
</div>
{% endcomment %}

{% comment %} State {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.auditee_state %}"true"{% else %}"false"{% endif %}
Expand All @@ -111,7 +146,10 @@ <h3>Filters</h3>
{% endfor %}
</select>
</div>
{% endcomment %}

{% comment %} Cog/Over {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.cog_or_oversight %}"true"{% else %}"false"{% endif %}
Expand All @@ -137,7 +175,10 @@ <h3>Filters</h3>
name="agency_name"
value="{{ form_user_input.agency_name }}" />
</div>
{% endcomment %}

{% comment %} Findings {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.findings %}"true"{% else %}"false"{% endif %}
Expand All @@ -154,7 +195,10 @@ <h3>Filters</h3>
</div>
{% endfor %}
</div>
{% endcomment %}

{% comment %} Direct funding {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.direct_funding %}"true"{% else %}"false"{% endif %}
Expand All @@ -171,7 +215,10 @@ <h3>Filters</h3>
</div>
{% endfor %}
</div>
{% endcomment %}

{% comment %} Major program {% endcomment %}
{% comment %}
<button type="button"
class="usa-accordion__button"
aria-expanded={% if form_user_input.major_program %}"true"{% else %}"false"{% endif %}
Expand All @@ -188,15 +235,18 @@ <h3>Filters</h3>
</div>
{% endfor %}
</div>
{% endcomment %}
</div>

{% comment %} Submission {% endcomment %}
{% comment %}
<div class="search-submit">
<input class="usa-button" type="submit" value="Search" />
<input class="usa-button usa-button--unstyled"
type="reset"
value="Reset Search" />
</div>
{% endcomment %}

{% comment %} Hidden page input for use when clicking pagination buttons {% endcomment %}
<input class="usa-input"
Expand All @@ -221,13 +271,15 @@ <h3>Filters</h3>
</div>
<div class="grid-col audit-search-results">
<h2 class="font-sans-2xl">Search single audit reports</h2>
{% include "search-alert-performance.html"%}
{% include "search-alert-info.html"%}
{% if results|length > 0 %}
{% include "search-alert-info.html"%}
<div class="margin-y-2 grid-row display-flex flex-justify">
<p class="margin-0 flex-align-self-center">
<strong>Results: {{ results_count }}</strong>
<span class="margin-left-2 text-normal text-italic">showing {{ limit }} per page</span>
</p>
{% comment %}
{% if results_count <= summary_report_download_limit %}
<button class="usa-button display-flex"
formaction="{% url 'dissemination:MultipleSummaryReportDownload' %}"
Expand All @@ -241,6 +293,7 @@ <h2 class="font-sans-2xl">Search single audit reports</h2>
<p class="margin-0">Download all</p>
</button>
{% endif %}
{% endcomment %}
</div>

<div class="usa-table-container--scrollable margin-0" tabindex="0">
Expand Down Expand Up @@ -377,9 +430,6 @@ <h2 class="font-sans-2xl">Search single audit reports</h2>
</ul>
</nav>
{% elif results is not None %}
{% include "search-alert-info.html"%}
<div class="usa-alert usa-alert--info">
</div>
<div class="search-instructions">
<img src="{% static 'img/circle-arrow.svg' %}"
alt="an arrow points left, toward the search form" />
Expand All @@ -388,7 +438,6 @@ <h2 class="font-sans-2xl">Search single audit reports</h2>
</p>
</div>
{% else %}
{% include "search-alert-info.html"%}
<div class="search-instructions">
<img src="{% static 'img/circle-arrow.svg' %}"
alt="an arrow points left, toward the search form" />
Expand Down
2 changes: 2 additions & 0 deletions backend/dissemination/templates/summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
</div>
<div class="grid-col-12 tablet:grid-col-5 tablet:display-flex flex-column tablet:flex-justify-end">
<div class="margin-0 flex-align-self-end margin-top-2">
{% comment %}
<a class="usa-button display-flex font-sans-xl margin-bottom-2"
href="{% url 'dissemination:SummaryReportDownload' report_id=report_id %}"
target="_blank">
Expand All @@ -41,6 +42,7 @@
</svg>
<p class="margin-0">SF-SAC</p>
</a>
{% endcomment %}
{% if general.is_public or include_private %}
<a class="usa-button display-flex font-sans-xl"
href="{% url 'dissemination:PdfDownload' report_id=report_id %}"
Expand Down
4 changes: 4 additions & 0 deletions backend/dissemination/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,10 @@ def get(self, request, report_id):
Given a report_id in the URL, generate the summary report in S3 and
redirect to its download link.
"""
raise Http404(
"SF-SAC downloads are temporarily disabled. See the FAC status page for more details."
)

sac = get_object_or_404(General, report_id=report_id)
include_private = include_private_results(request)
filename = generate_summary_report([sac.report_id], include_private)
Expand Down
0 backend/static/img/fac-full-logo.png → backend/static/img/fac-gov-logo.png
View file
File renamed without changes
0 backend/static/img/fac-full-logo.svg → backend/static/img/fac-gov-logo.svg
View file
File renamed without changes
7 changes: 7 additions & 0 deletions backend/static/img/fac-logo-full.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added backend/static/img/home/search_for_audits.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added backend/static/img/home/submit_an_audit.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 50 additions & 47 deletions backend/static/scss/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,78 @@
.usa-header--basic .usa-nav-container {
align-items: center;
}
}

.usa-menu-btn {
background-color: color('primary-darker');
}

.usa-header--basic .usa-navbar {
width: 25%;
.search-alert-banner {
background-color: color('gold-5v');
font-size: .88rem;
padding-block: .2rem;
}

.usa-nav__primary button {
padding: 1rem;
padding-left: .5;

span {
padding-right: .5rem;
}
}

.sign-in,
.sign-out {
background-color: color('primary-darker');
padding: 1em;
.usa-header {
background-color: #f3f9fe;

.usa-logo em {
&::before {
content: url('../img/fac-logo-full.svg');
}
}
}

.usa-menu-btn {
background-color: color('primary-darker');
.usa-logo-link,
.usa-logo-link:active,
.usa-logo-link:visited {
color: color('primary-darker');
text-decoration: none;
}

.usa-nav-container-links {
background: linear-gradient(to right, #DFF0F6 0%, rgb(223 240 246 / 0%) 87.5%);
}

.sign-in-logo,
.sign-in-logo:active,
.sign-in-logo:visited {
color: #fff;
.usa-nav-container-links.is-visible {
background-color: #f3f9fe;
}

.sign-in,
.sign-in:active,
.sign-in:visited {
color: color('primary-darker');
font-size: 0.88rem;
font-weight: bold;
line-height: 1.1rem;
margin: 0;
display: inline-block;
padding: 0.75rem 0 0.75rem 2.1rem;
text-decoration: none;
background-image: url('../img/usa-icons/account_circle.svg');
background-position: 0 50%;
background-repeat: no-repeat;
background-size: 2rem;

span {
font-weight: normal;
display: block;
}

svg {
transform: rotate(270deg);
transform-box: fill-box;
transform-origin: center;
}
}

.sign-out {
padding: 1.8rem 2.8rem 1.8rem 1.4rem;
padding: 1.4rem;
background-color: color('primary-darker');

button {
color: #fff;
Expand Down Expand Up @@ -79,32 +111,3 @@
}
}
}

.sign-out button:hover,
.sign-in-logo:hover {
text-decoration: underline;
}

.sign-in-logo::before {
// content: url('../img/usa-icons/account_circle.svg');
display: block;
float: left;
}

.usa-header {
background-color: #f3f9fe;

.usa-accordion__button {
color: #171717
};

a.usa-nav-link {
color: #171717
};
}

.fac-beta-banner {
background-color: color('gold-5v');
font-size: .88rem;
padding-block: .2rem;
}
Loading

0 comments on commit 2cf3607

Please sign in to comment.