From cb3cff1253ef631e07ad468b7c26c39db14fffda Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Tue, 30 Aug 2022 14:45:26 -0400 Subject: [PATCH] default map city and province --- data/config.cemetery.ontario.js | 3 +++ data/config.cemetery.ontario.ts | 4 ++++ data/config.cemetery.ssm.js | 1 + data/config.cemetery.ssm.ts | 1 + handlers/maps-get/new.js | 5 ++++- handlers/maps-get/new.ts | 28 ++++++++++++++++++---------- helpers/functions.config.d.ts | 2 ++ helpers/functions.config.js | 2 ++ helpers/functions.config.ts | 6 ++++++ types/configTypes.d.ts | 4 ++++ types/configTypes.ts | 12 ++++++++---- 11 files changed, 53 insertions(+), 15 deletions(-) diff --git a/data/config.cemetery.ontario.js b/data/config.cemetery.ontario.js index 04a4a1f2..4ef92d60 100644 --- a/data/config.cemetery.ontario.js +++ b/data/config.cemetery.ontario.js @@ -1,6 +1,9 @@ import { config as cemeteryConfig } from "./config.cemetery.js"; export const config = Object.assign({}, cemeteryConfig); config.settings.lotOccupancy.occupantProvinceDefault = "ON"; +config.settings.map = { + mapProvinceDefault: "ON" +}; config.settings.fees = { taxPercentageDefault: 13 }; diff --git a/data/config.cemetery.ontario.ts b/data/config.cemetery.ontario.ts index 560c3d1f..a7f51650 100644 --- a/data/config.cemetery.ontario.ts +++ b/data/config.cemetery.ontario.ts @@ -4,6 +4,10 @@ export const config = Object.assign({}, cemeteryConfig); config.settings.lotOccupancy.occupantProvinceDefault = "ON"; +config.settings.map = { + mapProvinceDefault: "ON" +}; + config.settings.fees = { taxPercentageDefault: 13 }; diff --git a/data/config.cemetery.ssm.js b/data/config.cemetery.ssm.js index 5d8bb2fe..a4463423 100644 --- a/data/config.cemetery.ssm.js +++ b/data/config.cemetery.ssm.js @@ -1,5 +1,6 @@ import { config as cemeteryConfig } from "./config.cemetery.ontario.js"; export const config = Object.assign({}, cemeteryConfig); config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie"; +config.settings.map.mapCityDefault = "Sault Ste. Marie"; config.aliases.externalReceiptNumber = "GP Receipt Number"; export default config; diff --git a/data/config.cemetery.ssm.ts b/data/config.cemetery.ssm.ts index 66377bcd..723deffd 100644 --- a/data/config.cemetery.ssm.ts +++ b/data/config.cemetery.ssm.ts @@ -3,6 +3,7 @@ import { config as cemeteryConfig } from "./config.cemetery.ontario.js"; export const config = Object.assign({}, cemeteryConfig); config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie"; +config.settings.map.mapCityDefault = "Sault Ste. Marie"; config.aliases.externalReceiptNumber = "GP Receipt Number"; diff --git a/handlers/maps-get/new.js b/handlers/maps-get/new.js index 8a3a91e3..3fca5bf0 100644 --- a/handlers/maps-get/new.js +++ b/handlers/maps-get/new.js @@ -1,7 +1,10 @@ import * as configFunctions from "../../helpers/functions.config.js"; import { getMapSVGs } from "../../helpers/functions.map.js"; export const handler = async (_request, response) => { - const map = {}; + const map = { + mapCity: configFunctions.getProperty("settings.map.mapCityDefault"), + mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault") + }; const mapSVGs = await getMapSVGs(); response.render("map-edit", { headTitle: configFunctions.getProperty("aliases.map") + " Create", diff --git a/handlers/maps-get/new.ts b/handlers/maps-get/new.ts index 5023ec19..c5de00bc 100644 --- a/handlers/maps-get/new.ts +++ b/handlers/maps-get/new.ts @@ -1,23 +1,31 @@ -import type { RequestHandler } from "express"; +import type { + RequestHandler +} from "express"; import * as configFunctions from "../../helpers/functions.config.js"; -import { getMapSVGs } from "../../helpers/functions.map.js"; + +import { + getMapSVGs +} from "../../helpers/functions.map.js"; import * as recordTypes from "../../types/recordTypes"; export const handler: RequestHandler = async (_request, response) => { - const map: recordTypes.Map = {}; + const map: recordTypes.Map = { + mapCity: configFunctions.getProperty("settings.map.mapCityDefault"), + mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault") + }; - const mapSVGs = await getMapSVGs(); + const mapSVGs = await getMapSVGs(); - response.render("map-edit", { - headTitle: configFunctions.getProperty("aliases.map") + " Create", - isCreate: true, - map, - mapSVGs - }); + response.render("map-edit", { + headTitle: configFunctions.getProperty("aliases.map") + " Create", + isCreate: true, + map, + mapSVGs + }); }; diff --git a/helpers/functions.config.d.ts b/helpers/functions.config.d.ts index d863d3b7..eb655703 100644 --- a/helpers/functions.config.d.ts +++ b/helpers/functions.config.d.ts @@ -24,6 +24,8 @@ export declare function getProperty(propertyName: "aliases.occupancies"): string export declare function getProperty(propertyName: "aliases.occupant"): string; 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.lotOccupancy.occupancyEndDateIsRequired"): boolean; export declare function getProperty(propertyName: "settings.lotOccupancy.occupantCityDefault"): string; export declare function getProperty(propertyName: "settings.lotOccupancy.occupantProvinceDefault"): string; diff --git a/helpers/functions.config.js b/helpers/functions.config.js index 36b4989b..30dd69cf 100644 --- a/helpers/functions.config.js +++ b/helpers/functions.config.js @@ -24,6 +24,8 @@ configFallbackValues.set("aliases.occupancies", "Occupancies"); configFallbackValues.set("aliases.occupant", "Occupant"); configFallbackValues.set("aliases.occupants", "Occupants"); configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number"); +configFallbackValues.set("settings.map.mapCityDefault", ""); +configFallbackValues.set("settings.map.mapProvinceDefault", ""); configFallbackValues.set("settings.lotOccupancy.occupancyEndDateIsRequired", true); configFallbackValues.set("settings.lotOccupancy.occupantCityDefault", ""); configFallbackValues.set("settings.lotOccupancy.occupantProvinceDefault", ""); diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts index c972b61e..73691f44 100644 --- a/helpers/functions.config.ts +++ b/helpers/functions.config.ts @@ -43,6 +43,9 @@ configFallbackValues.set("aliases.occupant", "Occupant"); configFallbackValues.set("aliases.occupants", "Occupants"); configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number"); +configFallbackValues.set("settings.map.mapCityDefault", ""); +configFallbackValues.set("settings.map.mapProvinceDefault", ""); + configFallbackValues.set("settings.lotOccupancy.occupancyEndDateIsRequired", true); configFallbackValues.set("settings.lotOccupancy.occupantCityDefault", ""); configFallbackValues.set("settings.lotOccupancy.occupantProvinceDefault", ""); @@ -85,6 +88,9 @@ export function getProperty(propertyName: "aliases.occupant"): string; export function getProperty(propertyName: "aliases.occupants"): string; export function getProperty(propertyName: "aliases.externalReceiptNumber"): string; +export function getProperty(propertyName: "settings.map.mapCityDefault"): string; +export function getProperty(propertyName: "settings.map.mapProvinceDefault"): string; + export function getProperty(propertyName: "settings.lotOccupancy.occupancyEndDateIsRequired"): boolean; export function getProperty(propertyName: "settings.lotOccupancy.occupantCityDefault"): string; export function getProperty(propertyName: "settings.lotOccupancy.occupantProvinceDefault"): string; diff --git a/types/configTypes.d.ts b/types/configTypes.d.ts index 375ab10e..bad989c5 100644 --- a/types/configTypes.d.ts +++ b/types/configTypes.d.ts @@ -28,6 +28,10 @@ export interface Config { fees?: { taxPercentageDefault?: number; }; + map?: { + mapCityDefault?: string; + mapProvinceDefault?: string; + }; lotOccupancy?: { lotIdIsRequired?: boolean; occupancyEndDateIsRequired?: boolean; diff --git a/types/configTypes.ts b/types/configTypes.ts index f65f590f..7b8651e7 100644 --- a/types/configTypes.ts +++ b/types/configTypes.ts @@ -22,18 +22,22 @@ export interface Config { occupancies ? : string; occupant ? : string; occupants ? : string; - externalReceiptNumber ?: string; + externalReceiptNumber ? : string; }; settings ? : { fees ? : { taxPercentageDefault ? : number; - }, + }; + map ? : { + mapCityDefault ? : string; + mapProvinceDefault ? : string; + }; lotOccupancy ? : { lotIdIsRequired ? : boolean; occupancyEndDateIsRequired ? : boolean; occupantCityDefault ? : string; occupantProvinceDefault ? : string; - } + }; }; } @@ -43,7 +47,7 @@ interface ConfigApplication { logoURL ? : string; httpPort ? : number; userDomain ? : string; - useTestDatabases ?: boolean; + useTestDatabases ? : boolean; }