Merge pull request #3509 from GSA-TTS/main

GSA-TTS · Mar 13, 2024 · e5459bd · e5459bd
2 parents d287fa9 + 75c994b
commit e5459bd
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 48 deletions.
diff --git a/backend/audit/intakelib/checks/check_version_number.py b/backend/audit/intakelib/checks/check_version_number.py
@@ -7,7 +7,7 @@
 
 logger = logging.getLogger(__name__)
 
-AUTHORIZED_VERSIONS = {"1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4"}
+AUTHORIZED_VERSIONS = {"1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.0.5"}
 
 
 # DESCRIPTION

diff --git a/backend/schemas/output/excel/json/additional-eins-workbook.json b/backend/schemas/output/excel/json/additional-eins-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {

diff --git a/backend/schemas/output/excel/json/additional-ueis-workbook.json b/backend/schemas/output/excel/json/additional-ueis-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {

diff --git a/backend/schemas/output/excel/json/audit-findings-text-workbook.json b/backend/schemas/output/excel/json/audit-findings-text-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {
@@ -102,9 +102,9 @@
                "title_cell": "A1",
                "type": "open_range",
                "validation": {
-                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year and NNN a three digit number (e.g. 2023-001)",
+                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year after 2010 and NNN a three digit number (e.g. 2023-001)",
                   "custom_title": "Reference number",
-                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
+                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", (MID(FIRSTCELLREF, 3, 1) * 1) > 0, ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
                   "type": "custom"
                },
                "width": 36

diff --git a/backend/schemas/output/excel/json/corrective-action-plan-workbook.json b/backend/schemas/output/excel/json/corrective-action-plan-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {
@@ -102,9 +102,9 @@
                "title_cell": "A1",
                "type": "open_range",
                "validation": {
-                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year and NNN a three digit number (e.g. 2023-001)",
+                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year after 2010 and NNN a three digit number (e.g. 2023-001)",
                   "custom_title": "Reference number",
-                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
+                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", (MID(FIRSTCELLREF, 3, 1) * 1) > 0, ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
                   "type": "custom"
                },
                "width": 36

diff --git a/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json b/backend/schemas/output/excel/json/federal-awards-audit-findings-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {
@@ -118,9 +118,9 @@
                "title_cell": "B1",
                "type": "open_range",
                "validation": {
-                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year and NNN a three digit number (e.g. 2023-001)",
+                  "custom_error": "Expecting a value in the format YYYY-NNN, where YYYY is a year after 2010 and NNN a three digit number (e.g. 2023-001)",
                   "custom_title": "Reference number",
-                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
+                  "formula1": "=OR(ISBLANK(FIRSTCELLREF), AND(LEN(FIRSTCELLREF) = 8, LEFT(FIRSTCELLREF, 2) = \"20\", (MID(FIRSTCELLREF, 3, 1) * 1) > 0, ISNUMBER(MID(FIRSTCELLREF, 3, 2) * 1), MID(FIRSTCELLREF, 5, 1) = \"-\", ISNUMBER(RIGHT(FIRSTCELLREF, 3) * 1)))",
                   "type": "custom"
                },
                "width": 18

diff --git a/backend/schemas/output/excel/json/federal-awards-workbook.json b/backend/schemas/output/excel/json/federal-awards-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {
@@ -186,7 +186,7 @@
                "title_cell": "E1",
                "type": "open_range",
                "validation": {
-                  "custom_error": "If known, the Program Name should have been provided  for you. Please do not change the Program Name unless absolutely necessary or the Program Name is unknown. The Program Name must be 300 characters or less. Continue?",
+                  "custom_error": "If known, the Program Name should have been provided for you. Please do not change the Program Name unless absolutely necessary or the Program Name is unknown. The Program Name must be 300 characters or less. If the drop-down menu is empty, you may need to enter an Agency Prefix and ALN in columns B and C.Continue?",
                   "custom_title": "Unknown Federal Program Name",
                   "errorStyle": "warning",
                   "formula1": "=Y{0}:Y{0}",
@@ -546,6 +546,7 @@
                      "ECONOMIC DEVELOPMENT CLUSTER",
                      "EMPLOYMENT SERVICE CLUSTER",
                      "FEDERAL TRANSIT CLUSTER",
+                     "FEDERAL MOTOR CARRIER SAFETY ASSISTANCE (FMCSA)",
                      "FISH AND WILDLIFE CLUSTER",
                      "FOOD DISTRIBUTION CLUSTER",
                      "FOREIGN FOOD AID DONATION CLUSTER",

diff --git a/backend/schemas/output/excel/json/notes-to-sefa-workbook.json b/backend/schemas/output/excel/json/notes-to-sefa-workbook.json
@@ -44,7 +44,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {

diff --git a/backend/schemas/output/excel/json/secondary-auditors-workbook.json b/backend/schemas/output/excel/json/secondary-auditors-workbook.json
@@ -42,7 +42,7 @@
                "validation": {
                   "type": "NOVALIDATION"
                },
-               "value": "1.0.4",
+               "value": "1.0.5",
                "width": 48
             },
             {

diff --git a/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx b/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx b/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx b/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx b/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx b/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx b/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx b/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx
diff --git a/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx b/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx
diff --git a/backend/schemas/output/sections/AdditionalEINs.schema.json b/backend/schemas/output/sections/AdditionalEINs.schema.json
@@ -65,7 +65,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/AdditionalUEIs.schema.json b/backend/schemas/output/sections/AdditionalUEIs.schema.json
@@ -88,7 +88,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/AuditFindingsText.schema.json b/backend/schemas/output/sections/AuditFindingsText.schema.json
@@ -81,7 +81,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/CorrectiveActionPlan.schema.json b/backend/schemas/output/sections/CorrectiveActionPlan.schema.json
@@ -81,7 +81,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/FederalAwards.schema.json b/backend/schemas/output/sections/FederalAwards.schema.json
@@ -73,6 +73,7 @@
                                           "ECONOMIC DEVELOPMENT CLUSTER",
                                           "EMPLOYMENT SERVICE CLUSTER",
                                           "FEDERAL TRANSIT CLUSTER",
+                                          "FEDERAL MOTOR CARRIER SAFETY ASSISTANCE (FMCSA)",
                                           "FISH AND WILDLIFE CLUSTER",
                                           "FOOD DISTRIBUTION CLUSTER",
                                           "FOREIGN FOOD AID DONATION CLUSTER",
@@ -551,7 +552,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/FederalAwardsAuditFindings.schema.json b/backend/schemas/output/sections/FederalAwardsAuditFindings.schema.json
@@ -8646,7 +8646,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/NotesToSefa.schema.json b/backend/schemas/output/sections/NotesToSefa.schema.json
@@ -13,7 +13,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/output/sections/SecondaryAuditors.schema.json b/backend/schemas/output/sections/SecondaryAuditors.schema.json
@@ -13,7 +13,7 @@
                "type": "string"
             },
             "version": {
-               "const": "1.0.4",
+               "const": "1.0.5",
                "type": "string"
             }
          },

diff --git a/backend/schemas/source/base/ClusterNames.json b/backend/schemas/source/base/ClusterNames.json
@@ -16,6 +16,7 @@
     "ECONOMIC DEVELOPMENT CLUSTER",
     "EMPLOYMENT SERVICE CLUSTER",
     "FEDERAL TRANSIT CLUSTER",
+    "FEDERAL MOTOR CARRIER SAFETY ASSISTANCE (FMCSA)",
     "FISH AND WILDLIFE CLUSTER",
     "FOOD DISTRIBUTION CLUSTER",
     "FOREIGN FOOD AID DONATION CLUSTER",

diff --git a/backend/schemas/source/data/cluster-names-20230626.csv b/backend/schemas/source/data/cluster-names-20230626.csv
@@ -15,26 +15,27 @@ ID,NAME,SORT_NUM
 13,ECONOMIC DEVELOPMENT CLUSTER,140
 14,EMPLOYMENT SERVICE CLUSTER,145
 15,FEDERAL TRANSIT CLUSTER,150
-16,FISH AND WILDLIFE CLUSTER,155
-17,FOOD DISTRIBUTION CLUSTER,160
-18,FOREIGN FOOD AID DONATION CLUSTER,165
-19,FOREST SERVICE SCHOOLS AND ROADS CLUSTER,170
-20,FOSTER GRANDPARENT/SENIOR COMPANION CLUSTER,175
-21,HEALTH CENTER PROGRAM CLUSTER,180
-22,HIGHWAY PLANNING AND CONSTRUCTION CLUSTER,185
-23,HIGHWAY SAFETY CLUSTER,190
-24,HOPE VI CLUSTER,195
-25,HOUSING VOUCHER CLUSTER,200
-26,HURRICANE SANDY RELIEF CLUSTER,205
-27,MEDICAID CLUSTER,210
-28,SCHOOL IMPROVEMENT GRANTS CLUSTER,215
-29,SECTION 8 PROJECT-BASED CLUSTER,220
-30,SNAP CLUSTER,225
-31,SPECIAL EDUCATION CLUSTER (IDEA),230
-32,TANF CLUSTER,235
-33,TRANSIT SERVICES PROGRAMS CLUSTER,240
-34,TRIO CLUSTER,245
-35,WATER AND WASTE PROGRAM CLUSTER,250
-36,WIOA CLUSTER,255
+16,FEDERAL MOTOR CARRIER SAFETY ASSISTANCE (FMCSA),151
+17,FISH AND WILDLIFE CLUSTER,155
+18,FOOD DISTRIBUTION CLUSTER,160
+19,FOREIGN FOOD AID DONATION CLUSTER,165
+20,FOREST SERVICE SCHOOLS AND ROADS CLUSTER,170
+21,FOSTER GRANDPARENT/SENIOR COMPANION CLUSTER,175
+22,HEALTH CENTER PROGRAM CLUSTER,180
+23,HIGHWAY PLANNING AND CONSTRUCTION CLUSTER,185
+24,HIGHWAY SAFETY CLUSTER,190
+25,HOPE VI CLUSTER,195
+26,HOUSING VOUCHER CLUSTER,200
+27,HURRICANE SANDY RELIEF CLUSTER,205
+28,MEDICAID CLUSTER,210
+29,SCHOOL IMPROVEMENT GRANTS CLUSTER,215
+30,SECTION 8 PROJECT-BASED CLUSTER,220
+31,SNAP CLUSTER,225
+32,SPECIAL EDUCATION CLUSTER (IDEA),230
+33,TANF CLUSTER,235
+34,TRANSIT SERVICES PROGRAMS CLUSTER,240
+35,TRIO CLUSTER,245
+36,WATER AND WASTE PROGRAM CLUSTER,250
+37,WIOA CLUSTER,255
 41,CDBG - ENTITLEMENT GRANTS CLUSTER,107
 42,CDBG - DISASTER RECOVERY GRANTS - PUB. L. NO. 113-2 CLUSTER,106
diff --git a/backend/schemas/source/excel/libs/Sheets.libsonnet b/backend/schemas/source/excel/libs/Sheets.libsonnet
@@ -41,7 +41,8 @@ local section_names = {
 };
 
 // All workbooks should get the same version number.
-local WORKBOOKS_VERSION = '1.0.4';
+// When bumping, also add the new version to AUTHORIZED_VERSIONS in check_version_number.py
+local WORKBOOKS_VERSION = '1.0.5';
 
 {
   single_cell: single_cell,

diff --git a/backend/schemas/source/sections/NotesToSefa.schema.jsonnet b/backend/schemas/source/sections/NotesToSefa.schema.jsonnet
@@ -35,14 +35,14 @@ local NotesToSefa = Types.object {
   properties: {
     auditee_uei: Base.Compound.UniqueEntityIdentifier,
     accounting_policies: Types.string,
-    is_minimis_rate_used:{
+    is_minimis_rate_used: {
       oneOf: [
         Types.string {
           const: Base.Const.GSA_MIGRATION,
         },
         Base.Enum.YorNorBoth,
       ],
-    }, 
+    },
     rate_explained: Types.string,
     notes_to_sefa_entries: Types.array {
       items: NotesToSefaEntry,