Skip to content

Commit

Permalink
Merge pull request #4682 from GSA-TTS/main
Browse files Browse the repository at this point in the history
  • Loading branch information
asteel-gsa authored Jan 31, 2025
2 parents 4043867 + fc0fc8b commit ec1e2c7
Show file tree
Hide file tree
Showing 93 changed files with 61,104 additions and 9,873 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-testing-from-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 23
node-version: 20

- name: Install Node dependencies
working-directory: ./backend
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pull-request-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,13 @@ jobs:

# Generate Terraform Plans
terraform-plan:
needs: [check-if-branch-is-ahead-of-main]
if: ${{ github.base_ref == 'main' }}
uses: ./.github/workflows/terraform-plan-env.yml
with:
environment: "dev"
secrets: inherit

terraform-plan-meta:
needs: [check-if-branch-is-ahead-of-main]
if: ${{ github.base_ref == 'main' }}
uses: ./.github/workflows/terraform-plan-env.yml
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing-from-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 23
node-version: 20

- name: Create .env
working-directory: ./backend
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 23
node-version: 20

- name: Install Node dependencies
working-directory: ./backend
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing-from-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 23
node-version: 20

- name: Create .env file
working-directory: ./backend
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 23
node-version: 20

- name: Install Node dependencies
working-directory: ./backend
Expand Down
7 changes: 7 additions & 0 deletions backend/.djlint_rules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Custom rules for HTML linting.
- rule:
name: C001
message: Use spaces, not tabs
flags: re.DOTALL|re.I
patterns:
- \t
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN set -ex && \
FROM pip AS node
WORKDIR /src/

RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs
COPY package*.json /src/
RUN npm ci && \
Expand Down
1 change: 1 addition & 0 deletions backend/audit/intakelib/checks/check_version_number.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"1.1.1",
"1.1.2",
"1.1.3",
"1.1.4",
}


Expand Down
8 changes: 7 additions & 1 deletion backend/audit/models/viewflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,13 @@ def transition_to_ready_for_certification(self):
self.sac.transition_date.append(datetime.datetime.now(datetime.timezone.utc))

