diff --git a/backend/audit/intakelib/checks/check_version_number.py b/backend/audit/intakelib/checks/check_version_number.py index 2718a999f8..f4c113b5fe 100644 --- 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 index b60d92e25b..5de5ee4849 100644 --- 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 index 57d29480d1..14a376a17f 100644 --- 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 index ddfe1646dc..964a35102a 100644 --- 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 index f65acf60d7..9aed20799b 100644 --- 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 index 8d1fcb4a6f..69709393ca 100644 --- 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 index 9b5338b0ca..dd7297b0e0 100644 --- 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 index fc5a44b3cc..8d3b70b918 100644 --- 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 index eafdd3276a..dfd4fa2f09 100644 --- 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 index 7d2af5fd5c..777f39fbcf 100644 Binary files a/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx and b/backend/schemas/output/excel/xlsx/additional-eins-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx b/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx index f2d4754eac..cf546d1a31 100644 Binary files a/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx and b/backend/schemas/output/excel/xlsx/additional-ueis-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx b/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx index d89e7d48db..e24ce0badf 100644 Binary files a/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx and b/backend/schemas/output/excel/xlsx/audit-findings-text-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx b/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx index 3375275032..51bfccc002 100644 Binary files a/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx and b/backend/schemas/output/excel/xlsx/corrective-action-plan-workbook.xlsx differ 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 index 95896833e5..ad6cc8590d 100644 Binary files a/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx and b/backend/schemas/output/excel/xlsx/federal-awards-audit-findings-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx b/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx index 3fcfcf4ba0..b10d8d339d 100644 Binary files a/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx and b/backend/schemas/output/excel/xlsx/federal-awards-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx b/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx index 41c61fa7eb..28276ed457 100644 Binary files a/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx and b/backend/schemas/output/excel/xlsx/notes-to-sefa-workbook.xlsx differ diff --git a/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx b/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx index 949c3cdce0..97ab729042 100644 Binary files a/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx and b/backend/schemas/output/excel/xlsx/secondary-auditors-workbook.xlsx differ diff --git a/backend/schemas/output/sections/AdditionalEINs.schema.json b/backend/schemas/output/sections/AdditionalEINs.schema.json index 6a63103896..255f4d631c 100644 --- 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 index 2e0045c553..25c82db86b 100644 --- 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 index 187f2470ae..7b81a7b700 100644 --- 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 index d48a605b5e..5f82a4c80c 100644 --- 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 index 554715251b..bf7a68201a 100644 --- 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 index 804cf6d130..eb66f9971e 100644 --- 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 index 984e810bbe..d3d8d29b18 100644 --- 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 index 196248b98a..d40b187097 100644 --- 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 index ee76bfe769..27035a9c0d 100644 --- 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 index 11fdece633..a997b4e745 100644 --- 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 index 74710d3c0e..29c9febf55 100644 --- 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 index 811ee2be47..0d454b8fa6 100644 --- 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,