quick sorting in config table management

handlers/admin-post/doMoveLotOccupantTypeDown.js

@@ -1,7 +1,9 @@
-import { moveLotOccupantTypeDown } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeDown.js";
+import { moveLotOccupantTypeDown, moveLotOccupantTypeDownToBottom } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeDown.js";
 import { getLotOccupantTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveLotOccupantTypeDown(request.body.lotOccupantTypeId);
+    const success = request.body.moveToBottom === "1"
+        ? moveLotOccupantTypeDownToBottom(request.body.lotOccupantTypeId)
+        : moveLotOccupantTypeDown(request.body.lotOccupantTypeId);
     const lotOccupantTypes = getLotOccupantTypes();
     response.json({
         success,

handlers/admin-post/doMoveLotOccupantTypeDown.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveLotOccupantTypeDown } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeDown.js";
+import {
+    moveLotOccupantTypeDown,
+    moveLotOccupantTypeDownToBottom
+} from "../../helpers/lotOccupancyDB/moveLotOccupantTypeDown.js";
 
 import { getLotOccupantTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveLotOccupantTypeDown(request.body.lotOccupantTypeId);
+    const success =
+        request.body.moveToBottom === "1"
+            ? moveLotOccupantTypeDownToBottom(request.body.lotOccupantTypeId)
+            : moveLotOccupantTypeDown(request.body.lotOccupantTypeId);
 
     const lotOccupantTypes = getLotOccupantTypes();
 

handlers/admin-post/doMoveLotOccupantTypeUp.js

@@ -1,7 +1,9 @@
-import { moveLotOccupantTypeUp } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeUp.js";
+import { moveLotOccupantTypeUp, moveLotOccupantTypeUpToTop } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeUp.js";
 import { getLotOccupantTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveLotOccupantTypeUp(request.body.lotOccupantTypeId);
+    const success = request.body.moveToTop === "1"
+        ? moveLotOccupantTypeUpToTop(request.body.lotOccupantTypeId)
+        : moveLotOccupantTypeUp(request.body.lotOccupantTypeId);
     const lotOccupantTypes = getLotOccupantTypes();
     response.json({
         success,

handlers/admin-post/doMoveLotOccupantTypeUp.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveLotOccupantTypeUp } from "../../helpers/lotOccupancyDB/moveLotOccupantTypeUp.js";
+import {
+    moveLotOccupantTypeUp,
+    moveLotOccupantTypeUpToTop
+} from "../../helpers/lotOccupancyDB/moveLotOccupantTypeUp.js";
 
 import { getLotOccupantTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveLotOccupantTypeUp(request.body.lotOccupantTypeId);
+    const success =
+        request.body.moveToTop === "1"
+            ? moveLotOccupantTypeUpToTop(request.body.lotOccupantTypeId)
+            : moveLotOccupantTypeUp(request.body.lotOccupantTypeId);
 
     const lotOccupantTypes = getLotOccupantTypes();
 

handlers/admin-post/doMoveLotStatusDown.js

@@ -1,7 +1,9 @@
-import { moveLotStatusDown } from "../../helpers/lotOccupancyDB/moveLotStatusDown.js";
+import { moveLotStatusDown, moveLotStatusDownToBottom } from "../../helpers/lotOccupancyDB/moveLotStatusDown.js";
 import { getLotStatuses } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveLotStatusDown(request.body.lotStatusId);
+    const success = request.body.moveToBottom === "1"
+        ? moveLotStatusDownToBottom(request.body.lotStatusId)
+        : moveLotStatusDown(request.body.lotStatusId);
     const lotStatuses = getLotStatuses();
     response.json({
         success,

handlers/admin-post/doMoveLotStatusDown.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveLotStatusDown } from "../../helpers/lotOccupancyDB/moveLotStatusDown.js";
+import {
+    moveLotStatusDown,
+    moveLotStatusDownToBottom
+} from "../../helpers/lotOccupancyDB/moveLotStatusDown.js";
 
 import { getLotStatuses } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveLotStatusDown(request.body.lotStatusId);
+    const success =
+        request.body.moveToBottom === "1"
+            ? moveLotStatusDownToBottom(request.body.lotStatusId)
+            : moveLotStatusDown(request.body.lotStatusId);
 
     const lotStatuses = getLotStatuses();
 

handlers/admin-post/doMoveLotStatusUp.js

@@ -1,7 +1,9 @@
-import { moveLotStatusUp } from "../../helpers/lotOccupancyDB/moveLotStatusUp.js";
+import { moveLotStatusUp, moveLotStatusUpToTop } from "../../helpers/lotOccupancyDB/moveLotStatusUp.js";
 import { getLotStatuses } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveLotStatusUp(request.body.lotStatusId);
+    const success = request.body.moveToTop === "1"
+        ? moveLotStatusUpToTop(request.body.lotStatusId)
+        : moveLotStatusUp(request.body.lotStatusId);
     const lotStatuses = getLotStatuses();
     response.json({
         success,

handlers/admin-post/doMoveLotStatusUp.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveLotStatusUp } from "../../helpers/lotOccupancyDB/moveLotStatusUp.js";
+import {
+    moveLotStatusUp,
+    moveLotStatusUpToTop
+} from "../../helpers/lotOccupancyDB/moveLotStatusUp.js";
 
 import { getLotStatuses } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveLotStatusUp(request.body.lotStatusId);
+    const success =
+        request.body.moveToTop === "1"
+            ? moveLotStatusUpToTop(request.body.lotStatusId)
+            : moveLotStatusUp(request.body.lotStatusId);
 
     const lotStatuses = getLotStatuses();
 

handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js

@@ -1,7 +1,9 @@
-import { moveWorkOrderMilestoneTypeDown } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js";
+import { moveWorkOrderMilestoneTypeDown, moveWorkOrderMilestoneTypeDownToBottom } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js";
 import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveWorkOrderMilestoneTypeDown(request.body.workOrderMilestoneTypeId);
+    const success = request.body.moveToBottom === "1"
+        ? moveWorkOrderMilestoneTypeDownToBottom(request.body.workOrderMilestoneTypeId)
+        : moveWorkOrderMilestoneTypeDown(request.body.workOrderMilestoneTypeId);
     const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
     response.json({
         success,

handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveWorkOrderMilestoneTypeDown } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js";
+import {
+    moveWorkOrderMilestoneTypeDown,
+    moveWorkOrderMilestoneTypeDownToBottom
+} from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js";
 
 import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveWorkOrderMilestoneTypeDown(request.body.workOrderMilestoneTypeId);
+    const success =
+        request.body.moveToBottom === "1"
+            ? moveWorkOrderMilestoneTypeDownToBottom(request.body.workOrderMilestoneTypeId)
+            : moveWorkOrderMilestoneTypeDown(request.body.workOrderMilestoneTypeId);
 
     const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
 

handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js

@@ -1,7 +1,9 @@
-import { moveWorkOrderMilestoneTypeUp } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js";
+import { moveWorkOrderMilestoneTypeUp, moveWorkOrderMilestoneTypeUpToTop } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js";
 import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveWorkOrderMilestoneTypeUp(request.body.workOrderMilestoneTypeId);
+    const success = request.body.moveToTop === "1"
+        ? moveWorkOrderMilestoneTypeUpToTop(request.body.workOrderMilestoneTypeId)
+        : moveWorkOrderMilestoneTypeUp(request.body.workOrderMilestoneTypeId);
     const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
     response.json({
         success,

handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveWorkOrderMilestoneTypeUp } from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js";
+import {
+    moveWorkOrderMilestoneTypeUp,
+    moveWorkOrderMilestoneTypeUpToTop
+} from "../../helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js";
 
 import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveWorkOrderMilestoneTypeUp(request.body.workOrderMilestoneTypeId);
+    const success =
+        request.body.moveToTop === "1"
+            ? moveWorkOrderMilestoneTypeUpToTop(request.body.workOrderMilestoneTypeId)
+            : moveWorkOrderMilestoneTypeUp(request.body.workOrderMilestoneTypeId);
 
     const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
 

handlers/admin-post/doMoveWorkOrderTypeDown.js

@@ -1,7 +1,9 @@
-import { moveWorkOrderTypeDown } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeDown.js";
+import { moveWorkOrderTypeDown, moveWorkOrderTypeDownToBottom } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeDown.js";
 import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveWorkOrderTypeDown(request.body.workOrderTypeId);
+    const success = request.body.moveToBottom === "1"
+        ? moveWorkOrderTypeDownToBottom(request.body.workOrderTypeId)
+        : moveWorkOrderTypeDown(request.body.workOrderTypeId);
     const workOrderTypes = getWorkOrderTypes();
     response.json({
         success,

handlers/admin-post/doMoveWorkOrderTypeDown.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveWorkOrderTypeDown } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeDown.js";
+import {
+    moveWorkOrderTypeDown,
+    moveWorkOrderTypeDownToBottom
+} from "../../helpers/lotOccupancyDB/moveWorkOrderTypeDown.js";
 
 import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveWorkOrderTypeDown(request.body.workOrderTypeId);
+    const success =
+        request.body.moveToBottom === "1"
+            ? moveWorkOrderTypeDownToBottom(request.body.workOrderTypeId)
+            : moveWorkOrderTypeDown(request.body.workOrderTypeId);
 
     const workOrderTypes = getWorkOrderTypes();
 

handlers/admin-post/doMoveWorkOrderTypeUp.js

@@ -1,7 +1,9 @@
-import { moveWorkOrderTypeUp } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeUp.js";
+import { moveWorkOrderTypeUp, moveWorkOrderTypeUpToTop } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeUp.js";
 import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
 export const handler = async (request, response) => {
-    const success = moveWorkOrderTypeUp(request.body.workOrderTypeId);
+    const success = request.body.moveToTop === "1"
+        ? moveWorkOrderTypeUpToTop(request.body.workOrderTypeId)
+        : moveWorkOrderTypeUp(request.body.workOrderTypeId);
     const workOrderTypes = getWorkOrderTypes();
     response.json({
         success,

handlers/admin-post/doMoveWorkOrderTypeUp.ts

@@ -1,11 +1,17 @@
 import type { RequestHandler } from "express";
 
-import { moveWorkOrderTypeUp } from "../../helpers/lotOccupancyDB/moveWorkOrderTypeUp.js";
+import {
+    moveWorkOrderTypeUp,
+    moveWorkOrderTypeUpToTop
+} from "../../helpers/lotOccupancyDB/moveWorkOrderTypeUp.js";
 
 import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = async (request, response) => {
-    const success = moveWorkOrderTypeUp(request.body.workOrderTypeId);
+    const success =
+        request.body.moveToTop === "1"
+            ? moveWorkOrderTypeUpToTop(request.body.workOrderTypeId)
+            : moveWorkOrderTypeUp(request.body.workOrderTypeId);
 
     const workOrderTypes = getWorkOrderTypes();
 

helpers/lotOccupancyDB/moveLotOccupantTypeDown.d.ts

@@ -1,2 +1,3 @@
 export declare const moveLotOccupantTypeDown: (lotOccupantTypeId: number | string) => boolean;
+export declare const moveLotOccupantTypeDownToBottom: (lotOccupantTypeId: number | string) => boolean;
 export default moveLotOccupantTypeDown;

helpers/lotOccupancyDB/moveLotOccupantTypeDown.js

@@ -23,4 +23,29 @@ export const moveLotOccupantTypeDown = (lotOccupantTypeId) => {
     clearLotOccupantTypesCache();
     return result.changes > 0;
 };
+export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?")
+        .get(lotOccupantTypeId).orderNumber;
+    const maxOrderNumber = database
+        .prepare("select max(orderNumber) as maxOrderNumber" +
+        " from LotOccupantTypes" +
+        " where recordDelete_timeMillis is null")
+        .get().maxOrderNumber;
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update LotOccupantTypes set orderNumber = ? + 1 where lotOccupantTypeId = ?")
+            .run(maxOrderNumber, lotOccupantTypeId);
+        database
+            .prepare("update LotOccupantTypes" +
+            " set orderNumber = orderNumber - 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber > ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearLotOccupantTypesCache();
+    return true;
+};
 export default moveLotOccupantTypeDown;

helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts

@@ -41,4 +41,41 @@ export const moveLotOccupantTypeDown = (
     return result.changes > 0;
 };
 
+
+export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?")
+        .get(lotOccupantTypeId).orderNumber;
+
+    const maxOrderNumber: number = database
+        .prepare(
+            "select max(orderNumber) as maxOrderNumber" +
+                " from LotOccupantTypes" +
+                " where recordDelete_timeMillis is null"
+        )
+        .get().maxOrderNumber;
+
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update LotOccupantTypes set orderNumber = ? + 1 where lotOccupantTypeId = ?")
+            .run(maxOrderNumber, lotOccupantTypeId);
+
+        database
+            .prepare(
+                "update LotOccupantTypes" +
+                    " set orderNumber = orderNumber - 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber > ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearLotOccupantTypesCache();
+
+    return true;
+};
 export default moveLotOccupantTypeDown;

helpers/lotOccupancyDB/moveLotOccupantTypeUp.d.ts

@@ -1,2 +1,3 @@
 export declare const moveLotOccupantTypeUp: (lotOccupantTypeId: number | string) => boolean;
+export declare const moveLotOccupantTypeUpToTop: (lotOccupantTypeId: number | string) => boolean;
 export default moveLotOccupantTypeUp;

helpers/lotOccupancyDB/moveLotOccupantTypeUp.js

@@ -27,4 +27,24 @@ export const moveLotOccupantTypeUp = (lotOccupantTypeId) => {
     clearLotOccupantTypesCache();
     return result.changes > 0;
 };
+export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?")
+        .get(lotOccupantTypeId).orderNumber;
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update LotOccupantTypes set orderNumber = -1 where lotOccupantTypeId = ?")
+            .run(lotOccupantTypeId);
+        database
+            .prepare("update LotOccupantTypes" +
+            " set orderNumber = orderNumber + 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber < ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearLotOccupantTypesCache();
+    return true;
+};
 export default moveLotOccupantTypeUp;

helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts

@@ -46,4 +46,33 @@ export const moveLotOccupantTypeUp = (
     return result.changes > 0;
 };
 
+export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?")
+        .get(lotOccupantTypeId).orderNumber;
+
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update LotOccupantTypes set orderNumber = -1 where lotOccupantTypeId = ?")
+            .run(lotOccupantTypeId);
+
+        database
+            .prepare(
+                "update LotOccupantTypes" +
+                    " set orderNumber = orderNumber + 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber < ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearLotOccupantTypesCache();
+
+    return true;
+};
+
 export default moveLotOccupantTypeUp;

helpers/lotOccupancyDB/moveLotStatusDown.d.ts

@@ -1,2 +1,3 @@
 export declare const moveLotStatusDown: (lotStatusId: number | string) => boolean;
+export declare const moveLotStatusDownToBottom: (lotStatusId: number | string) => boolean;
 export default moveLotStatusDown;

helpers/lotOccupancyDB/moveLotStatusDown.js

@@ -23,4 +23,29 @@ export const moveLotStatusDown = (lotStatusId) => {
     clearLotStatusesCache();
     return result.changes > 0;
 };
+export const moveLotStatusDownToBottom = (lotStatusId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
+        .get(lotStatusId).orderNumber;
+    const maxOrderNumber = database
+        .prepare("select max(orderNumber) as maxOrderNumber" +
+        " from LotStatuses" +
+        " where recordDelete_timeMillis is null")
+        .get().maxOrderNumber;
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update LotStatuses set orderNumber = ? + 1 where lotStatusId = ?")
+            .run(maxOrderNumber, lotStatusId);
+        database
+            .prepare("update LotStatuses" +
+            " set orderNumber = orderNumber - 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber > ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearLotStatusesCache();
+    return true;
+};
 export default moveLotStatusDown;

helpers/lotOccupancyDB/moveLotStatusDown.ts

@@ -39,4 +39,41 @@ export const moveLotStatusDown = (lotStatusId: number | string): boolean => {
     return result.changes > 0;
 };
 
+export const moveLotStatusDownToBottom = (lotStatusId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
+        .get(lotStatusId).orderNumber;
+
+    const maxOrderNumber: number = database
+        .prepare(
+            "select max(orderNumber) as maxOrderNumber" +
+                " from LotStatuses" +
+                " where recordDelete_timeMillis is null"
+        )
+        .get().maxOrderNumber;
+
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update LotStatuses set orderNumber = ? + 1 where lotStatusId = ?")
+            .run(maxOrderNumber, lotStatusId);
+
+        database
+            .prepare(
+                "update LotStatuses" +
+                    " set orderNumber = orderNumber - 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber > ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearLotStatusesCache();
+
+    return true;
+};
+
 export default moveLotStatusDown;

helpers/lotOccupancyDB/moveLotStatusUp.d.ts

@@ -1,2 +1,3 @@
 export declare const moveLotStatusUp: (lotStatusId: number | string) => boolean;
+export declare const moveLotStatusUpToTop: (lotStatusId: number | string) => boolean;
 export default moveLotStatusUp;

helpers/lotOccupancyDB/moveLotStatusUp.js

@@ -4,9 +4,7 @@ import { clearLotStatusesCache } from "../functions.cache.js";
 export const moveLotStatusUp = (lotStatusId) => {
     const database = sqlite(databasePath);
     const currentOrderNumber = database
-        .prepare("select orderNumber" +
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
-        " from LotStatuses" +
-        " where lotStatusId = ?")
         .get(lotStatusId).orderNumber;
     if (currentOrderNumber <= 0) {
         database.close();
@@ -19,12 +17,30 @@ export const moveLotStatusUp = (lotStatusId) => {
         " and orderNumber = ? - 1")
         .run(currentOrderNumber);
     const result = database
-        .prepare("update LotStatuses" +
+        .prepare("update LotStatuses set orderNumber = ? - 1 where lotStatusId = ?")
-        " set orderNumber = ? - 1" +
-        " where lotStatusId = ?")
         .run(currentOrderNumber, lotStatusId);
     database.close();
     clearLotStatusesCache();
     return result.changes > 0;
 };
+export const moveLotStatusUpToTop = (lotStatusId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
+        .get(lotStatusId).orderNumber;
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update LotStatuses set orderNumber = -1 where lotStatusId = ?")
+            .run(lotStatusId);
+        database
+            .prepare("update LotStatuses" +
+            " set orderNumber = orderNumber + 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber < ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearLotStatusesCache();
+    return true;
+};
 export default moveLotStatusUp;

helpers/lotOccupancyDB/moveLotStatusUp.ts

@@ -8,11 +8,7 @@ export const moveLotStatusUp = (lotStatusId: number | string): boolean => {
     const database = sqlite(databasePath);
 
     const currentOrderNumber: number = database
-        .prepare(
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
-            "select orderNumber" +
-                " from LotStatuses" +
-                " where lotStatusId = ?"
-        )
         .get(lotStatusId).orderNumber;
 
     if (currentOrderNumber <= 0) {
@@ -30,11 +26,7 @@ export const moveLotStatusUp = (lotStatusId: number | string): boolean => {
         .run(currentOrderNumber);
 
     const result = database
-        .prepare(
+        .prepare("update LotStatuses set orderNumber = ? - 1 where lotStatusId = ?")
-            "update LotStatuses" +
-                " set orderNumber = ? - 1" +
-                " where lotStatusId = ?"
-        )
         .run(currentOrderNumber, lotStatusId);
 
     database.close();
@@ -44,4 +36,33 @@ export const moveLotStatusUp = (lotStatusId: number | string): boolean => {
     return result.changes > 0;
 };
 
+export const moveLotStatusUpToTop = (lotStatusId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from LotStatuses where lotStatusId = ?")
+        .get(lotStatusId).orderNumber;
+
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update LotStatuses set orderNumber = -1 where lotStatusId = ?")
+            .run(lotStatusId);
+
+        database
+            .prepare(
+                "update LotStatuses" +
+                    " set orderNumber = orderNumber + 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber < ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearLotStatusesCache();
+
+    return true;
+};
+
 export default moveLotStatusUp;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.d.ts

@@ -1,2 +1,3 @@
 export declare const moveWorkOrderMilestoneTypeDown: (workOrderMilestoneTypeId: number | string) => boolean;
+export declare const moveWorkOrderMilestoneTypeDownToBottom: (workOrderMilestoneTypeId: number | string) => boolean;
 export default moveWorkOrderMilestoneTypeDown;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js

@@ -23,4 +23,29 @@ export const moveWorkOrderMilestoneTypeDown = (workOrderMilestoneTypeId) => {
     clearWorkOrderMilestoneTypesCache();
     return result.changes > 0;
 };
+export const moveWorkOrderMilestoneTypeDownToBottom = (workOrderMilestoneTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?")
+        .get(workOrderMilestoneTypeId).orderNumber;
+    const maxOrderNumber = database
+        .prepare("select max(orderNumber) as maxOrderNumber" +
+        " from WorkOrderMilestoneTypes" +
+        " where recordDelete_timeMillis is null")
+        .get().maxOrderNumber;
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update WorkOrderMilestoneTypes set orderNumber = ? + 1 where workOrderMilestoneTypeId = ?")
+            .run(maxOrderNumber, workOrderMilestoneTypeId);
+        database
+            .prepare("update WorkOrderMilestoneTypes" +
+            " set orderNumber = orderNumber - 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber > ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearWorkOrderMilestoneTypesCache();
+    return true;
+};
 export default moveWorkOrderMilestoneTypeDown;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts

@@ -41,4 +41,47 @@ export const moveWorkOrderMilestoneTypeDown = (
     return result.changes > 0;
 };
 
+export const moveWorkOrderMilestoneTypeDownToBottom = (
+    workOrderMilestoneTypeId: number | string
+): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare(
+            "select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?"
+        )
+        .get(workOrderMilestoneTypeId).orderNumber;
+
+    const maxOrderNumber: number = database
+        .prepare(
+            "select max(orderNumber) as maxOrderNumber" +
+                " from WorkOrderMilestoneTypes" +
+                " where recordDelete_timeMillis is null"
+        )
+        .get().maxOrderNumber;
+
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare(
+                "update WorkOrderMilestoneTypes set orderNumber = ? + 1 where workOrderMilestoneTypeId = ?"
+            )
+            .run(maxOrderNumber, workOrderMilestoneTypeId);
+
+        database
+            .prepare(
+                "update WorkOrderMilestoneTypes" +
+                    " set orderNumber = orderNumber - 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber > ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearWorkOrderMilestoneTypesCache();
+
+    return true;
+};
+
 export default moveWorkOrderMilestoneTypeDown;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.d.ts

@@ -1,2 +1,3 @@
 export declare const moveWorkOrderMilestoneTypeUp: (workOrderMilestoneTypeId: number | string) => boolean;
+export declare const moveWorkOrderMilestoneTypeUpToTop: (workOrderMilestoneTypeId: number | string) => boolean;
 export default moveWorkOrderMilestoneTypeUp;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js

@@ -27,4 +27,24 @@ export const moveWorkOrderMilestoneTypeUp = (workOrderMilestoneTypeId) => {
     clearWorkOrderMilestoneTypesCache();
     return result.changes > 0;
 };
+export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?")
+        .get(workOrderMilestoneTypeId).orderNumber;
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update WorkOrderMilestoneTypes set orderNumber = -1 where workOrderMilestoneTypeId = ?")
+            .run(workOrderMilestoneTypeId);
+        database
+            .prepare("update WorkOrderMilestoneTypes" +
+            " set orderNumber = orderNumber + 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber < ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearWorkOrderMilestoneTypesCache();
+    return true;
+};
 export default moveWorkOrderMilestoneTypeUp;

helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts

@@ -46,4 +46,33 @@ export const moveWorkOrderMilestoneTypeUp = (
     return result.changes > 0;
 };
 
+export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?")
+        .get(workOrderMilestoneTypeId).orderNumber;
+
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update WorkOrderMilestoneTypes set orderNumber = -1 where workOrderMilestoneTypeId = ?")
+            .run(workOrderMilestoneTypeId);
+
+        database
+            .prepare(
+                "update WorkOrderMilestoneTypes" +
+                    " set orderNumber = orderNumber + 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber < ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearWorkOrderMilestoneTypesCache();
+
+    return true;
+};
+
 export default moveWorkOrderMilestoneTypeUp;

helpers/lotOccupancyDB/moveWorkOrderTypeDown.d.ts

@@ -1,2 +1,3 @@
 export declare const moveWorkOrderTypeDown: (workOrderTypeId: number | string) => boolean;
+export declare const moveWorkOrderTypeDownToBottom: (workOrderTypeId: number | string) => boolean;
 export default moveWorkOrderTypeDown;

helpers/lotOccupancyDB/moveWorkOrderTypeDown.js

@@ -4,9 +4,7 @@ import { clearWorkOrderTypesCache } from "../functions.cache.js";
 export const moveWorkOrderTypeDown = (workOrderTypeId) => {
     const database = sqlite(databasePath);
     const currentOrderNumber = database
-        .prepare("select orderNumber" +
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
-        " from WorkOrderTypes" +
-        " where workOrderTypeId = ?")
         .get(workOrderTypeId).orderNumber;
     database
         .prepare("update WorkOrderTypes" +
@@ -15,12 +13,35 @@ export const moveWorkOrderTypeDown = (workOrderTypeId) => {
         " and orderNumber = ? + 1")
         .run(currentOrderNumber);
     const result = database
-        .prepare("update WorkOrderTypes" +
+        .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?")
-        " set orderNumber = ? + 1" +
-        " where workOrderTypeId = ?")
         .run(currentOrderNumber, workOrderTypeId);
     database.close();
     clearWorkOrderTypesCache();
     return result.changes > 0;
 };
+export const moveWorkOrderTypeDownToBottom = (workOrderTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
+        .get(workOrderTypeId).orderNumber;
+    const maxOrderNumber = database
+        .prepare("select max(orderNumber) as maxOrderNumber" +
+        " from WorkOrderTypes" +
+        " where recordDelete_timeMillis is null")
+        .get().maxOrderNumber;
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?")
+            .run(maxOrderNumber, workOrderTypeId);
+        database
+            .prepare("update WorkOrderTypes" +
+            " set orderNumber = orderNumber - 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber > ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearWorkOrderTypesCache();
+    return true;
+};
 export default moveWorkOrderTypeDown;

helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts

@@ -4,17 +4,11 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
 
 import { clearWorkOrderTypesCache } from "../functions.cache.js";
 
-export const moveWorkOrderTypeDown = (
+export const moveWorkOrderTypeDown = (workOrderTypeId: number | string): boolean => {
-    workOrderTypeId: number | string
-): boolean => {
     const database = sqlite(databasePath);
 
     const currentOrderNumber: number = database
-        .prepare(
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
-            "select orderNumber" +
-                " from WorkOrderTypes" +
-                " where workOrderTypeId = ?"
-        )
         .get(workOrderTypeId).orderNumber;
 
     database
@@ -27,11 +21,7 @@ export const moveWorkOrderTypeDown = (
         .run(currentOrderNumber);
 
     const result = database
-        .prepare(
+        .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?")
-            "update WorkOrderTypes" +
-                " set orderNumber = ? + 1" +
-                " where workOrderTypeId = ?"
-        )
         .run(currentOrderNumber, workOrderTypeId);
 
     database.close();
@@ -41,4 +31,41 @@ export const moveWorkOrderTypeDown = (
     return result.changes > 0;
 };
 
+export const moveWorkOrderTypeDownToBottom = (workOrderTypeId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
+        .get(workOrderTypeId).orderNumber;
+
+    const maxOrderNumber: number = database
+        .prepare(
+            "select max(orderNumber) as maxOrderNumber" +
+                " from WorkOrderTypes" +
+                " where recordDelete_timeMillis is null"
+        )
+        .get().maxOrderNumber;
+
+    if (currentOrderNumber !== maxOrderNumber) {
+        database
+            .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?")
+            .run(maxOrderNumber, workOrderTypeId);
+
+        database
+            .prepare(
+                "update WorkOrderTypes" +
+                    " set orderNumber = orderNumber - 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber > ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearWorkOrderTypesCache();
+
+    return true;
+};
+
 export default moveWorkOrderTypeDown;

helpers/lotOccupancyDB/moveWorkOrderTypeUp.d.ts

@@ -1,2 +1,3 @@
 export declare const moveWorkOrderTypeUp: (workOrderTypeId: number | string) => boolean;
+export declare const moveWorkOrderTypeUpToTop: (workOrderTypeId: number | string) => boolean;
 export default moveWorkOrderTypeUp;

helpers/lotOccupancyDB/moveWorkOrderTypeUp.js

@@ -4,9 +4,7 @@ import { clearWorkOrderTypesCache } from "../functions.cache.js";
 export const moveWorkOrderTypeUp = (workOrderTypeId) => {
     const database = sqlite(databasePath);
     const currentOrderNumber = database
-        .prepare("select orderNumber" +
+        .prepare("select orderNumber" + " from WorkOrderTypes" + " where workOrderTypeId = ?")
-        " from WorkOrderTypes" +
-        " where workOrderTypeId = ?")
         .get(workOrderTypeId).orderNumber;
     if (currentOrderNumber <= 0) {
         database.close();
@@ -19,12 +17,30 @@ export const moveWorkOrderTypeUp = (workOrderTypeId) => {
         " and orderNumber = ? - 1")
         .run(currentOrderNumber);
     const result = database
-        .prepare("update WorkOrderTypes" +
+        .prepare("update WorkOrderTypes" + " set orderNumber = ? - 1" + " where workOrderTypeId = ?")
-        " set orderNumber = ? - 1" +
-        " where workOrderTypeId = ?")
         .run(currentOrderNumber, workOrderTypeId);
     database.close();
     clearWorkOrderTypesCache();
     return result.changes > 0;
 };
+export const moveWorkOrderTypeUpToTop = (workOrderTypeId) => {
+    const database = sqlite(databasePath);
+    const currentOrderNumber = database
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
+        .get(workOrderTypeId).orderNumber;
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update WorkOrderTypes set orderNumber = -1 where workOrderTypeId = ?")
+            .run(workOrderTypeId);
+        database
+            .prepare("update WorkOrderTypes" +
+            " set orderNumber = orderNumber + 1" +
+            " where recordDelete_timeMillis is null" +
+            " and orderNumber < ?")
+            .run(currentOrderNumber);
+    }
+    database.close();
+    clearWorkOrderTypesCache();
+    return true;
+};
 export default moveWorkOrderTypeUp;

helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts

@@ -4,17 +4,11 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
 
 import { clearWorkOrderTypesCache } from "../functions.cache.js";
 
-export const moveWorkOrderTypeUp = (
+export const moveWorkOrderTypeUp = (workOrderTypeId: number | string): boolean => {
-    workOrderTypeId: number | string
-): boolean => {
     const database = sqlite(databasePath);
 
     const currentOrderNumber: number = database
-        .prepare(
+        .prepare("select orderNumber" + " from WorkOrderTypes" + " where workOrderTypeId = ?")
-            "select orderNumber" +
-                " from WorkOrderTypes" +
-                " where workOrderTypeId = ?"
-        )
         .get(workOrderTypeId).orderNumber;
 
     if (currentOrderNumber <= 0) {
@@ -33,9 +27,7 @@ export const moveWorkOrderTypeUp = (
 
     const result = database
         .prepare(
-            "update WorkOrderTypes" +
+            "update WorkOrderTypes" + " set orderNumber = ? - 1" + " where workOrderTypeId = ?"
-                " set orderNumber = ? - 1" +
-                " where workOrderTypeId = ?"
         )
         .run(currentOrderNumber, workOrderTypeId);
 
@@ -46,4 +38,33 @@ export const moveWorkOrderTypeUp = (
     return result.changes > 0;
 };
 
+export const moveWorkOrderTypeUpToTop = (workOrderTypeId: number | string): boolean => {
+    const database = sqlite(databasePath);
+
+    const currentOrderNumber: number = database
+        .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?")
+        .get(workOrderTypeId).orderNumber;
+
+    if (currentOrderNumber > 0) {
+        database
+            .prepare("update WorkOrderTypes set orderNumber = -1 where workOrderTypeId = ?")
+            .run(workOrderTypeId);
+
+        database
+            .prepare(
+                "update WorkOrderTypes" +
+                    " set orderNumber = orderNumber + 1" +
+                    " where recordDelete_timeMillis is null" +
+                    " and orderNumber < ?"
+            )
+            .run(currentOrderNumber);
+    }
+
+    database.close();
+
+    clearWorkOrderTypesCache();
+
+    return true;
+};
+
 export default moveWorkOrderTypeUp;

public-typescript/adminTables.js

@@ -68,7 +68,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveWorkOrderTypeUp", {
-            workOrderTypeId
+            workOrderTypeId,
+            moveToTop: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 workOrderTypes = responseJSON.workOrderTypes;
@@ -87,7 +88,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveWorkOrderTypeDown", {
-            workOrderTypeId
+            workOrderTypeId,
+            moveToBottom: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 workOrderTypes = responseJSON.workOrderTypes;
@@ -118,8 +120,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
         containerElement.innerHTML = "";
         for (const workOrderType of workOrderTypes) {
             const tableRowElement = document.createElement("tr");
-            tableRowElement.dataset.workOrderTypeId =
+            tableRowElement.dataset.workOrderTypeId = workOrderType.workOrderTypeId.toString();
-                workOrderType.workOrderTypeId.toString();
             tableRowElement.innerHTML =
                 "<td>" +
                     "<form>" +
@@ -157,9 +158,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     "</div>" +
                     "</div>" +
                     "</td>";
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderType);
-                .querySelector("form")
-                .addEventListener("submit", updateWorkOrderType);
             tableRowElement
                 .querySelector(".button--moveWorkOrderTypeUp")
                 .addEventListener("click", moveWorkOrderTypeUp);
@@ -260,7 +259,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeUp", {
-            workOrderMilestoneTypeId
+            workOrderMilestoneTypeId,
+            moveToTop: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
@@ -279,7 +279,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeDown", {
-            workOrderMilestoneTypeId
+            workOrderMilestoneTypeId,
+            moveToBottom: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
@@ -394,8 +395,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             if (responseJSON.success) {
                 lotStatuses = responseJSON.lotStatuses;
                 bulmaJS.alert({
-                    message: exports.aliases.lot +
+                    message: exports.aliases.lot + " Status Updated Successfully",
-                        " Status Updated Successfully",
                     contextualColorName: "success"
                 });
             }
@@ -424,16 +424,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
                         tableRowElement.remove();
                     }
                     bulmaJS.alert({
-                        message: exports.aliases.lot +
+                        message: exports.aliases.lot + " Status Deleted Successfully",
-                            " Status Deleted Successfully",
                         contextualColorName: "success"
                     });
                 }
                 else {
                     bulmaJS.alert({
-                        title: "Error Deleting " +
+                        title: "Error Deleting " + exports.aliases.lot + " Status",
-                            exports.aliases.lot +
-                            " Status",
                         message: responseJSON.errorMessage,
                         contextualColorName: "danger"
                     });
@@ -458,7 +455,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const lotStatusId = tableRowElement.dataset.lotStatusId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveLotStatusUp", {
-            lotStatusId
+            lotStatusId,
+            moveToTop: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 lotStatuses = responseJSON.lotStatuses;
@@ -477,7 +475,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const lotStatusId = tableRowElement.dataset.lotStatusId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveLotStatusDown", {
-            lotStatusId
+            lotStatusId,
+            moveToBottom: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 lotStatuses = responseJSON.lotStatuses;
@@ -510,8 +509,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
         containerElement.innerHTML = "";
         for (const lotStatus of lotStatuses) {
             const tableRowElement = document.createElement("tr");
-            tableRowElement.dataset.lotStatusId =
+            tableRowElement.dataset.lotStatusId = lotStatus.lotStatusId.toString();
-                lotStatus.lotStatusId.toString();
             tableRowElement.innerHTML =
                 "<td>" +
                     "<form>" +
@@ -549,9 +547,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     "</div>" +
                     "</div>" +
                     "</td>";
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateLotStatus);
-                .querySelector("form")
-                .addEventListener("submit", updateLotStatus);
             tableRowElement
                 .querySelector(".button--moveLotStatusUp")
                 .addEventListener("click", moveLotStatusUp);
@@ -578,9 +574,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
             else {
                 bulmaJS.alert({
-                    title: "Error Adding " +
+                    title: "Error Adding " + exports.aliases.lot + " Status",
-                        exports.aliases.lot +
-                        " Status",
                     message: responseJSON.errorMessage,
                     contextualColorName: "danger"
                 });
@@ -653,11 +647,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             });
         };
         bulmaJS.confirm({
-            title: "Delete " +
+            title: "Delete " + exports.aliases.lot + " " + exports.aliases.occupant + " Type",
-                exports.aliases.lot +
-                " " +
-                exports.aliases.occupant +
-                " Type",
             message: "Are you sure you want to delete this " +
                 exports.aliases.lot.toLowerCase() +
                 " " +
@@ -671,11 +661,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             messageIsHtml: true,
             contextualColorName: "warning",
             okButton: {
-                text: "Yes, Delete " +
+                text: "Yes, Delete " + exports.aliases.lot + " " + exports.aliases.occupant + " Type",
-                    exports.aliases.lot +
-                    " " +
-                    exports.aliases.occupant +
-                    " Type",
                 callbackFunction: doDelete
             }
         });
@@ -684,7 +670,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveLotOccupantTypeUp", {
-            lotOccupantTypeId
+            lotOccupantTypeId,
+            moveToTop: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 lotOccupantTypes = responseJSON.lotOccupantTypes;
@@ -707,7 +694,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
         const tableRowElement = clickEvent.currentTarget.closest("tr");
         const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
         cityssm.postJSON(urlPrefix + "/admin/doMoveLotOccupantTypeDown", {
-            lotOccupantTypeId
+            lotOccupantTypeId,
+            moveToBottom: clickEvent.shiftKey ? "1" : "0"
         }, (responseJSON) => {
             if (responseJSON.success) {
                 lotOccupantTypes = responseJSON.lotOccupantTypes;
@@ -795,9 +783,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     "</div>" +
                     "</div>" +
                     "</td>";
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateLotOccupantType);
-                .querySelector("form")
-                .addEventListener("submit", updateLotOccupantType);
             tableRowElement
                 .querySelector(".button--moveLotOccupantTypeUp")
                 .addEventListener("click", moveLotOccupantTypeUp);

public-typescript/adminTables.ts

@@ -49,9 +49,7 @@ declare const bulmaJS: BulmaJS;
     };
 
     const deleteWorkOrderType = (clickEvent: Event) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
 
@@ -104,17 +102,16 @@ declare const bulmaJS: BulmaJS;
         });
     };
 
-    const moveWorkOrderTypeUp = (clickEvent: Event) => {
+    const moveWorkOrderTypeUp = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveWorkOrderTypeUp",
             {
-                workOrderTypeId
+                workOrderTypeId,
+                moveToTop: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -135,17 +132,16 @@ declare const bulmaJS: BulmaJS;
         );
     };
 
-    const moveWorkOrderTypeDown = (clickEvent: Event) => {
+    const moveWorkOrderTypeDown = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveWorkOrderTypeDown",
             {
-                workOrderTypeId
+                workOrderTypeId,
+                moveToBottom: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -189,8 +185,7 @@ declare const bulmaJS: BulmaJS;
         for (const workOrderType of workOrderTypes) {
             const tableRowElement = document.createElement("tr");
 
-            tableRowElement.dataset.workOrderTypeId =
+            tableRowElement.dataset.workOrderTypeId = workOrderType.workOrderTypeId.toString();
-                workOrderType.workOrderTypeId.toString();
 
             tableRowElement.innerHTML =
                 "<td>" +
@@ -230,9 +225,7 @@ declare const bulmaJS: BulmaJS;
                 "</div>" +
                 "</td>";
 
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderType);
-                .querySelector("form")
-                .addEventListener("submit", updateWorkOrderType);
             tableRowElement
                 .querySelector(".button--moveWorkOrderTypeUp")
                 .addEventListener("click", moveWorkOrderTypeUp);
@@ -284,7 +277,8 @@ declare const bulmaJS: BulmaJS;
      * Work Order Milestone Types
      */
 
-    let workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] = exports.workOrderMilestoneTypes;
+    let workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] =
+        exports.workOrderMilestoneTypes;
     delete exports.workOrderMilestoneTypes;
 
     const updateWorkOrderMilestoneType = (submitEvent: SubmitEvent) => {
@@ -317,9 +311,7 @@ declare const bulmaJS: BulmaJS;
     };
 
     const deleteWorkOrderMilestoneType = (clickEvent: Event) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
 
@@ -372,17 +364,16 @@ declare const bulmaJS: BulmaJS;
         });
     };
 
-    const moveWorkOrderMilestoneTypeUp = (clickEvent: Event) => {
+    const moveWorkOrderMilestoneTypeUp = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeUp",
             {
-                workOrderMilestoneTypeId
+                workOrderMilestoneTypeId,
+                moveToTop: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -403,17 +394,16 @@ declare const bulmaJS: BulmaJS;
         );
     };
 
-    const moveWorkOrderMilestoneTypeDown = (clickEvent: Event) => {
+    const moveWorkOrderMilestoneTypeDown = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeDown",
             {
-                workOrderMilestoneTypeId
+                workOrderMilestoneTypeId,
+                moveToBottom: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -570,15 +560,12 @@ declare const bulmaJS: BulmaJS;
                     lotStatuses = responseJSON.lotStatuses;
 
                     bulmaJS.alert({
-                        message:
+                        message: exports.aliases.lot + " Status Updated Successfully",
-                            exports.aliases.lot +
-                            " Status Updated Successfully",
                         contextualColorName: "success"
                     });
                 } else {
                     bulmaJS.alert({
-                        title:
+                        title: "Error Updating " + exports.aliases.lot + " Status",
-                            "Error Updating " + exports.aliases.lot + " Status",
                         message: responseJSON.errorMessage,
                         contextualColorName: "danger"
                     });
@@ -588,9 +575,7 @@ declare const bulmaJS: BulmaJS;
     };
 
     const deleteLotStatus = (clickEvent: Event) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotStatusId = tableRowElement.dataset.lotStatusId;
 
@@ -615,17 +600,12 @@ declare const bulmaJS: BulmaJS;
                         }
 
                         bulmaJS.alert({
-                            message:
+                            message: exports.aliases.lot + " Status Deleted Successfully",
-                                exports.aliases.lot +
-                                " Status Deleted Successfully",
                             contextualColorName: "success"
                         });
                     } else {
                         bulmaJS.alert({
-                            title:
+                            title: "Error Deleting " + exports.aliases.lot + " Status",
-                                "Error Deleting " +
-                                exports.aliases.lot +
-                                " Status",
                             message: responseJSON.errorMessage,
                             contextualColorName: "danger"
                         });
@@ -650,17 +630,16 @@ declare const bulmaJS: BulmaJS;
         });
     };
 
-    const moveLotStatusUp = (clickEvent: Event) => {
+    const moveLotStatusUp = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotStatusId = tableRowElement.dataset.lotStatusId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveLotStatusUp",
             {
-                lotStatusId
+                lotStatusId,
+                moveToTop: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -672,8 +651,7 @@ declare const bulmaJS: BulmaJS;
                     renderLotStatuses();
                 } else {
                     bulmaJS.alert({
-                        title:
+                        title: "Error Moving " + exports.aliases.lot + " Status",
-                            "Error Moving " + exports.aliases.lot + " Status",
                         message: responseJSON.errorMessage,
                         contextualColorName: "danger"
                     });
@@ -682,17 +660,16 @@ declare const bulmaJS: BulmaJS;
         );
     };
 
-    const moveLotStatusDown = (clickEvent: Event) => {
+    const moveLotStatusDown = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotStatusId = tableRowElement.dataset.lotStatusId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveLotStatusDown",
             {
-                lotStatusId
+                lotStatusId,
+                moveToBottom: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -704,8 +681,7 @@ declare const bulmaJS: BulmaJS;
                     renderLotStatuses();
                 } else {
                     bulmaJS.alert({
-                        title:
+                        title: "Error Moving " + exports.aliases.lot + " Status",
-                            "Error Moving " + exports.aliases.lot + " Status",
                         message: responseJSON.errorMessage,
                         contextualColorName: "danger"
                     });
@@ -739,8 +715,7 @@ declare const bulmaJS: BulmaJS;
         for (const lotStatus of lotStatuses) {
             const tableRowElement = document.createElement("tr");
 
-            tableRowElement.dataset.lotStatusId =
+            tableRowElement.dataset.lotStatusId = lotStatus.lotStatusId.toString();
-                lotStatus.lotStatusId.toString();
 
             tableRowElement.innerHTML =
                 "<td>" +
@@ -780,9 +755,7 @@ declare const bulmaJS: BulmaJS;
                 "</div>" +
                 "</td>";
 
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateLotStatus);
-                .querySelector("form")
-                .addEventListener("submit", updateLotStatus);
             tableRowElement
                 .querySelector(".button--moveLotStatusUp")
                 .addEventListener("click", moveLotStatusUp);
@@ -819,10 +792,7 @@ declare const bulmaJS: BulmaJS;
                         formElement.querySelector("input").focus();
                     } else {
                         bulmaJS.alert({
-                            title:
+                            title: "Error Adding " + exports.aliases.lot + " Status",
-                                "Error Adding " +
-                                exports.aliases.lot +
-                                " Status",
                             message: responseJSON.errorMessage,
                             contextualColorName: "danger"
                         });
@@ -837,8 +807,7 @@ declare const bulmaJS: BulmaJS;
      * Lot Occupant Types
      */
 
-    let lotOccupantTypes: recordTypes.LotOccupantType[] =
+    let lotOccupantTypes: recordTypes.LotOccupantType[] = exports.lotOccupantTypes;
-        exports.lotOccupantTypes;
     delete exports.lotOccupantTypes;
 
     const updateLotOccupantType = (submitEvent: SubmitEvent) => {
@@ -880,9 +849,7 @@ declare const bulmaJS: BulmaJS;
     };
 
     const deleteLotOccupantType = (clickEvent: Event) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
 
@@ -931,12 +898,7 @@ declare const bulmaJS: BulmaJS;
         };
 
         bulmaJS.confirm({
-            title:
+            title: "Delete " + exports.aliases.lot + " " + exports.aliases.occupant + " Type",
-                "Delete " +
-                exports.aliases.lot +
-                " " +
-                exports.aliases.occupant +
-                " Type",
             message:
                 "Are you sure you want to delete this " +
                 exports.aliases.lot.toLowerCase() +
@@ -952,27 +914,22 @@ declare const bulmaJS: BulmaJS;
             contextualColorName: "warning",
             okButton: {
                 text:
-                    "Yes, Delete " +
+                    "Yes, Delete " + exports.aliases.lot + " " + exports.aliases.occupant + " Type",
-                    exports.aliases.lot +
-                    " " +
-                    exports.aliases.occupant +
-                    " Type",
                 callbackFunction: doDelete
             }
         });
     };
 
-    const moveLotOccupantTypeUp = (clickEvent: Event) => {
+    const moveLotOccupantTypeUp = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveLotOccupantTypeUp",
             {
-                lotOccupantTypeId
+                lotOccupantTypeId,
+                moveToTop: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -998,17 +955,16 @@ declare const bulmaJS: BulmaJS;
         );
     };
 
-    const moveLotOccupantTypeDown = (clickEvent: Event) => {
+    const moveLotOccupantTypeDown = (clickEvent: MouseEvent) => {
-        const tableRowElement = (
+        const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr");
-            clickEvent.currentTarget as HTMLElement
-        ).closest("tr");
 
         const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
 
         cityssm.postJSON(
             urlPrefix + "/admin/doMoveLotOccupantTypeDown",
             {
-                lotOccupantTypeId
+                lotOccupantTypeId,
+                moveToBottom: clickEvent.shiftKey ? "1" : "0"
             },
             (responseJSON: {
                 success: boolean;
@@ -1112,9 +1068,7 @@ declare const bulmaJS: BulmaJS;
                 "</div>" +
                 "</td>";
 
-            tableRowElement
+            tableRowElement.querySelector("form").addEventListener("submit", updateLotOccupantType);
-                .querySelector("form")
-                .addEventListener("submit", updateLotOccupantType);
             tableRowElement
                 .querySelector(".button--moveLotOccupantTypeUp")
                 .addEventListener("click", moveLotOccupantTypeUp);