reduce move duplication

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-04 14:37:28 -05:00
parent 35dbc09d82
commit abf8f6df37
26 changed files with 153 additions and 382 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -76,32 +76,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
};
const moveWorkOrderTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveWorkOrderType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderTypeUp"
: "doMoveWorkOrderTypeDown"), {
workOrderTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderTypes = responseJSON.workOrderTypes;
renderWorkOrderTypes();
}
else {
bulmaJS.alert({
title: "Error Moving Work Order Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveWorkOrderTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderTypeDown", {
workOrderTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderTypes = responseJSON.workOrderTypes;
@ -164,8 +149,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderType);
tableRowElement.querySelector(".button--moveWorkOrderTypeUp").addEventListener("click", moveWorkOrderTypeUp);
tableRowElement.querySelector(".button--moveWorkOrderTypeDown").addEventListener("click", moveWorkOrderTypeDown);
tableRowElement.querySelector(".button--moveWorkOrderTypeUp").addEventListener("click", moveWorkOrderType);
tableRowElement.querySelector(".button--moveWorkOrderTypeDown").addEventListener("click", moveWorkOrderType);
tableRowElement
.querySelector(".button--deleteWorkOrderType")
.addEventListener("click", deleteWorkOrderType);
@ -258,32 +243,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
};
const moveWorkOrderMilestoneTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveWorkOrderMilestoneType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderMilestoneTypeUp"
: "doMoveWorkOrderMilestoneTypeDown"), {
workOrderMilestoneTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
renderWorkOrderMilestoneTypes();
}
else {
bulmaJS.alert({
title: "Error Moving Work Order Milestone Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveWorkOrderMilestoneTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeDown", {
workOrderMilestoneTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
@ -347,8 +317,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderMilestoneType);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeUp").addEventListener("click", moveWorkOrderMilestoneTypeUp);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeDown").addEventListener("click", moveWorkOrderMilestoneTypeDown);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeUp").addEventListener("click", moveWorkOrderMilestoneType);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeDown").addEventListener("click", moveWorkOrderMilestoneType);
tableRowElement
.querySelector(".button--deleteWorkOrderMilestoneType")
.addEventListener("click", deleteWorkOrderMilestoneType);
@ -443,32 +413,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
};
const moveLotStatusUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveLotStatus = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotStatusUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotStatusUp"
: "doMoveLotStatusDown"), {
lotStatusId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotStatuses = responseJSON.lotStatuses;
renderLotStatuses();
}
else {
bulmaJS.alert({
title: "Error Moving " + exports.aliases.lot + " Status",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveLotStatusDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotStatusDown", {
lotStatusId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotStatuses = responseJSON.lotStatuses;
@ -534,8 +489,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateLotStatus);
tableRowElement.querySelector(".button--moveLotStatusUp").addEventListener("click", moveLotStatusUp);
tableRowElement.querySelector(".button--moveLotStatusDown").addEventListener("click", moveLotStatusDown);
tableRowElement.querySelector(".button--moveLotStatusUp").addEventListener("click", moveLotStatus);
tableRowElement.querySelector(".button--moveLotStatusDown").addEventListener("click", moveLotStatus);
tableRowElement
.querySelector(".button--deleteLotStatus")
.addEventListener("click", deleteLotStatus);
@ -650,36 +605,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
};
const moveLotOccupantTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveLotOccupantType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotOccupantTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotOccupantTypeUp"
: "doMoveLotOccupantTypeDown"), {
lotOccupantTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotOccupantTypes = responseJSON.lotOccupantTypes;
renderLotOccupantTypes();
}
else {
bulmaJS.alert({
title: "Error Moving " +
exports.aliases.lot +
" " +
exports.aliases.occupant +
" Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveLotOccupantTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotOccupantTypeDown", {
lotOccupantTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotOccupantTypes = responseJSON.lotOccupantTypes;
@ -785,8 +721,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
fontAwesomeInputElement.addEventListener("keyup", refreshFontAwesomeIcon);
fontAwesomeInputElement.addEventListener("change", refreshFontAwesomeIcon);
tableRowElement.querySelector("form").addEventListener("submit", updateLotOccupantType);
tableRowElement.querySelector(".button--moveLotOccupantTypeUp").addEventListener("click", moveLotOccupantTypeUp);
tableRowElement.querySelector(".button--moveLotOccupantTypeDown").addEventListener("click", moveLotOccupantTypeDown);
tableRowElement.querySelector(".button--moveLotOccupantTypeUp").addEventListener("click", moveLotOccupantType);
tableRowElement.querySelector(".button--moveLotOccupantTypeDown").addEventListener("click", moveLotOccupantType);
tableRowElement
.querySelector(".button--deleteLotOccupantType")
.addEventListener("click", deleteLotOccupantType);

View File

@ -85,36 +85,17 @@ const deleteLotOccupantType = (clickEvent) => {
}
});
};
const moveLotOccupantTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveLotOccupantType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotOccupantTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotOccupantTypeUp"
: "doMoveLotOccupantTypeDown"), {
lotOccupantTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotOccupantTypes = responseJSON.lotOccupantTypes;
renderLotOccupantTypes();
}
else {
bulmaJS.alert({
title: "Error Moving " +
exports.aliases.lot +
" " +
exports.aliases.occupant +
" Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveLotOccupantTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotOccupantTypeDown", {
lotOccupantTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotOccupantTypes = responseJSON.lotOccupantTypes;
@ -220,8 +201,8 @@ const renderLotOccupantTypes = () => {
fontAwesomeInputElement.addEventListener("keyup", refreshFontAwesomeIcon);
fontAwesomeInputElement.addEventListener("change", refreshFontAwesomeIcon);
tableRowElement.querySelector("form").addEventListener("submit", updateLotOccupantType);
tableRowElement.querySelector(".button--moveLotOccupantTypeUp").addEventListener("click", moveLotOccupantTypeUp);
tableRowElement.querySelector(".button--moveLotOccupantTypeDown").addEventListener("click", moveLotOccupantTypeDown);
tableRowElement.querySelector(".button--moveLotOccupantTypeUp").addEventListener("click", moveLotOccupantType);
tableRowElement.querySelector(".button--moveLotOccupantTypeDown").addEventListener("click", moveLotOccupantType);
tableRowElement
.querySelector(".button--deleteLotOccupantType")
.addEventListener("click", deleteLotOccupantType);

View File

@ -125,51 +125,22 @@ const deleteLotOccupantType = (clickEvent: Event) => {
});
};
const moveLotOccupantTypeUp = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const moveLotOccupantType = (clickEvent: MouseEvent) => {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const tableRowElement = buttonElement.closest("tr")!;
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveLotOccupantTypeUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotOccupantTypeUp"
: "doMoveLotOccupantTypeDown"),
{
lotOccupantTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
errorMessage?: string;
lotOccupantTypes?: recordTypes.LotOccupantType[];
}) => {
if (responseJSON.success) {
lotOccupantTypes = responseJSON.lotOccupantTypes!;
renderLotOccupantTypes();
} else {
bulmaJS.alert({
title:
"Error Moving " +
exports.aliases.lot +
" " +
exports.aliases.occupant +
" Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
};
const moveLotOccupantTypeDown = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const lotOccupantTypeId = tableRowElement.dataset.lotOccupantTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveLotOccupantTypeDown",
{
lotOccupantTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -303,11 +274,11 @@ const renderLotOccupantTypes = () => {
(
tableRowElement.querySelector(".button--moveLotOccupantTypeUp") as HTMLButtonElement
).addEventListener("click", moveLotOccupantTypeUp);
).addEventListener("click", moveLotOccupantType);
(
tableRowElement.querySelector(".button--moveLotOccupantTypeDown") as HTMLButtonElement
).addEventListener("click", moveLotOccupantTypeDown);
).addEventListener("click", moveLotOccupantType);
tableRowElement
.querySelector(".button--deleteLotOccupantType")!

View File

@ -65,32 +65,17 @@ const deleteLotStatus = (clickEvent) => {
}
});
};
const moveLotStatusUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveLotStatus = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotStatusUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotStatusUp"
: "doMoveLotStatusDown"), {
lotStatusId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotStatuses = responseJSON.lotStatuses;
renderLotStatuses();
}
else {
bulmaJS.alert({
title: "Error Moving " + exports.aliases.lot + " Status",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveLotStatusDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveLotStatusDown", {
lotStatusId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
lotStatuses = responseJSON.lotStatuses;
@ -156,8 +141,8 @@ const renderLotStatuses = () => {
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateLotStatus);
tableRowElement.querySelector(".button--moveLotStatusUp").addEventListener("click", moveLotStatusUp);
tableRowElement.querySelector(".button--moveLotStatusDown").addEventListener("click", moveLotStatusDown);
tableRowElement.querySelector(".button--moveLotStatusUp").addEventListener("click", moveLotStatus);
tableRowElement.querySelector(".button--moveLotStatusDown").addEventListener("click", moveLotStatus);
tableRowElement
.querySelector(".button--deleteLotStatus")
.addEventListener("click", deleteLotStatus);

View File

@ -100,46 +100,22 @@ const deleteLotStatus = (clickEvent: Event) => {
});
};
const moveLotStatusUp = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const moveLotStatus = (clickEvent: MouseEvent) => {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const tableRowElement = buttonElement.closest("tr")!;
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveLotStatusUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveLotStatusUp"
: "doMoveLotStatusDown"),
{
lotStatusId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
errorMessage?: string;
lotStatuses?: recordTypes.LotStatus[];
}) => {
if (responseJSON.success) {
lotStatuses = responseJSON.lotStatuses!;
renderLotStatuses();
} else {
bulmaJS.alert({
title: "Error Moving " + exports.aliases.lot + " Status",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
};
const moveLotStatusDown = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const lotStatusId = tableRowElement.dataset.lotStatusId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveLotStatusDown",
{
lotStatusId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -227,11 +203,11 @@ const renderLotStatuses = () => {
(
tableRowElement.querySelector(".button--moveLotStatusUp") as HTMLButtonElement
).addEventListener("click", moveLotStatusUp);
).addEventListener("click", moveLotStatus);
(
tableRowElement.querySelector(".button--moveLotStatusDown") as HTMLButtonElement
).addEventListener("click", moveLotStatusDown);
).addEventListener("click", moveLotStatus);
tableRowElement
.querySelector(".button--deleteLotStatus")!

View File

@ -63,32 +63,17 @@ const deleteWorkOrderMilestoneType = (clickEvent) => {
}
});
};
const moveWorkOrderMilestoneTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveWorkOrderMilestoneType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderMilestoneTypeUp"
: "doMoveWorkOrderMilestoneTypeDown"), {
workOrderMilestoneTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
renderWorkOrderMilestoneTypes();
}
else {
bulmaJS.alert({
title: "Error Moving Work Order Milestone Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveWorkOrderMilestoneTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeDown", {
workOrderMilestoneTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes;
@ -152,8 +137,8 @@ const renderWorkOrderMilestoneTypes = () => {
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderMilestoneType);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeUp").addEventListener("click", moveWorkOrderMilestoneTypeUp);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeDown").addEventListener("click", moveWorkOrderMilestoneTypeDown);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeUp").addEventListener("click", moveWorkOrderMilestoneType);
tableRowElement.querySelector(".button--moveWorkOrderMilestoneTypeDown").addEventListener("click", moveWorkOrderMilestoneType);
tableRowElement
.querySelector(".button--deleteWorkOrderMilestoneType")
.addEventListener("click", deleteWorkOrderMilestoneType);

View File

@ -98,46 +98,22 @@ const deleteWorkOrderMilestoneType = (clickEvent: Event) => {
});
};
const moveWorkOrderMilestoneTypeUp = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const moveWorkOrderMilestoneType = (clickEvent: MouseEvent) => {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const tableRowElement = buttonElement.closest("tr")!;
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderMilestoneTypeUp"
: "doMoveWorkOrderMilestoneTypeDown"),
{
workOrderMilestoneTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
errorMessage?: string;
workOrderMilestoneTypes?: recordTypes.WorkOrderMilestoneType[];
}) => {
if (responseJSON.success) {
workOrderMilestoneTypes = responseJSON.workOrderMilestoneTypes!;
renderWorkOrderMilestoneTypes();
} else {
bulmaJS.alert({
title: "Error Moving Work Order Milestone Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
};
const moveWorkOrderMilestoneTypeDown = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const workOrderMilestoneTypeId = tableRowElement.dataset.workOrderMilestoneTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveWorkOrderMilestoneTypeDown",
{
workOrderMilestoneTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -228,13 +204,13 @@ const renderWorkOrderMilestoneTypes = () => {
tableRowElement.querySelector(
".button--moveWorkOrderMilestoneTypeUp"
) as HTMLButtonElement
).addEventListener("click", moveWorkOrderMilestoneTypeUp);
).addEventListener("click", moveWorkOrderMilestoneType);
(
tableRowElement.querySelector(
".button--moveWorkOrderMilestoneTypeDown"
) as HTMLButtonElement
).addEventListener("click", moveWorkOrderMilestoneTypeDown);
).addEventListener("click", moveWorkOrderMilestoneType);
tableRowElement
.querySelector(".button--deleteWorkOrderMilestoneType")!

View File

@ -63,32 +63,17 @@ const deleteWorkOrderType = (clickEvent) => {
}
});
};
const moveWorkOrderTypeUp = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const moveWorkOrderType = (clickEvent) => {
const buttonElement = clickEvent.currentTarget;
const tableRowElement = buttonElement.closest("tr");
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderTypeUp"
: "doMoveWorkOrderTypeDown"), {
workOrderTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderTypes = responseJSON.workOrderTypes;
renderWorkOrderTypes();
}
else {
bulmaJS.alert({
title: "Error Moving Work Order Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
const moveWorkOrderTypeDown = (clickEvent) => {
const tableRowElement = clickEvent.currentTarget.closest("tr");
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveWorkOrderTypeDown", {
workOrderTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
workOrderTypes = responseJSON.workOrderTypes;
@ -151,8 +136,8 @@ const renderWorkOrderTypes = () => {
"</div>" +
"</td>";
tableRowElement.querySelector("form").addEventListener("submit", updateWorkOrderType);
tableRowElement.querySelector(".button--moveWorkOrderTypeUp").addEventListener("click", moveWorkOrderTypeUp);
tableRowElement.querySelector(".button--moveWorkOrderTypeDown").addEventListener("click", moveWorkOrderTypeDown);
tableRowElement.querySelector(".button--moveWorkOrderTypeUp").addEventListener("click", moveWorkOrderType);
tableRowElement.querySelector(".button--moveWorkOrderTypeDown").addEventListener("click", moveWorkOrderType);
tableRowElement
.querySelector(".button--deleteWorkOrderType")
.addEventListener("click", deleteWorkOrderType);

View File

@ -98,46 +98,22 @@ const deleteWorkOrderType = (clickEvent: Event) => {
});
};
const moveWorkOrderTypeUp = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const moveWorkOrderType = (clickEvent: MouseEvent) => {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const tableRowElement = buttonElement.closest("tr")!;
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveWorkOrderTypeUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveWorkOrderTypeUp"
: "doMoveWorkOrderTypeDown"),
{
workOrderTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
errorMessage?: string;
workOrderTypes?: recordTypes.WorkOrderType[];
}) => {
if (responseJSON.success) {
workOrderTypes = responseJSON.workOrderTypes!;
renderWorkOrderTypes();
} else {
bulmaJS.alert({
title: "Error Moving Work Order Type",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
};
const moveWorkOrderTypeDown = (clickEvent: MouseEvent) => {
const tableRowElement = (clickEvent.currentTarget as HTMLElement).closest("tr")!;
const workOrderTypeId = tableRowElement.dataset.workOrderTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveWorkOrderTypeDown",
{
workOrderTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -222,11 +198,11 @@ const renderWorkOrderTypes = () => {
(
tableRowElement.querySelector(".button--moveWorkOrderTypeUp") as HTMLButtonElement
).addEventListener("click", moveWorkOrderTypeUp);
).addEventListener("click", moveWorkOrderType);
(
tableRowElement.querySelector(".button--moveWorkOrderTypeDown") as HTMLButtonElement
).addEventListener("click", moveWorkOrderTypeDown);
).addEventListener("click", moveWorkOrderType);
tableRowElement
.querySelector(".button--deleteWorkOrderType")!

File diff suppressed because one or more lines are too long