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

refactoring

deepsource-autofix-76c6eb20
Dan Gowans 2022-12-30 14:53:00 -05:00
parent b1f4eb9fd1
commit e6eb977705
6 changed files with 1092 additions and 1109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
public-typescript/workOrderEdit.js
View File

@ -41,9 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
/*
* Work Order Options
*/
let workOrderMilestones;
if (!isCreate) {
const doClose = () => {
function doClose() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doCloseWorkOrder", {
workOrderId
}, (responseJSON) => {
@ -59,7 +57,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
};
}
function doDelete() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrder", {
workOrderId
}, (responseJSON) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
}
else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
}
let workOrderMilestones;
if (!isCreate) {
document.querySelector("#button--closeWorkOrder").addEventListener("click", () => {
const hasOpenMilestones = workOrderMilestones.some((milestone) => {
return !milestone.workOrderMilestoneCompletionDate;
@ -97,23 +113,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
const doDelete = () => {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrder", {
workOrderId
}, (responseJSON) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
}
else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
document.querySelector("#button--deleteWorkOrder").addEventListener("click", (clickEvent) => {
document
.querySelector("#button--deleteWorkOrder")
.addEventListener("click", (clickEvent) => {
clickEvent.preventDefault();
bulmaJS.confirm({
title: "Delete Work Order",
@ -696,7 +698,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
let editFormElement;
let editCloseModalFunction;
const editComment = (submitEvent) => {
function editComment(submitEvent) {
submitEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + "/workOrders/doUpdateWorkOrderComment", editFormElement, (responseJSON) => {
if (responseJSON.success) {
@ -712,15 +714,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
};
}
cityssm.openHtmlModal("workOrder-editComment", {
onshow: (modalElement) => {
onshow(modalElement) {
modalElement.querySelector("#workOrderCommentEdit--workOrderId").value = workOrderId;
modalElement.querySelector("#workOrderCommentEdit--workOrderCommentId").value = workOrderCommentId.toString();
modalElement.querySelector("#workOrderCommentEdit--workOrderComment").value = workOrderComment.workOrderComment;
const workOrderCommentDateStringElement = modalElement.querySelector("#workOrderCommentEdit--workOrderCommentDateString");
workOrderCommentDateStringElement.value =
workOrderComment.workOrderCommentDateString;
workOrderCommentDateStringElement.value = workOrderComment.workOrderCommentDateString;
const currentDateString = cityssm.dateToString(new Date());
workOrderCommentDateStringElement.max =
workOrderComment.workOrderCommentDateString <= currentDateString
@ -728,7 +729,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
: workOrderComment.workOrderCommentDateString;
modalElement.querySelector("#workOrderCommentEdit--workOrderCommentTimeString").value = workOrderComment.workOrderCommentTimeString;
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
bulmaJS.toggleHtmlClipped();
los.initializeDatePickers(modalElement);
// los.initializeTimePickers(modalElement);
@ -737,14 +738,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
editFormElement.addEventListener("submit", editComment);
editCloseModalFunction = closeModalFunction;
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});
};
const deleteWorkOrderComment = (clickEvent) => {
function deleteWorkOrderComment(clickEvent) {
const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest("tr").dataset.workOrderCommentId, 10);
const doDelete = () => {
function doDelete() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrderComment", {
workOrderId,
workOrderCommentId
@ -761,7 +762,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
};
}
bulmaJS.confirm({
title: "Remove Comment?",
message: "Are you sure you want to remove this comment?",
@ -771,8 +772,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
},
contextualColorName: "warning"
});
};
const renderWorkOrderComments = () => {
}
function renderWorkOrderComments() {
const containerElement = document.querySelector("#container--workOrderComments");
if (workOrderComments.length === 0) {
containerElement.innerHTML =
@ -819,16 +820,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</button>") +
"</div>" +
"</td>");
tableRowElement.querySelector(".button--edit").addEventListener("click", openEditWorkOrderComment);
tableRowElement.querySelector(".button--delete").addEventListener("click", deleteWorkOrderComment);
tableRowElement
.querySelector(".button--edit")
.addEventListener("click", openEditWorkOrderComment);
tableRowElement
.querySelector(".button--delete")
.addEventListener("click", deleteWorkOrderComment);
tableElement.querySelector("tbody").append(tableRowElement);
}
containerElement.innerHTML = "";
containerElement.append(tableElement);
};
const openAddCommentModal = () => {
}
function openAddCommentModal() {
let addCommentCloseModalFunction;
const doAddComment = (formEvent) => {
function doAddComment(formEvent) {
formEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + "/workOrders/doAddWorkOrderComment", formEvent.currentTarget, (responseJSON) => {
if (responseJSON.success) {
@ -837,7 +842,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
addCommentCloseModalFunction();
}
});
};
}
cityssm.openHtmlModal("workOrder-addComment", {
onshow(modalElement) {
los.populateAliases(modalElement);
@ -854,19 +859,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
document.querySelector("#workOrderComments--add").focus();
}
});
};
}
if (!isCreate) {
document.querySelector("#workOrderComments--add").addEventListener("click", openAddCommentModal);
document
.querySelector("#workOrderComments--add")
.addEventListener("click", openAddCommentModal);
renderWorkOrderComments();
}
/*
* Milestones
*/
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones;
delete exports.workOrderMilestones;
const processMilestoneResponse = (responseJSON) => {
function processMilestoneResponse(responseJSON) {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
renderMilestones();
@ -878,8 +882,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
contextualColorName: "danger"
});
}
};
const completeMilestone = (clickEvent) => {
}
function completeMilestone(clickEvent) {
clickEvent.preventDefault();
const currentDateString = cityssm.dateToString(new Date());
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId, 10);
@ -905,8 +909,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doComplete
}
});
};
const reopenMilestone = (clickEvent) => {
}
function reopenMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;
const doReopen = () => {
@ -924,8 +928,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doReopen
}
});
};
const deleteMilestone = (clickEvent) => {
}
function deleteMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;
const doDelete = () => {
@ -943,8 +947,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doDelete
}
});
};
const editMilestone = (clickEvent) => {
}
function editMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId, 10);
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
@ -979,8 +983,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
if (!milestoneTypeFound && workOrderMilestone.workOrderMilestoneTypeId) {
const optionElement = document.createElement("option");
optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.value = workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.textContent = workOrderMilestone.workOrderMilestoneType;
optionElement.selected = true;
milestoneTypeElement.append(optionElement);
@ -1002,8 +1005,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
bulmaJS.toggleHtmlClipped();
}
});
};
const renderMilestones = () => {
}
function renderMilestones() {
// Clear milestones panel
const milestonesPanelElement = document.querySelector("#panel--milestones");
const panelBlockElementsToDelete = milestonesPanelElement.querySelectorAll(".panel-block");
@ -1084,7 +1087,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
milestonesPanelElement.append(panelBlockElement);
}
bulmaJS.init(milestonesPanelElement);
};
}
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones;
delete exports.workOrderMilestones;
renderMilestones();
document.querySelector("#button--addMilestone").addEventListener("click", () => {
let addModalElement;
@ -1095,14 +1101,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
submitEvent.preventDefault();
}
const currentDateString = cityssm.dateToString(new Date());
const _doAdd = () => {
function _doAdd() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doAddWorkOrderMilestone", addFormElement, (responseJSON) => {
processMilestoneResponse(responseJSON);
if (responseJSON.success) {
addCloseModalFunction();
}
});
};
}
if (addModalElement.querySelector("#milestoneAdd--workOrderMilestoneDateString").value < currentDateString) {
bulmaJS.confirm({
title: "Milestone Date in the Past",
@ -1119,7 +1125,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
};
cityssm.openHtmlModal("workOrder-addMilestone", {
onshow: (modalElement) => {
onshow(modalElement) {
modalElement.querySelector("#milestoneAdd--workOrderId").value = workOrderId;
const milestoneTypeElement = modalElement.querySelector("#milestoneAdd--workOrderMilestoneTypeId");
for (const milestoneType of exports.workOrderMilestoneTypes) {
@ -1130,7 +1136,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
modalElement.querySelector("#milestoneAdd--workOrderMilestoneDateString").valueAsDate = new Date();
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
addModalElement = modalElement;
addCloseModalFunction = closeModalFunction;
los.initializeDatePickers(modalElement);
@ -1139,7 +1145,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
addFormElement = modalElement.querySelector("form");
addFormElement.addEventListener("submit", doAdd);
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});

87
public-typescript/workOrderEdit/workOrderEdit.js
View File

@ -41,9 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
/*
* Work Order Options
*/
let workOrderMilestones;
if (!isCreate) {
const doClose = () => {
function doClose() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doCloseWorkOrder", {
workOrderId
}, (responseJSON) => {
@ -59,7 +57,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
};
}
function doDelete() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrder", {
workOrderId
}, (responseJSON) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
}
else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
}
let workOrderMilestones;
if (!isCreate) {
document.querySelector("#button--closeWorkOrder").addEventListener("click", () => {
const hasOpenMilestones = workOrderMilestones.some((milestone) => {
return !milestone.workOrderMilestoneCompletionDate;
@ -97,23 +113,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
});
}
});
const doDelete = () => {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrder", {
workOrderId
}, (responseJSON) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
}
else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
});
};
document.querySelector("#button--deleteWorkOrder").addEventListener("click", (clickEvent) => {
document
.querySelector("#button--deleteWorkOrder")
.addEventListener("click", (clickEvent) => {
clickEvent.preventDefault();
bulmaJS.confirm({
title: "Delete Work Order",
@ -139,10 +141,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
/*
* Milestones
*/
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones;
delete exports.workOrderMilestones;
const processMilestoneResponse = (responseJSON) => {
function processMilestoneResponse(responseJSON) {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
renderMilestones();
@ -154,8 +153,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
contextualColorName: "danger"
});
}
};
const completeMilestone = (clickEvent) => {
}
function completeMilestone(clickEvent) {
clickEvent.preventDefault();
const currentDateString = cityssm.dateToString(new Date());
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId, 10);
@ -181,8 +180,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doComplete
}
});
};
const reopenMilestone = (clickEvent) => {
}
function reopenMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;
const doReopen = () => {
@ -200,8 +199,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doReopen
}
});
};
const deleteMilestone = (clickEvent) => {
}
function deleteMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;
const doDelete = () => {
@ -219,8 +218,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
callbackFunction: doDelete
}
});
};
const editMilestone = (clickEvent) => {
}
function editMilestone(clickEvent) {
clickEvent.preventDefault();
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId, 10);
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
@ -255,8 +254,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
if (!milestoneTypeFound && workOrderMilestone.workOrderMilestoneTypeId) {
const optionElement = document.createElement("option");
optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.value = workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.textContent = workOrderMilestone.workOrderMilestoneType;
optionElement.selected = true;
milestoneTypeElement.append(optionElement);
@ -278,8 +276,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
bulmaJS.toggleHtmlClipped();
}
});
};
const renderMilestones = () => {
}
function renderMilestones() {
// Clear milestones panel
const milestonesPanelElement = document.querySelector("#panel--milestones");
const panelBlockElementsToDelete = milestonesPanelElement.querySelectorAll(".panel-block");
@ -360,7 +358,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
milestonesPanelElement.append(panelBlockElement);
}
bulmaJS.init(milestonesPanelElement);
};
}
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones;
delete exports.workOrderMilestones;
renderMilestones();
document.querySelector("#button--addMilestone").addEventListener("click", () => {
let addModalElement;
@ -371,14 +372,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
submitEvent.preventDefault();
}
const currentDateString = cityssm.dateToString(new Date());
const _doAdd = () => {
function _doAdd() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doAddWorkOrderMilestone", addFormElement, (responseJSON) => {
processMilestoneResponse(responseJSON);
if (responseJSON.success) {
addCloseModalFunction();
}
});
};
}
if (addModalElement.querySelector("#milestoneAdd--workOrderMilestoneDateString").value < currentDateString) {
bulmaJS.confirm({
title: "Milestone Date in the Past",
@ -395,7 +396,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
};
cityssm.openHtmlModal("workOrder-addMilestone", {
onshow: (modalElement) => {
onshow(modalElement) {
modalElement.querySelector("#milestoneAdd--workOrderId").value = workOrderId;
const milestoneTypeElement = modalElement.querySelector("#milestoneAdd--workOrderMilestoneTypeId");
for (const milestoneType of exports.workOrderMilestoneTypes) {
@ -406,7 +407,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
modalElement.querySelector("#milestoneAdd--workOrderMilestoneDateString").valueAsDate = new Date();
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
addModalElement = modalElement;
addCloseModalFunction = closeModalFunction;
los.initializeDatePickers(modalElement);
@ -415,7 +416,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
addFormElement = modalElement.querySelector("form");
addFormElement.addEventListener("submit", doAdd);
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});

143
public-typescript/workOrderEdit/workOrderEdit.ts
View File

@ -70,10 +70,7 @@ declare const bulmaJS: BulmaJS;
* Work Order Options
*/
let workOrderMilestones: recordTypes.WorkOrderMilestone[];
if (!isCreate) {
const doClose = () => {
function doClose() {
cityssm.postJSON(
los.urlPrefix + "/workOrders/doCloseWorkOrder",
{
@ -92,11 +89,32 @@ declare const bulmaJS: BulmaJS;
}
}
);
};
}
(document.querySelector("#button--closeWorkOrder") as HTMLButtonElement).addEventListener(
"click",
() => {
function doDelete() {
cityssm.postJSON(
los.urlPrefix + "/workOrders/doDeleteWorkOrder",
{
workOrderId
},
(responseJSON: { success: boolean; errorMessage?: string }) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
} else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
}
let workOrderMilestones: recordTypes.WorkOrderMilestone[];
if (!isCreate) {
document.querySelector("#button--closeWorkOrder")!.addEventListener("click", () => {
const hasOpenMilestones = workOrderMilestones.some((milestone) => {
return !milestone.workOrderMilestoneCompletionDate;
});
@ -134,32 +152,11 @@ declare const bulmaJS: BulmaJS;
}
});
}
}
);
const doDelete = () => {
cityssm.postJSON(
los.urlPrefix + "/workOrders/doDeleteWorkOrder",
{
workOrderId
},
(responseJSON: { success: boolean; errorMessage?: string }) => {
if (responseJSON.success) {
window.location.href = los.urlPrefix + "/workOrders";
} else {
bulmaJS.alert({
title: "Error Deleting Work Order",
message: responseJSON.errorMessage || "",
contextualColorName: "danger"
});
}
}
);
};
(document.querySelector("#button--deleteWorkOrder") as HTMLButtonElement).addEventListener(
"click",
(clickEvent: Event) => {
document
.querySelector("#button--deleteWorkOrder")!
.addEventListener("click", (clickEvent: Event) => {
clickEvent.preventDefault();
bulmaJS.confirm({
@ -171,8 +168,7 @@ declare const bulmaJS: BulmaJS;
callbackFunction: doDelete
}
});
}
);
});
}
/*
@ -193,15 +189,11 @@ declare const bulmaJS: BulmaJS;
* Milestones
*/
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones as recordTypes.WorkOrderMilestone[];
delete exports.workOrderMilestones;
const processMilestoneResponse = (responseJSON: {
function processMilestoneResponse(responseJSON: {
success: boolean;
errorMessage?: string;
workOrderMilestones?: recordTypes.WorkOrderMilestone[];
}) => {
}) {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones!;
renderMilestones();
@ -212,9 +204,9 @@ declare const bulmaJS: BulmaJS;
contextualColorName: "danger"
});
}
};
}
const completeMilestone = (clickEvent: Event) => {
function completeMilestone(clickEvent: Event) {
clickEvent.preventDefault();
const currentDateString = cityssm.dateToString(new Date());
@ -257,9 +249,9 @@ declare const bulmaJS: BulmaJS;
callbackFunction: doComplete
}
});
};
}
const reopenMilestone = (clickEvent: Event) => {
function reopenMilestone(clickEvent: Event) {
clickEvent.preventDefault();
const workOrderMilestoneId = (
@ -289,9 +281,9 @@ declare const bulmaJS: BulmaJS;
callbackFunction: doReopen
}
});
};
}
const deleteMilestone = (clickEvent: Event) => {
function deleteMilestone(clickEvent: Event) {
clickEvent.preventDefault();
const workOrderMilestoneId = (
@ -320,9 +312,9 @@ declare const bulmaJS: BulmaJS;
callbackFunction: doDelete
}
});
};
}
const editMilestone = (clickEvent: Event) => {
function editMilestone(clickEvent: Event) {
clickEvent.preventDefault();
const workOrderMilestoneId = Number.parseInt(
@ -362,9 +354,7 @@ declare const bulmaJS: BulmaJS;
cityssm.openHtmlModal("workOrder-editMilestone", {
onshow: (modalElement) => {
(
modalElement.querySelector(
"#milestoneEdit--workOrderId"
) as HTMLInputElement
modalElement.querySelector("#milestoneEdit--workOrderId") as HTMLInputElement
).value = workOrderId;
(
@ -398,8 +388,7 @@ declare const bulmaJS: BulmaJS;
if (!milestoneTypeFound && workOrderMilestone.workOrderMilestoneTypeId) {
const optionElement = document.createElement("option");
optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.value = workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.textContent = workOrderMilestone.workOrderMilestoneType!;
optionElement.selected = true;
milestoneTypeElement.append(optionElement);
@ -432,24 +421,19 @@ declare const bulmaJS: BulmaJS;
los.initializeDatePickers(modalElement);
// los.initializeTimePickers(modalElement);
modalElement.querySelector("form")!.addEventListener("submit", doEdit);
},
onremoved: () => {
bulmaJS.toggleHtmlClipped();
}
});
};
}
const renderMilestones = () => {
function renderMilestones() {
// Clear milestones panel
const milestonesPanelElement = document.querySelector("#panel--milestones") as HTMLElement;
const milestonesPanelElement = document.querySelector(
"#panel--milestones"
) as HTMLElement;
const panelBlockElementsToDelete =
milestonesPanelElement.querySelectorAll(".panel-block");
const panelBlockElementsToDelete = milestonesPanelElement.querySelectorAll(".panel-block");
for (const panelBlockToDelete of panelBlockElementsToDelete) {
panelBlockToDelete.remove();
@ -523,15 +507,11 @@ declare const bulmaJS: BulmaJS;
if (milestone.workOrderMilestoneCompletionDate) {
(
panelBlockElement.querySelector(
".button--reopenMilestone"
) as HTMLButtonElement
panelBlockElement.querySelector(".button--reopenMilestone") as HTMLButtonElement
).addEventListener("click", reopenMilestone);
} else {
(
panelBlockElement.querySelector(
".button--editMilestone"
) as HTMLButtonElement
panelBlockElement.querySelector(".button--editMilestone") as HTMLButtonElement
).addEventListener("click", editMilestone);
(
@ -549,13 +529,15 @@ declare const bulmaJS: BulmaJS;
}
bulmaJS.init(milestonesPanelElement);
};
}
if (!isCreate) {
workOrderMilestones = exports.workOrderMilestones as recordTypes.WorkOrderMilestone[];
delete exports.workOrderMilestones;
renderMilestones();
(document.querySelector("#button--addMilestone") as HTMLButtonElement).addEventListener(
"click",
() => {
document.querySelector("#button--addMilestone")!.addEventListener("click", () => {
let addModalElement: HTMLElement;
let addFormElement: HTMLFormElement;
let addCloseModalFunction: () => void;
@ -567,7 +549,7 @@ declare const bulmaJS: BulmaJS;
const currentDateString = cityssm.dateToString(new Date());
const _doAdd = () => {
function _doAdd() {
cityssm.postJSON(
los.urlPrefix + "/workOrders/doAddWorkOrderMilestone",
addFormElement,
@ -583,7 +565,7 @@ declare const bulmaJS: BulmaJS;
}
}
);
};
}
if (
(
@ -608,11 +590,9 @@ declare const bulmaJS: BulmaJS;
};
cityssm.openHtmlModal("workOrder-addMilestone", {
onshow: (modalElement) => {
onshow(modalElement) {
(
modalElement.querySelector(
"#milestoneAdd--workOrderId"
) as HTMLInputElement
modalElement.querySelector("#milestoneAdd--workOrderId") as HTMLInputElement
).value = workOrderId;
const milestoneTypeElement = modalElement.querySelector(
@ -634,7 +614,7 @@ declare const bulmaJS: BulmaJS;
) as HTMLInputElement
).valueAsDate = new Date();
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
addModalElement = modalElement;
addCloseModalFunction = closeModalFunction;
@ -646,11 +626,10 @@ declare const bulmaJS: BulmaJS;
addFormElement = modalElement.querySelector("form")!;
addFormElement.addEventListener("submit", doAdd);
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});
}
);
});
}
})();

45
public-typescript/workOrderEdit/workOrderEditComments.js
View File

@ -10,7 +10,7 @@ const openEditWorkOrderComment = (clickEvent) => {
});
let editFormElement;
let editCloseModalFunction;
const editComment = (submitEvent) => {
function editComment(submitEvent) {
submitEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + "/workOrders/doUpdateWorkOrderComment", editFormElement, (responseJSON) => {
if (responseJSON.success) {
@ -26,15 +26,14 @@ const openEditWorkOrderComment = (clickEvent) => {
});
}
});
};
}
cityssm.openHtmlModal("workOrder-editComment", {
onshow: (modalElement) => {
onshow(modalElement) {
modalElement.querySelector("#workOrderCommentEdit--workOrderId").value = workOrderId;
modalElement.querySelector("#workOrderCommentEdit--workOrderCommentId").value = workOrderCommentId.toString();
modalElement.querySelector("#workOrderCommentEdit--workOrderComment").value = workOrderComment.workOrderComment;
const workOrderCommentDateStringElement = modalElement.querySelector("#workOrderCommentEdit--workOrderCommentDateString");
workOrderCommentDateStringElement.value =
workOrderComment.workOrderCommentDateString;
workOrderCommentDateStringElement.value = workOrderComment.workOrderCommentDateString;
const currentDateString = cityssm.dateToString(new Date());
workOrderCommentDateStringElement.max =
workOrderComment.workOrderCommentDateString <= currentDateString
@ -42,7 +41,7 @@ const openEditWorkOrderComment = (clickEvent) => {
: workOrderComment.workOrderCommentDateString;
modalElement.querySelector("#workOrderCommentEdit--workOrderCommentTimeString").value = workOrderComment.workOrderCommentTimeString;
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
bulmaJS.toggleHtmlClipped();
los.initializeDatePickers(modalElement);
// los.initializeTimePickers(modalElement);
@ -51,14 +50,14 @@ const openEditWorkOrderComment = (clickEvent) => {
editFormElement.addEventListener("submit", editComment);
editCloseModalFunction = closeModalFunction;
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});
};
const deleteWorkOrderComment = (clickEvent) => {
function deleteWorkOrderComment(clickEvent) {
const workOrderCommentId = Number.parseInt(clickEvent.currentTarget.closest("tr").dataset.workOrderCommentId, 10);
const doDelete = () => {
function doDelete() {
cityssm.postJSON(los.urlPrefix + "/workOrders/doDeleteWorkOrderComment", {
workOrderId,
workOrderCommentId
@ -75,7 +74,7 @@ const deleteWorkOrderComment = (clickEvent) => {
});
}
});
};
}
bulmaJS.confirm({
title: "Remove Comment?",
message: "Are you sure you want to remove this comment?",
@ -85,8 +84,8 @@ const deleteWorkOrderComment = (clickEvent) => {
},
contextualColorName: "warning"
});
};
const renderWorkOrderComments = () => {
}
function renderWorkOrderComments() {
const containerElement = document.querySelector("#container--workOrderComments");
if (workOrderComments.length === 0) {
containerElement.innerHTML =
@ -133,16 +132,20 @@ const renderWorkOrderComments = () => {
"</button>") +
"</div>" +
"</td>");
tableRowElement.querySelector(".button--edit").addEventListener("click", openEditWorkOrderComment);
tableRowElement.querySelector(".button--delete").addEventListener("click", deleteWorkOrderComment);
tableRowElement
.querySelector(".button--edit")
.addEventListener("click", openEditWorkOrderComment);
tableRowElement
.querySelector(".button--delete")
.addEventListener("click", deleteWorkOrderComment);
tableElement.querySelector("tbody").append(tableRowElement);
}
containerElement.innerHTML = "";
containerElement.append(tableElement);
};
const openAddCommentModal = () => {
}
function openAddCommentModal() {
let addCommentCloseModalFunction;
const doAddComment = (formEvent) => {
function doAddComment(formEvent) {
formEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + "/workOrders/doAddWorkOrderComment", formEvent.currentTarget, (responseJSON) => {
if (responseJSON.success) {
@ -151,7 +154,7 @@ const openAddCommentModal = () => {
addCommentCloseModalFunction();
}
});
};
}
cityssm.openHtmlModal("workOrder-addComment", {
onshow(modalElement) {
los.populateAliases(modalElement);
@ -168,8 +171,10 @@ const openAddCommentModal = () => {
document.querySelector("#workOrderComments--add").focus();
}
});
};
}
if (!isCreate) {
document.querySelector("#workOrderComments--add").addEventListener("click", openAddCommentModal);
document
.querySelector("#workOrderComments--add")
.addEventListener("click", openAddCommentModal);
renderWorkOrderComments();
}

66
public-typescript/workOrderEdit/workOrderEditComments.ts
View File

@ -30,7 +30,7 @@ const openEditWorkOrderComment = (clickEvent: Event) => {
let editFormElement: HTMLFormElement;
let editCloseModalFunction: () => void;
const editComment = (submitEvent: SubmitEvent) => {
function editComment(submitEvent: SubmitEvent): void {
submitEvent.preventDefault();
cityssm.postJSON(
@ -54,14 +54,12 @@ const openEditWorkOrderComment = (clickEvent: Event) => {
}
}
);
};
}
cityssm.openHtmlModal("workOrder-editComment", {
onshow: (modalElement) => {
onshow(modalElement) {
(
modalElement.querySelector(
"#workOrderCommentEdit--workOrderId"
) as HTMLInputElement
modalElement.querySelector("#workOrderCommentEdit--workOrderId") as HTMLInputElement
).value = workOrderId;
(
modalElement.querySelector(
@ -79,8 +77,7 @@ const openEditWorkOrderComment = (clickEvent: Event) => {
"#workOrderCommentEdit--workOrderCommentDateString"
) as HTMLInputElement;
workOrderCommentDateStringElement.value =
workOrderComment.workOrderCommentDateString!;
workOrderCommentDateStringElement.value = workOrderComment.workOrderCommentDateString!;
const currentDateString = cityssm.dateToString(new Date());
@ -95,7 +92,7 @@ const openEditWorkOrderComment = (clickEvent: Event) => {
) as HTMLInputElement
).value = workOrderComment.workOrderCommentTimeString!;
},
onshown: (modalElement, closeModalFunction) => {
onshown(modalElement, closeModalFunction) {
bulmaJS.toggleHtmlClipped();
los.initializeDatePickers(modalElement);
@ -112,19 +109,19 @@ const openEditWorkOrderComment = (clickEvent: Event) => {
editCloseModalFunction = closeModalFunction;
},
onremoved: () => {
onremoved() {
bulmaJS.toggleHtmlClipped();
}
});
};
const deleteWorkOrderComment = (clickEvent: Event) => {
function deleteWorkOrderComment(clickEvent: Event): void {
const workOrderCommentId = Number.parseInt(
(clickEvent.currentTarget as HTMLElement).closest("tr")!.dataset.workOrderCommentId!,
10
);
const doDelete = () => {
function doDelete() {
cityssm.postJSON(
los.urlPrefix + "/workOrders/doDeleteWorkOrderComment",
{
@ -148,7 +145,7 @@ const deleteWorkOrderComment = (clickEvent: Event) => {
}
}
);
};
}
bulmaJS.confirm({
title: "Remove Comment?",
@ -159,12 +156,10 @@ const deleteWorkOrderComment = (clickEvent: Event) => {
},
contextualColorName: "warning"
});
};
}
const renderWorkOrderComments = () => {
const containerElement = document.querySelector(
"#container--workOrderComments"
) as HTMLElement;
function renderWorkOrderComments() {
const containerElement = document.querySelector("#container--workOrderComments") as HTMLElement;
if (workOrderComments.length === 0) {
containerElement.innerHTML =
@ -215,26 +210,25 @@ const renderWorkOrderComments = () => {
"</div>" +
"</td>");
(tableRowElement.querySelector(".button--edit") as HTMLButtonElement).addEventListener(
"click",
openEditWorkOrderComment
);
tableRowElement
.querySelector(".button--edit")!
.addEventListener("click", openEditWorkOrderComment);
(
tableRowElement.querySelector(".button--delete") as HTMLButtonElement
).addEventListener("click", deleteWorkOrderComment);
tableRowElement
.querySelector(".button--delete")!
.addEventListener("click", deleteWorkOrderComment);
tableElement.querySelector("tbody")!.append(tableRowElement);
}
containerElement.innerHTML = "";
containerElement.append(tableElement);
};
}
const openAddCommentModal = () => {
function openAddCommentModal() {
let addCommentCloseModalFunction: () => void;
const doAddComment = (formEvent: SubmitEvent) => {
function doAddComment(formEvent: SubmitEvent) {
formEvent.preventDefault();
cityssm.postJSON(
@ -251,15 +245,13 @@ const openAddCommentModal = () => {
}
}
);
};
}
cityssm.openHtmlModal("workOrder-addComment", {
onshow(modalElement) {
los.populateAliases(modalElement);
(
modalElement.querySelector(
"#workOrderCommentAdd--workOrderId"
) as HTMLInputElement
modalElement.querySelector("#workOrderCommentAdd--workOrderId") as HTMLInputElement
).value = workOrderId;
modalElement.querySelector("form")!.addEventListener("submit", doAddComment);
},
@ -277,12 +269,12 @@ const openAddCommentModal = () => {
(document.querySelector("#workOrderComments--add") as HTMLButtonElement).focus();
}
});
};
}
if (!isCreate) {
(document.querySelector("#workOrderComments--add") as HTMLButtonElement).addEventListener(
"click",
openAddCommentModal
);
document
.querySelector("#workOrderComments--add")!
.addEventListener("click", openAddCommentModal);
renderWorkOrderComments();
}

2
public/javascripts/workOrderEdit.min.js vendored
View File

File diff suppressed because one or more lines are too long