@state.transition(
source=STATUS.IN_PROGRESS,
source=[
STATUS.IN_PROGRESS,
STATUS.READY_FOR_CERTIFICATION,
STATUS.AUDITOR_CERTIFIED,
STATUS.AUDITEE_CERTIFIED,
STATUS.CERTIFIED,
],
target=STATUS.FLAGGED_FOR_REMOVAL,
)
def transition_to_flagged_for_removal(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{% comment %}
Alert component, provides resources on what to do/where to go when an expected record isn't listed.
{% endcomment %}
<div class="usa-alert usa-alert--info margin-bottom-3">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">Can't find a report listed here?</h2>

<p class="usa-alert__text padding-bottom-2">
Please have the user with access to the audit submission confirm your user access through the
<a class="usa-link"
href="{{ STATIC_SITE_URL }}audit-resources/user-access/"
target="_blank"
rel="noopener noreferrer">manage user access controls</a>
on the audit submission in question. It may mean that your email address listed on the audit submission doesn't match the email associated with your Login.gov account.
</p>

<a class="usa-button usa-button--outline"
href="https://support.fac.gov/hc/en-us/sections/18797020894989-Submission-Access"
target="_blank"
rel="noopener noreferrer">View more support</a>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{% extends "base.html" %}
{% load static %}
{% load sprite_helper %}
{% block content %}
<div class="grid-container margin-y-6">
<div class="grid-row" id="submission-checklist-summary">
<div class="tablet:grid-col-fill">
<h1 class="font-sans-2xl margin-y-1">
Audit submissions
</h1>
<p class="text-base-darker margin-top-0">View the audit submissions associated with your profile.</p>
</div>
<div>
<button class="usa-button grid-row margin-top-1"
aria-controls="modal-terms-conditions"
id="button-new-audit-submission"
data-open-modal>
<svg class="usa-icon usa-icon--size-3 margin-right-1"
aria-hidden="true"
focusable="false"
role="img">
{% uswds_sprite "add" %}
</svg>
<span>New Audit Submission</span>
</button>
</div>
</div>

{% if data.in_progress_audits|length == 0 and data.completed_audits|length == 0 %}
<p class="margin-bottom-4">No submissions associated with your email address were found.</p>
{% include "./alert_find_report.html" %}
{% else %}
{% if data.in_progress_audits %}
{% include "./table_in_progress.html" %}
{% include "./alert_find_report.html" %}
{% endif %}
{% if data.completed_audits %}
{% include "./table_completed.html" %}
{% endif %}
{% endif %}
{% include "./modal_uei.html" %}
{% include "./modal_new_audit_submission.html" %}
</div>
<script src="{% static 'compiled/js/audit_submissions.js' %}"
type="text/javascript"></script>
{% endblock content %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{% comment %}
Modal content, triggered outside the component. Displays terms and conditions, contains a form post to accept the conditions and start a new audit.
{% endcomment %}
{% load sprite_helper %}
<div class="usa-modal usa-modal--lg flex-justify-start"
id="modal-terms-conditions"
aria-labelledby="modal-terms-conditions-heading"
aria-describedby="modal-terms-conditions-description">
<div class="usa-modal__content">
<div class="padding-x-6 padding-bottom-4">
<h2 class="usa-modal__heading" id="modal-terms-conditions-heading">
New Audit Submission
</h2>
<div id="modal-terms-conditions-description">
<p class="text-bold">
Please review the Federal Audit Clearinghouse Terms and Conditions before beginning a new audit submission:
</p>
<p>
FAC.gov is a U.S. General Services Administration federal government service. This site collects
required documentation from organizations that spend <span class="text-bold">$750,000 or more</span> in federal grant funds in
a given year.
</p>
<p>
All use of FAC.gov will be monitored, recorded, and subject to audit by GSA staff and other
federal government authorities. By using this system, you consent to your use being monitored
and recorded.
</p>
<p>
Unauthorized use is prohibited, and individuals found performing unauthorized activities are
subject to disciplinary action including criminal prosecution.
</p>
<p>
If you have questions about these conditions, please email <a class="usa-link" href="mailto:[email protected]">[email protected]</a>.
</p>
</div>
<form id="start-new-submission" class="usa-form usa-form--large">
<div class="usa-checkbox margin-y-4">
<input id="check-start-new-submission"
class="usa-checkbox__input"
type="checkbox"/>
<label class="usa-checkbox__label display-inline-flex" for="check-start-new-submission">
I agree to the&nbsp;
<p id="terms-conditions-trigger" class="margin-0 text-underline">
terms and conditions.
</p>
<abbr title="required" class="usa-hint usa-hint--required">*</abbr>
</label>
</div>
<div class="usa-button-group">
<input type="submit"
id="start-submission"
class="usa-button"
value="Begin New Submission"
disabled/>
<a class="usa-button usa-button--outline tablet:margin-left-2" id="cancel-start-submission" aria-label="Close this window" data-close-modal>Cancel</a>
</div>
</form>
</div>
<button class="usa-button usa-modal__close"
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
{% uswds_sprite "close" %}
</svg>
</button>
</div>
</div>
28 changes: 28 additions & 0 deletions backend/audit/templates/audit/audit_submissions/modal_uei.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{% comment %}
Modal content, triggered outside of the component. Displays the definition of a UEI.
{% endcomment %}
{% load sprite_helper %}
<div class="usa-modal flex-justify-start"
id="modal-uei-info"
aria-labelledby="modal-uei-info-heading"
aria-describedby="modal-uei-info-description">
<div class="usa-modal__content">
<div class="usa-modal__main">
<h2 class="usa-modal__heading" id="modal-uei-info-heading">What is a Unique Entity Identifier (UEI)?</h2>
<div class="usa-prose" id="modal-uei-info-description">
<p>
The Unique Entity Identifier (UEI) for an awardee or recipient is an alphanumeric code created in
the System for Award Management (SAM.gov) that is used to uniquely identify specific commercial,
nonprofit, or business entities registered to do business with the federal government.
</p>
</div>
</div>
<button class="usa-button usa-modal__close"
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
{% uswds_sprite "close" %}
</svg>
</button>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{% comment %}
Table component. Lists all submitted records, accepted and disseminated. Contains a warning for "stuck" submissions that failed the intake_to_dissemination process.
{% endcomment %}
{% load sprite_helper %}
<h1 class="font-sans-xl display-inline-flex">
<svg class="usa-icon margin-right-1"
aria-hidden="true"
focusable="false"
role="img">
{% uswds_sprite "fac_completed" %}
</svg>
<span>Completed</span>
</h1>
<div class="grid-row" tabindex="0">
<table class="usa-table margin-top-0">
<caption class="text-normal">
<p class="margin-0">The audits listed below are with the FAC for processing and can't be edited.</p>
<ul>
<li>
"Accepted" audits are complete and don't require further action by the auditee or auditor.
</li>
<li>
"Submitted" audits are being processed for dissemination. If an audit's status remains at "Submitted" for more than 24 hours, please <a class="usa-link" href="https://support.fac.gov/hc/en-us/requests/new" target="_blank">submit a helpdesk ticket</a>.
</li>
</ul>
</caption>
<thead>
<tr>
<th data-sortable scope="col" role="columnheader">Status</th>
<th data-sortable scope="col" role="columnheader">Entity name</th>
<th data-sortable scope="col" role="columnheader">Report ID</th>
<th data-sortable scope="col" role="columnheader">
Auditee
<button class="usa-button--unstyled margin-top-0"
aria-controls="modal-uei-info"
data-open-modal>UEI</button>
</th>
<th data-sortable scope="col" role="columnheader">Fiscal period end date</th>
</tr>
</thead>
<tbody>
{% for item in data.completed_audits %}
<tr>
<td>
<a class="usa-link" href="{% url 'audit:SubmissionProgress' item.report_id %}">
{% if item.submission_status == "Disseminated" %}
Accepted
{% else %}
{{ item.submission_status }}
{% endif %}
</a>
</td>
<td>{{ item.auditee_name }}</td>
<td>{{ item.report_id }}</td>
<td>{{ item.auditee_uei }}</td>
<td>{{ item.fiscal_year_end_date }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="usa-sr-only usa-table__announcement-region" aria-live="polite"></div>
</div>
Loading

0 comments on commit ec1e2c7

Please sign in to comment.