From bcadb9c08e3fc4cf7c2190d7b28bb237a6ad32dd Mon Sep 17 00:00:00 2001
From: Jan Timpe <jtimpe@goraft.tech>
Date: Fri, 11 Oct 2024 09:23:55 -0400
Subject: [PATCH 1/3] create quarter explainer table in Reports

---
 .../src/components/Reports/Reports.jsx        | 293 ++++++++++--------
 1 file changed, 170 insertions(+), 123 deletions(-)

diff --git a/tdrs-frontend/src/components/Reports/Reports.jsx b/tdrs-frontend/src/components/Reports/Reports.jsx
index 82e161e37..f665e9a69 100644
--- a/tdrs-frontend/src/components/Reports/Reports.jsx
+++ b/tdrs-frontend/src/components/Reports/Reports.jsx
@@ -244,140 +244,187 @@ function Reports() {
           </div>
         )}
         <form>
-          {(isOFAAdmin || isDIGITTeam || isSystemAdmin) && (
-            <div
-              className={classNames('usa-form-group maxw-mobile margin-top-4', {
-                'usa-form-group--error': formValidation.stt,
-              })}
-            >
-              <STTComboBox
-                selectedStt={sttInputValue}
-                selectStt={selectStt}
-                error={formValidation.stt}
-              />
-            </div>
-          )}
-          {(stt?.ssp ? stt.ssp : false) && (
-            <div className="usa-form-group margin-top-4">
-              <fieldset className="usa-fieldset">
-                <legend className="usa-label text-bold">File Type</legend>
-                <div className="usa-radio">
-                  <input
-                    className="usa-radio__input"
-                    id="tanf"
-                    type="radio"
-                    name="reportType"
-                    value="tanf"
-                    defaultChecked
-                    onChange={() => setFileTypeInputValue('tanf')}
-                  />
-                  <label className="usa-radio__label" htmlFor="tanf">
-                    TANF
-                  </label>
-                </div>
-                <div className="usa-radio">
-                  <input
-                    className="usa-radio__input"
-                    id="ssp-moe"
-                    type="radio"
-                    name="reportType"
-                    value="ssp-moe"
-                    onChange={() => setFileTypeInputValue('ssp-moe')}
+          <div className="grid-row">
+            <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
+              {(isOFAAdmin || isDIGITTeam || isSystemAdmin) && (
+                <div
+                  className={classNames(
+                    'usa-form-group maxw-mobile margin-top-4',
+                    {
+                      'usa-form-group--error': formValidation.stt,
+                    }
+                  )}
+                >
+                  <STTComboBox
+                    selectedStt={sttInputValue}
+                    selectStt={selectStt}
+                    error={formValidation.stt}
                   />
-                  <label className="usa-radio__label" htmlFor="ssp-moe">
-                    SSP-MOE
-                  </label>
-                </div>
-              </fieldset>
-            </div>
-          )}
-          <div
-            className={classNames('usa-form-group maxw-mobile margin-top-4', {
-              'usa-form-group--error': formValidation.year,
-            })}
-          >
-            <label
-              className="usa-label text-bold margin-top-4"
-              htmlFor="reportingYears"
-            >
-              Fiscal Year (October - September)
-              {formValidation.year && (
-                <div className="usa-error-message" id="years-error-alert">
-                  A fiscal year is required
                 </div>
               )}
-              {/* eslint-disable-next-line */}
-              <select
-                className={classNames('usa-select maxw-mobile', {
-                  'usa-combo-box__input--error': formValidation.year,
-                })}
-                name="reportingYears"
-                id="reportingYears"
-                onChange={selectYear}
-                value={yearInputValue}
-                aria-describedby="years-error-alert"
-              >
-                <option value="" disabled hidden>
-                  - Select Fiscal Year -
-                </option>
-                {constructYearOptions()}
-              </select>
-            </label>
-          </div>
-          <div
-            className={classNames('usa-form-group maxw-mobile margin-top-4', {
-              'usa-form-group--error': formValidation.quarter,
-            })}
-          >
-            <label
-              className="usa-label text-bold margin-top-4"
-              htmlFor="quarter"
-            >
-              Quarter
-              {formValidation.quarter && (
-                <div className="usa-error-message" id="quarter-error-alert">
-                  A quarter is required
+              {(stt?.ssp ? stt.ssp : false) && (
+                <div className="usa-form-group margin-top-4">
+                  <fieldset className="usa-fieldset">
+                    <legend className="usa-label text-bold">File Type</legend>
+                    <div className="usa-radio">
+                      <input
+                        className="usa-radio__input"
+                        id="tanf"
+                        type="radio"
+                        name="reportType"
+                        value="tanf"
+                        defaultChecked
+                        onChange={() => setFileTypeInputValue('tanf')}
+                      />
+                      <label className="usa-radio__label" htmlFor="tanf">
+                        TANF
+                      </label>
+                    </div>
+                    <div className="usa-radio">
+                      <input
+                        className="usa-radio__input"
+                        id="ssp-moe"
+                        type="radio"
+                        name="reportType"
+                        value="ssp-moe"
+                        onChange={() => setFileTypeInputValue('ssp-moe')}
+                      />
+                      <label className="usa-radio__label" htmlFor="ssp-moe">
+                        SSP-MOE
+                      </label>
+                    </div>
+                  </fieldset>
                 </div>
               )}
-              {/* eslint-disable-next-line */}
-              <select
-                className={classNames('usa-select maxw-mobile', {
-                  'usa-combo-box__input--error': formValidation.quarter,
-                })}
-                name="quarter"
-                id="quarter"
-                onChange={selectQuarter}
-                value={quarterInputValue}
-                aria-describedby="quarter-error-alert"
+            </div>
+          </div>
+          <div className="grid-row">
+            <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
+              <div
+                className={classNames(
+                  'usa-form-group maxw-mobile margin-top-4',
+                  {
+                    'usa-form-group--error': formValidation.year,
+                  }
+                )}
               >
-                <option value="" disabled hidden>
-                  - Select Quarter -
-                </option>
-                {Object.entries(quarters).map(
-                  ([quarter, quarterDescription]) => (
-                    <option value={quarter} key={quarter}>
-                      {quarterDescription}
+                <label
+                  className="usa-label text-bold margin-top-4"
+                  htmlFor="reportingYears"
+                >
+                  Fiscal Year (October - September)
+                  {formValidation.year && (
+                    <div className="usa-error-message" id="years-error-alert">
+                      A fiscal year is required
+                    </div>
+                  )}
+                  {/* eslint-disable-next-line */}
+              <select
+                    className={classNames('usa-select maxw-mobile', {
+                      'usa-combo-box__input--error': formValidation.year,
+                    })}
+                    name="reportingYears"
+                    id="reportingYears"
+                    onChange={selectYear}
+                    value={yearInputValue}
+                    aria-describedby="years-error-alert"
+                  >
+                    <option value="" disabled hidden>
+                      - Select Fiscal Year -
                     </option>
-                  )
+                    {constructYearOptions()}
+                  </select>
+                </label>
+              </div>
+              <div
+                className={classNames(
+                  'usa-form-group maxw-mobile margin-top-4',
+                  {
+                    'usa-form-group--error': formValidation.quarter,
+                  }
                 )}
-              </select>
-            </label>
+              >
+                <label
+                  className="usa-label text-bold margin-top-4"
+                  htmlFor="quarter"
+                >
+                  Quarter
+                  {formValidation.quarter && (
+                    <div className="usa-error-message" id="quarter-error-alert">
+                      A quarter is required
+                    </div>
+                  )}
+                  {/* eslint-disable-next-line */}
+              <select
+                    className={classNames('usa-select maxw-mobile', {
+                      'usa-combo-box__input--error': formValidation.quarter,
+                    })}
+                    name="quarter"
+                    id="quarter"
+                    onChange={selectQuarter}
+                    value={quarterInputValue}
+                    aria-describedby="quarter-error-alert"
+                  >
+                    <option value="" disabled hidden>
+                      - Select Quarter -
+                    </option>
+                    {Object.entries(quarters).map(
+                      ([quarter, quarterDescription]) => (
+                        <option value={quarter} key={quarter}>
+                          {quarterDescription}
+                        </option>
+                      )
+                    )}
+                  </select>
+                </label>
+              </div>
+              <Button
+                className="margin-y-4"
+                type="button"
+                onClick={() => {
+                  if (uploadedFiles && uploadedFiles.length > 0) {
+                    setErrorModalVisible(true)
+                  } else {
+                    handleSearch()
+                  }
+                }}
+              >
+                Search
+              </Button>
+            </div>
+            <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
+              <table className="usa-table usa-table--striped">
+                <caption>Identifying the right Fiscal Year and Quarter</caption>
+                <thead>
+                  <tr>
+                    <th>Fiscal Quarter</th>
+                    <th>Calendar Period</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td>Quarter 1</td>
+                    <td>Oct 1 - Dec 31</td>
+                  </tr>
+                  <tr>
+                    <td>Quarter 2</td>
+                    <td>Jan 1 - Mar 31</td>
+                  </tr>
+                  <tr>
+                    <td>Quarter 3</td>
+                    <td>Apr 1 - Jun 30</td>
+                  </tr>
+                  <tr>
+                    <td>Quarter 4</td>
+                    <td>Jul 1 - Sep 30</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
           </div>
-          <Button
-            className="margin-y-4"
-            type="button"
-            onClick={() => {
-              if (uploadedFiles && uploadedFiles.length > 0) {
-                setErrorModalVisible(true)
-              } else {
-                handleSearch()
-              }
-            }}
-          >
-            Search
-          </Button>
         </form>
       </div>
+
       {isUploadReportToggled && (
         <>
           <h2

From 6f8ad208628f1f74a561cb333047705b9c4200e7 Mon Sep 17 00:00:00 2001
From: Jan Timpe <jtimpe@goraft.tech>
Date: Fri, 11 Oct 2024 12:06:51 -0400
Subject: [PATCH 2/3] table style

---
 tdrs-frontend/src/components/Reports/Reports.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tdrs-frontend/src/components/Reports/Reports.jsx b/tdrs-frontend/src/components/Reports/Reports.jsx
index f665e9a69..3b3d4614e 100644
--- a/tdrs-frontend/src/components/Reports/Reports.jsx
+++ b/tdrs-frontend/src/components/Reports/Reports.jsx
@@ -393,7 +393,7 @@ function Reports() {
               </Button>
             </div>
             <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
-              <table className="usa-table usa-table--striped">
+              <table className="usa-table usa-table--striped margin-top-4 width-full">
                 <caption>Identifying the right Fiscal Year and Quarter</caption>
                 <thead>
                   <tr>

From 0b34231e5c9489d751526a3630883ae665f6e777 Mon Sep 17 00:00:00 2001
From: Jan Timpe <jtimpe@goraft.tech>
Date: Thu, 17 Oct 2024 10:26:20 -0400
Subject: [PATCH 3/3] fix whitespace

---
 tdrs-frontend/src/components/Reports/Reports.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tdrs-frontend/src/components/Reports/Reports.jsx b/tdrs-frontend/src/components/Reports/Reports.jsx
index 3b3d4614e..a22ae4fb1 100644
--- a/tdrs-frontend/src/components/Reports/Reports.jsx
+++ b/tdrs-frontend/src/components/Reports/Reports.jsx
@@ -244,7 +244,7 @@ function Reports() {
           </div>
         )}
         <form>
-          <div className="grid-row">
+          <div className="grid-row grid-gap">
             <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
               {(isOFAAdmin || isDIGITTeam || isSystemAdmin) && (
                 <div
@@ -298,8 +298,8 @@ function Reports() {
               )}
             </div>
           </div>
-          <div className="grid-row">
-            <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
+          <div className="grid-row grid-gap">
+            <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-auto">
               <div
                 className={classNames(
                   'usa-form-group maxw-mobile margin-top-4',
@@ -393,7 +393,7 @@ function Reports() {
               </Button>
             </div>
             <div className="mobile:grid-container desktop:padding-0 desktop:grid-col-fill">
-              <table className="usa-table usa-table--striped margin-top-4 width-full">
+              <table className="usa-table usa-table--striped margin-top-4 desktop:width-mobile-lg mobile:width-full">
                 <caption>Identifying the right Fiscal Year and Quarter</caption>
                 <thead>
                   <tr>