diff --git a/data/config.cemetery.ssm.js b/data/config.cemetery.ssm.js index c1b5b7c5..7a26c9c0 100644 --- a/data/config.cemetery.ssm.js +++ b/data/config.cemetery.ssm.js @@ -1,6 +1,7 @@ import { config as cemeteryConfig } from "./config.cemetery.ontario.js"; export const config = Object.assign({}, cemeteryConfig); config.settings.lot = { + lotNamePattern: /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/, lotNameSortNameFunction: (lotName) => { const numericPadding = "00000"; const lotNameSplit = lotName.toUpperCase().split("-"); diff --git a/data/config.cemetery.ssm.ts b/data/config.cemetery.ssm.ts index f447d45f..05453ddc 100644 --- a/data/config.cemetery.ssm.ts +++ b/data/config.cemetery.ssm.ts @@ -5,6 +5,7 @@ import { export const config = Object.assign({}, cemeteryConfig); config.settings.lot = { + lotNamePattern: /^[A-Z]{2}(-\d*[A-Z]?){3,5}$/, lotNameSortNameFunction: (lotName) => { const numericPadding = "00000"; diff --git a/helpers/functions.config.d.ts b/helpers/functions.config.d.ts index 923cb056..567edf0d 100644 --- a/helpers/functions.config.d.ts +++ b/helpers/functions.config.d.ts @@ -26,6 +26,7 @@ export declare function getProperty(propertyName: "aliases.occupants"): string; export declare function getProperty(propertyName: "aliases.externalReceiptNumber"): string; export declare function getProperty(propertyName: "settings.map.mapCityDefault"): string; export declare function getProperty(propertyName: "settings.map.mapProvinceDefault"): string; +export declare function getProperty(propertyName: "settings.lot.lotNamePattern"): RegExp; export declare function getProperty(propertyName: "settings.lot.lotNameSortNameFunction"): (lotName: string) => string; export declare function getProperty(propertyName: "settings.lotOccupancy.occupancyEndDateIsRequired"): boolean; export declare function getProperty(propertyName: "settings.lotOccupancy.occupantCityDefault"): string; diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts index cc969e92..03edd896 100644 --- a/helpers/functions.config.ts +++ b/helpers/functions.config.ts @@ -93,6 +93,7 @@ export function getProperty(propertyName: "aliases.externalReceiptNumber"): stri export function getProperty(propertyName: "settings.map.mapCityDefault"): string; export function getProperty(propertyName: "settings.map.mapProvinceDefault"): string; +export function getProperty(propertyName: "settings.lot.lotNamePattern"): RegExp; export function getProperty(propertyName: "settings.lot.lotNameSortNameFunction"): (lotName: string) => string; export function getProperty(propertyName: "settings.lotOccupancy.occupancyEndDateIsRequired"): boolean; diff --git a/types/configTypes.d.ts b/types/configTypes.d.ts index d8a95766..5b731f24 100644 --- a/types/configTypes.d.ts +++ b/types/configTypes.d.ts @@ -33,6 +33,7 @@ export interface Config { mapProvinceDefault?: string; }; lot?: { + lotNamePattern?: RegExp; lotNameSortNameFunction?: (lotName: string) => string; }; lotOccupancy?: { diff --git a/types/configTypes.ts b/types/configTypes.ts index ce497447..429f87a9 100644 --- a/types/configTypes.ts +++ b/types/configTypes.ts @@ -33,6 +33,7 @@ export interface Config { mapProvinceDefault ? : string; }; lot ? : { + lotNamePattern ? : RegExp; lotNameSortNameFunction ? : (lotName: string) => string; }; lotOccupancy ? : { diff --git a/views/lot-edit.ejs b/views/lot-edit.ejs index a5ec5d7c..548de7c5 100644 --- a/views/lot-edit.ejs +++ b/views/lot-edit.ejs @@ -52,6 +52,12 @@