From be90a4e96f26a77befe4143526350cd02178b8d0 Mon Sep 17 00:00:00 2001 From: sophia-massie <96220951+sophia-massie@users.noreply.github.com> Date: Thu, 1 Jun 2023 14:13:11 -0500 Subject: [PATCH] task/WP-107-UTH-Extension-Requests (#162) * task/WP-107-UTH-Extension-Requests * Updated to show app data period and expected submission date * Updated justification title per UTH --- .../forms/css/extension_submission_form.css | 38 +--- .../extension_submission_form.html | 207 ++++++++---------- apcd-cms/src/apps/extension/views.py | 5 +- apcd-cms/src/apps/utils/apcd_database.py | 26 +-- 4 files changed, 111 insertions(+), 165 deletions(-) diff --git a/apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css b/apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css index 3d3bf1da..8678f47d 100644 --- a/apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css +++ b/apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css @@ -1,15 +1,10 @@ /* Field Widths */ - -/* for an Entity*/ -input[name^="fein"], -input[name^="license-number"], -input[name^="naic-company-code"] { - width: 10ch; - box-sizing: content-box; -} -/* to make input type='month' the same width as type="date"*/ -input[name^="applicable-data-period"], -input[name^="current-expected-date"], +select { + overflow: hidden; + white-space:pre; + text-overflow: ellipsis; + } + input[name^="requested-target-date"] { --length: 25ch; box-sizing: content-box; @@ -22,15 +17,6 @@ input[name^="requested-target-date"] { margin-left: 0; } -/* To put required for extension dates on another line to avoid cutting off text */ -label[name^="extension-date-asterisk"] { - padding: 0; - margin-left:0; -} -/* To make sure sup values are not cut off when set as a label*/ -label[name^="date-row"] { - margin-top: 1rem; -} /* Field Layouts */ /* To make (radio/check)box sets take up less vertical space */ @@ -39,14 +25,4 @@ label[name^="date-row"] { flex-wrap: wrap; column-gap: 1em; row-gap: 0.5em; -} -[id^="extension-block_"] { - - /* Expectations: - - automatically enough columns - - maximum column count of 3 (i.e. minimum column width of 33%) - - equal width columns*/ - display: grid; - grid-template-columns: repeat( auto-fill, var(--max-col-width)); - max-width: calc( var(--global-space--grid-gap) + var(--max-col-width) *3 ); -} +} \ No newline at end of file diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html index f6a6f427..af56b7bf 100644 --- a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html +++ b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html @@ -19,7 +19,7 @@

Request an Extension

This form should be completed and submitted by data submitters to request an extension to the deadline for submitting either a regular submission or a corrected resubmission. Please review the - Data Submission Guide for details about completing and submitting this form, especially regarding the timeliness of the request. @@ -31,55 +31,52 @@

Request an Extension

{% csrf_token %}

Extension Information

-
- - - - -
-
-
-
- - - - - - -
- Enter month and year -
+
+

+ This extension is on behalf of the following organization: +

+ + +
-
- - - - +
+ + +
-
+ +
Submission Dates
+
+
- - - - Requested Target Date1* +
+
+ +
12/05/2023
+
+
+ +
12-05-2023
+
-
@@ -104,7 +101,7 @@

Justification

+

Request Justification

Provide rationale for the exception request, outlining the reasons why the @@ -144,23 +141,6 @@

Acknowledgment of Terms

id="requestor-email" pattern="^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[a-z]{2,4}$" />
-
- -
- - - - -
@@ -177,10 +157,21 @@

Acknowledgment of Terms

+
+ +
+
+

+ ¹ Requested target date – requested day/month/year by which the data should be received (the extension + date).
+
+

- +
+
+