steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change sorting of milestones

deepsource-autofix-76c6eb20
Dan Gowans 2022-09-09 13:35:38 -04:00
parent 47eb4a0254
commit 4c202e69f1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpers/lotOccupancyDB/getWorkOrderMilestones.js
View File

@ -14,12 +14,17 @@ export const getWorkOrderMilestones = (workOrderId, connectedDatabase) => {
" m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," + " m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," +
" m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," + " m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," +
" m.workOrderMilestoneDescription," + " m.workOrderMilestoneDescription," +
" m.workOrderMilestoneCompletionDate, userFn_dateIntegerToString(m.workOrderMilestoneCompletionDate) as workOrderMilestoneCompletionDateString," +
" m.workOrderMilestoneCompletionTime, userFn_timeIntegerToString(m.workOrderMilestoneCompletionTime) as workOrderMilestoneCompletionTimeString," +
" m.recordCreate_userName, m.recordUpdate_userName" + " m.recordCreate_userName, m.recordUpdate_userName" +
" from WorkOrderMilestones m" + " from WorkOrderMilestones m" +
" left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" + " left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" +
" where m.recordDelete_timeMillis is null" + " where m.recordDelete_timeMillis is null" +
" and m.workOrderId = ?" + " 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); .all(workOrderId);
if (!connectedDatabase) { if (!connectedDatabase) {
database.close(); database.close();

7
helpers/lotOccupancyDB/getWorkOrderMilestones.ts
View File

@ -29,12 +29,17 @@ export const getWorkOrderMilestones = (
" m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," + " m.workOrderMilestoneDate, userFn_dateIntegerToString(m.workOrderMilestoneDate) as workOrderMilestoneDateString," +
" m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," + " m.workOrderMilestoneTime, userFn_timeIntegerToString(m.workOrderMilestoneTime) as workOrderMilestoneTimeString," +
" m.workOrderMilestoneDescription," + " m.workOrderMilestoneDescription," +
" m.workOrderMilestoneCompletionDate, userFn_dateIntegerToString(m.workOrderMilestoneCompletionDate) as workOrderMilestoneCompletionDateString," +
" m.workOrderMilestoneCompletionTime, userFn_timeIntegerToString(m.workOrderMilestoneCompletionTime) as workOrderMilestoneCompletionTimeString," +
" m.recordCreate_userName, m.recordUpdate_userName" + " m.recordCreate_userName, m.recordUpdate_userName" +
" from WorkOrderMilestones m" + " from WorkOrderMilestones m" +
" left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" + " left join WorkOrderMilestoneTypes t on m.workOrderMilestoneTypeId = t.workOrderMilestoneTypeId" +
" where m.recordDelete_timeMillis is null" + " where m.recordDelete_timeMillis is null" +
" and m.workOrderId = ?" + " 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); .all(workOrderId);