From a5f1203a34f85a29c4bc516e0e1aa9d5ab1956d3 Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Tue, 20 May 2025 13:42:37 -0500 Subject: [PATCH] fix(abbott orders): working on times coming over as yesterday --- .../dm/ordersIn/mappings/abbottTruckList.ts | 11 ++++++----- server/services/logistics/utils/excelDateStuff.ts | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts index dc91048..7cf85a6 100644 --- a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts +++ b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts @@ -118,7 +118,7 @@ export const abbottOrders = async (data: any, user: any) => { // now we want to make sure we only correct orders that or after now correctedOrders = correctedOrders.filter((o: any) => { const parsedDate = parse(o.date, "M/d/yyyy, h:mm:ss a", new Date()); - return isAfter(parsedDate, new Date()); + return isAfter(o.date, new Date().toISOString()); }); // last map to remove orders that have already been started @@ -132,7 +132,7 @@ export const abbottOrders = async (data: any, user: any) => { (o: any) => String(o.po).trim() === String(oo.po).trim() ); if (!isMatch) { - console.log(`ok to update: ${oo.po}`); + //console.log(`ok to update: ${oo.po}`); // oo = { // ...oo, @@ -140,7 +140,7 @@ export const abbottOrders = async (data: any, user: any) => { // }; postedOrders.push(oo); } else { - console.log(`Not valid order to update: ${oo.po}`); + // console.log(`Not valid order to update: ${oo.po}`); //console.log(oo) } }); @@ -171,13 +171,14 @@ export const abbottOrders = async (data: any, user: any) => { orders: [...predefinedObject.orders, ...orders], }; - console.log(updatedPredefinedObject); + //console.log(updatedPredefinedObject); // post the orders to the server const posting = await postOrders(updatedPredefinedObject, user); + //console.log(posting); return { success: posting?.success, message: posting?.message, - data: posting?.data, + data: posting, }; }; diff --git a/server/services/logistics/utils/excelDateStuff.ts b/server/services/logistics/utils/excelDateStuff.ts index 48a227d..45282c2 100644 --- a/server/services/logistics/utils/excelDateStuff.ts +++ b/server/services/logistics/utils/excelDateStuff.ts @@ -22,6 +22,7 @@ export const excelDateStuff = (serial: number, time: any = 0) => { date.setHours(hours); date.setMinutes(minutes); } - - return date.toLocaleString("en-US"); // or .toISOString() if preferred + //console.log(date.toLocaleString("en-US"), getJsDateFromExcel(addHours)); + //console.log(date.toISOString()); + return date.toISOString(); //.toLocaleString("en-US"); // or .toISOString() if preferred };