Skip to content

Commit a170814

Browse files
[Issue #6955] frontend adjustments to form cd511 (#7099)
## Summary <!-- Use "Fixes" to automatically close issue upon PR merge. Use "Work for" when UAT is required. --> Work for #6955 ## Changes proposed Prettifying the layout for the Form CD511. ## Context for reviewers Most of this work was previously done by @chouinar, this is just making the large text section at the top more readable. ## Validation steps A local opportunity linked to this form can be found by running `make db-seed-local` and searching the output for "CD511". - [ ] Successfully start an application against this form - [ ] Ensure the form looks correct - [ ] Ensure the form can be saved - [ ] Ensure the application can be submitted - [ ] Check the print setup to make sure that the PDF looks correct
1 parent 69487c1 commit a170814

File tree

1 file changed

+38
-14
lines changed

1 file changed

+38
-14
lines changed

api/src/form_schema/forms/cd511.py

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
from src.db.models.competition_models import Form
55
from src.form_schema.shared import COMMON_SHARED_V1
66

7-
DIRECTIONS = """Applicants should also review the instructions for certification included in the regulations before completing this form. Signature on this form provides for
8-
compliance with certification requirements under 15 CFR Part 28, 'New Restrictions on Lobbying.' The certifications shall be treated as a material representation
9-
of fact upon which reliance will be placed when the Department of Commerce determines to award the covered transaction, grant, or cooperative agreement.
7+
DIRECTIONS_CERTIFICATION_TITLE = "CERTIFICATION REGARDING LOBBYING"
108

11-
LOBBYING
9+
DIRECTIONS_CERTIFICATION_BODY = "Applicants should also review the instructions for certification included in the regulations before completing this form. Signature on this form provides for compliance with certification requirements under 15 CFR Part 28, 'New Restrictions on Lobbying.' The certifications shall be treated as a material representation of fact upon which reliance will be placed when the Department of Commerce determines to award the covered transaction, grant, or cooperative agreement."
1210

11+
DIRECTIONS_LOBBYING_TITLE = "Lobbying"
12+
13+
DIRECTIONS_LOBBYING_BODY = """
1314
As required by Section 1352, Title 31 of the U.S. Code, and implemented at 15 CFR Part 28, for persons entering into a grant, cooperative agreement or contract over $100,000 or a loan or loan guarantee over $150,000 as defined at 15 CFR Part 28, Sections 28.105 and 28.110, the applicant certifies that to the best of his or her knowledge and belief, that:
1415
1516
(1) No Federal appropriated funds have been paid or will be paid, by or on behalf of the undersigned, to any person for influencing or attempting to influence an officer or employee of any agency, a Member of Congress in connection with the awarding of any Federal contract, the making of any Federal grant, the making of any Federal loan, the entering into of any cooperative agreement, and the extension, continuation, renewal, amendment, or modification of any Federal contract, grant, loan, or cooperative agreement.
@@ -19,18 +20,20 @@
1920
(3) The undersigned shall require that the language of this certification be included in the award documents for all subawards at all tiers (including subcontracts, subgrants, and contracts under grants, loans, and cooperative agreements) and that all subrecipients shall certify and disclose accordingly.
2021
2122
This certification is a material representation of fact upon which reliance was placed when this transaction was made or entered into. Submission of this certification is a prerequisite for making or entering into this transaction imposed by section 1352, title 31, U.S. Code. Any person who fails to file the required certification shall be subject to a civil penalty of not less than $10,000 and not more than $100,000 for each such failure occurring on or before October 23, 1996, and of not less than $11,000 and not more than $110,000 for each such failure occurring after October 23, 1996.
23+
"""
2224

23-
Statement for Loan Guarantees and Loan Insurance
25+
DIRECTIONS_LOANS_TITLE = "Statement for Loan Guarantees and Loan Insurance"
2426

27+
DIRECTIONS_LOANS_BODY = """
2528
The undersigned states, to the best of his or her knowledge and belief, that:
2629
2730
In any funds have been paid or will be paid to any person for influencing or attempting to influence an officer or employee of any agency, a Member of Congress, an officer or employee of Congress, or an employee of a Member of Congress in connection with this commitment providing for the United States to insure or guarantee a loan, the undersigned shall complete and submit Standard Form-LLL, 'Disclosure Form to Report Lobbying,' in accordance with its instructions.
2831
2932
Submission of this statement is a prerequisite for making or entering into this transaction imposed by section 1352, title 31, U.S. Code. Any person who fails to file the required statement shall be subject to a civil penalty of not less than $10,000 and not more than $100,000 for each such failure occurring on or before October 23, 1996, and of not less than $11,000 and not more than $110,000 for each such failure occurring after October 23, 1996.
30-
31-
As the duly authorized representative of the applicant, I hereby certify that the applicant will comply with the above applicable certification.
3233
"""
3334

35+
DIRECTIONS_COMPLY_TITLE = "As the duly authorized representative of the applicant, I hereby certify that the applicant will comply with the above applicable certification."
36+
3437
FORM_JSON_SCHEMA = {
3538
"type": "object",
3639
"required": [
@@ -76,7 +79,7 @@
7679
},
7780
"contact_person": {
7881
"allOf": [{"$ref": COMMON_SHARED_V1.field_ref("person_name")}],
79-
"title": "Contact Name",
82+
"title": "Contact Person",
8083
},
8184
"contact_person_title": {
8285
"allOf": [{"$ref": COMMON_SHARED_V1.field_ref("contact_person_title")}],
@@ -93,15 +96,36 @@
9396
FORM_UI_SCHEMA = [
9497
{
9598
"type": "section",
96-
"label": "1. Directions",
97-
"name": "directions",
98-
"description": DIRECTIONS,
99+
"label": DIRECTIONS_CERTIFICATION_TITLE,
100+
"name": "directions1",
101+
"description": DIRECTIONS_CERTIFICATION_BODY,
102+
"children": [],
103+
},
104+
{
105+
"type": "section",
106+
"label": DIRECTIONS_LOBBYING_TITLE,
107+
"name": "directions2",
108+
"description": DIRECTIONS_LOBBYING_BODY,
109+
"children": [],
110+
},
111+
{
112+
"type": "section",
113+
"label": DIRECTIONS_LOANS_TITLE,
114+
"name": "directions3",
115+
"description": DIRECTIONS_LOANS_BODY,
116+
"children": [],
117+
},
118+
{
119+
"type": "section",
120+
"label": DIRECTIONS_COMPLY_TITLE,
121+
"name": "directions4",
122+
"description": "",
99123
"children": [],
100124
},
101125
{
102126
"type": "section",
103127
"name": "award",
104-
"label": "2. Award",
128+
"label": "1. Award",
105129
"children": [
106130
{"type": "field", "definition": "/properties/applicant_name"},
107131
{"type": "field", "definition": "/properties/award_number"},
@@ -111,7 +135,7 @@
111135
{
112136
"type": "section",
113137
"name": "contact_person",
114-
"label": "3. Contact Person",
138+
"label": "2. Contact Person",
115139
"children": [
116140
{"type": "field", "definition": "/properties/contact_person/properties/prefix"},
117141
{"type": "field", "definition": "/properties/contact_person/properties/first_name"},
@@ -124,7 +148,7 @@
124148
{
125149
"type": "section",
126150
"name": "signature",
127-
"label": "4. Signature",
151+
"label": "3. Signature",
128152
"children": [
129153
{"type": "null", "definition": "/properties/signature"},
130154
{"type": "null", "definition": "/properties/submitted_date"},

0 commit comments

Comments
 (0)