From c751f0cba40063b09a2df101f34fda88b8c1a025 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 5 Feb 2025 15:10:18 -0800 Subject: [PATCH 1/5] IO-3127 Dashboard Schedule Translations Signed-off-by: Allan Carr --- client/src/translations/en_us/common.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 1c153d26a..ce466aa5b 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -970,10 +970,10 @@ "productiondollars": "Total Dollars in Production", "productionhours": "Total Hours in Production", "projectedmonthlysales": "Projected Monthly Sales", - "scheduledindate": "Sheduled In Today: {{date}}", - "scheduledintoday": "Sheduled In Today", - "scheduledoutdate": "Sheduled Out Today: {{date}}", - "scheduledouttoday": "Sheduled Out Today", + "scheduledindate": "Scheduled In Today: {{date}}", + "scheduledintoday": "Scheduled In Today", + "scheduledoutdate": "Scheduled Out Today: {{date}}", + "scheduledouttoday": "Scheduled Out Today", "tasks": "Tasks" } }, From d9f562faa4cc49d69b716989fece8c54802f37b2 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 6 Feb 2025 08:32:52 -0800 Subject: [PATCH 2/5] IO-3121 Adjust Footer Signed-off-by: Allan Carr --- client/src/utils/RenderTemplate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js index b6aa8f2ac..a4b86c4cf 100644 --- a/client/src/utils/RenderTemplate.js +++ b/client/src/utils/RenderTemplate.js @@ -74,7 +74,7 @@ export default async function RenderTemplate( ...templateObject.variables, ...templateObject.context, headerpath: shopSpecificFolder ? `/${bodyshop.imexshopid}/header.html` : `/GENERIC/header.html`, - footerpath: shopSpecificFolder ? `/${bodyshop.imexshopid}/header.html` : `/GENERIC/footer.html`, + footerpath: shopSpecificFolder ? `/${bodyshop.imexshopid}/footer.html` : `/GENERIC/footer.html`, bodyshop: bodyshop, filters: templateObject?.filters, sorters: templateObject?.sorters, From 35a3726cf032c3b7e439daeb22581a8167a2d2cd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 10 Feb 2025 14:24:50 -0800 Subject: [PATCH 3/5] IO-3077 Implement import rules engine. --- bodyshop_translations.babel | 243 +- .../shop-info/shop-info.parts-scan.jsx | 193 +- client/src/translations/en_us/common.json | 7530 +++++++++-------- client/src/translations/es/common.json | 7530 +++++++++-------- client/src/translations/fr/common.json | 7530 +++++++++-------- server/graphql-client/queries.js | 21 +- server/parts-scan/parts-scan.js | 71 +- 7 files changed, 11748 insertions(+), 11370 deletions(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 0432eaaf1..d92f00f41 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -1,4 +1,4 @@ - +