From 4c202e69f1036bbb9ffe96c0d42d41ce14883da4 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 9 Sep 2022 13:35:38 -0400 Subject: [PATCH] change sorting of milestones --- helpers/lotOccupancyDB/getWorkOrderMilestones.js | 7 ++++++- helpers/lotOccupancyDB/getWorkOrderMilestones.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.js b/helpers/lotOccupancyDB/getWorkOrderMilestones.js index 8a1fa379..5c9fca70 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.js +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.js @@ -14,12 +14,17 @@ export const getWorkOrderMilestones = (workOrderId, connectedDatabase) => { " m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," + " m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," + " m.workOrderMilestoneDescription," + + " m.workOrderMilestoneCompletionDate, userFn_dateIntegerToString(m.workOrderMilestoneCompletionDate) as workOrderMilestoneCompletionDateString," + + " m.workOrderMilestoneCompletionTime, userFn_timeIntegerToString(m.workOrderMilestoneCompletionTime) as workOrderMilestoneCompletionTimeString," + " m.recordCreate_userName, m.recordUpdate_userName" + " from WorkOrderMilestones m" + " left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" + " where m.recordDelete_timeMillis is null" + " and m.workOrderId = ?" + - " order by workOrderMilestoneDate desc, workOrderMilestoneTime desc, workOrderMilestoneId desc") + " order by" + + " m.workOrderMilestoneDate, m.workOrderMilestoneTime," + + " m.workOrderMilestoneCompletionDate, m.workOrderMilestoneCompletionTime," + + " t.orderNumber, m.workOrderMilestoneId") .all(workOrderId); if (!connectedDatabase) { database.close(); diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts index 4f2365a3..8d16c241 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts @@ -29,12 +29,17 @@ export const getWorkOrderMilestones = ( " m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," + " m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," + " m.workOrderMilestoneDescription," + + " m.workOrderMilestoneCompletionDate, userFn_dateIntegerToString(m.workOrderMilestoneCompletionDate) as workOrderMilestoneCompletionDateString," + + " m.workOrderMilestoneCompletionTime, userFn_timeIntegerToString(m.workOrderMilestoneCompletionTime) as workOrderMilestoneCompletionTimeString," + " m.recordCreate_userName, m.recordUpdate_userName" + " from WorkOrderMilestones m" + " left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" + " where m.recordDelete_timeMillis is null" + " and m.workOrderId = ?" + - " order by workOrderMilestoneDate desc, workOrderMilestoneTime desc, workOrderMilestoneId desc" + " order by" + + " m.workOrderMilestoneDate, m.workOrderMilestoneTime," + + " m.workOrderMilestoneCompletionDate, m.workOrderMilestoneCompletionTime," + + " t.orderNumber, m.workOrderMilestoneId" ) .all(workOrderId);