From 0d2f6f78ce7fe0daafd98231114284b8ead3caa0 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 28 Apr 2025 14:16:08 -0400 Subject: [PATCH] missed include deleted --- helpers/functions.cache.d.ts | 4 ++-- helpers/functions.cache.js | 8 ++++---- helpers/functions.cache.ts | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts index 143556d6..808f3e57 100644 --- a/helpers/functions.cache.d.ts +++ b/helpers/functions.cache.d.ts @@ -3,8 +3,8 @@ export declare function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus: export declare function getBurialSiteStatusById(burialSiteStatusId: number): BurialSiteStatus | undefined; export declare function getBurialSiteStatuses(): BurialSiteStatus[]; export declare function getBurialSiteTypeById(burialSiteTypeId: number): BurialSiteType | undefined; -export declare function getBurialSiteTypes(): BurialSiteType[]; -export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string): BurialSiteType | undefined; +export declare function getBurialSiteTypes(includeDeleted?: boolean): BurialSiteType[]; +export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string, includeDeleted?: boolean): BurialSiteType | undefined; export declare function getAllContractTypeFields(): ContractTypeField[]; export declare function getContractTypeByContractType(contractTypeString: string): ContractType | undefined; export declare function getContractTypeById(contractTypeId: number): ContractType | undefined; diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js index dcff3468..a621405e 100644 --- a/helpers/functions.cache.js +++ b/helpers/functions.cache.js @@ -41,12 +41,12 @@ export function getBurialSiteTypeById(burialSiteTypeId) { const cachedTypes = getBurialSiteTypes(); return cachedTypes.find((currentType) => currentType.burialSiteTypeId === burialSiteTypeId); } -export function getBurialSiteTypes() { - burialSiteTypes ??= getBurialSiteTypesFromDatabase(); +export function getBurialSiteTypes(includeDeleted = false) { + burialSiteTypes ??= getBurialSiteTypesFromDatabase(includeDeleted); return burialSiteTypes; } -export function getBurialSiteTypesByBurialSiteType(burialSiteType) { - const cachedTypes = getBurialSiteTypes(); +export function getBurialSiteTypesByBurialSiteType(burialSiteType, includeDeleted = false) { + const cachedTypes = getBurialSiteTypes(includeDeleted); const typeLowerCase = burialSiteType.toLowerCase(); return cachedTypes.find((currentType) => currentType.burialSiteType.toLowerCase() === typeLowerCase); } diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index 1a0ff919..fd9cf352 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -87,15 +87,16 @@ export function getBurialSiteTypeById( ) } -export function getBurialSiteTypes(): BurialSiteType[] { - burialSiteTypes ??= getBurialSiteTypesFromDatabase() +export function getBurialSiteTypes(includeDeleted = false): BurialSiteType[] { + burialSiteTypes ??= getBurialSiteTypesFromDatabase(includeDeleted) return burialSiteTypes } export function getBurialSiteTypesByBurialSiteType( - burialSiteType: string + burialSiteType: string, + includeDeleted = false ): BurialSiteType | undefined { - const cachedTypes = getBurialSiteTypes() + const cachedTypes = getBurialSiteTypes(includeDeleted) const typeLowerCase = burialSiteType.toLowerCase()