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

warn about completing future milestones

deepsource-autofix-76c6eb20
Dan Gowans 2022-09-13 09:07:46 -04:00
parent bc398d03c2
commit 13ff1d8527
3 changed files with 91 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public-typescript/workOrderEdit.js
View File

@ -596,14 +596,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
delete exports.workOrderMilestones;
const completeMilestone = (clickEvent) => {
clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId;
const currentDateString = cityssm.dateToString(new Date());
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest(".container--milestone").dataset.workOrderMilestoneId, 10);
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
return (currentMilestone.workOrderMilestoneId ===
workOrderMilestoneId);
});
const doComplete = () => {
cityssm.postJSON(urlPrefix + "/workOrders/doCompleteWorkOrderMilestone", {
workOrderId,
workOrderMilestoneId
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
workOrderMilestones =
responseJSON.workOrderMilestones;
renderMilestones();
}
else {
@ -617,7 +623,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
};
bulmaJS.confirm({
title: "Complete Milestone",
message: "Are you sure you want to complete this milestone?",
message: "Are you sure you want to complete this milestone?" +
(workOrderMilestone.workOrderMilestoneDateString >
currentDateString
? "<br /><strong>Note that this milestone is expected to be completed in the future.</strong>"
: ""),
messageIsHtml: true,
contextualColorName: "warning",
okButton: {
text: "Yes, Complete Milestone",
@ -634,7 +645,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
workOrderMilestoneId
}, (responseJSON) => {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
workOrderMilestones =
responseJSON.workOrderMilestones;
renderMilestones();
}
else {

111
public-typescript/workOrderEdit.ts
View File

@ -847,34 +847,62 @@ declare const bulmaJS: BulmaJS;
const completeMilestone = (clickEvent: Event) => {
clickEvent.preventDefault();
const workOrderMilestoneId = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--milestone"
) as HTMLElement
).dataset.workOrderMilestoneId;
const currentDateString = cityssm.dateToString(new Date());
const workOrderMilestoneId = Number.parseInt(
(
(clickEvent.currentTarget as HTMLElement).closest(
".container--milestone"
) as HTMLElement
).dataset.workOrderMilestoneId,
10
);
const workOrderMilestone = workOrderMilestones.find(
(currentMilestone) => {
return (
currentMilestone.workOrderMilestoneId ===
workOrderMilestoneId
);
}
);
const doComplete = () => {
cityssm.postJSON(urlPrefix + "/workOrders/doCompleteWorkOrderMilestone", {
workOrderId,
workOrderMilestoneId
},
(responseJSON: {success: boolean; errorMessage?: string; workOrderMilestones?: recordTypes.WorkOrderMilestone[];}) => {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
renderMilestones();
} else {
bulmaJS.alert({
title: "Error Completing Milestone",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
cityssm.postJSON(
urlPrefix + "/workOrders/doCompleteWorkOrderMilestone",
{
workOrderId,
workOrderMilestoneId
},
(responseJSON: {
success: boolean;
errorMessage?: string;
workOrderMilestones?: recordTypes.WorkOrderMilestone[];
}) => {
if (responseJSON.success) {
workOrderMilestones =
responseJSON.workOrderMilestones;
renderMilestones();
} else {
bulmaJS.alert({
title: "Error Completing Milestone",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
}
}
});
);
};
bulmaJS.confirm({
title: "Complete Milestone",
message: "Are you sure you want to complete this milestone?",
message:
"Are you sure you want to complete this milestone?" +
(workOrderMilestone.workOrderMilestoneDateString >
currentDateString
? "<br /><strong>Note that this milestone is expected to be completed in the future.</strong>"
: ""),
messageIsHtml: true,
contextualColorName: "warning",
okButton: {
text: "Yes, Complete Milestone",
@ -893,27 +921,36 @@ declare const bulmaJS: BulmaJS;
).dataset.workOrderMilestoneId;
const doReopen = () => {
cityssm.postJSON(urlPrefix + "/workOrders/doReopenWorkOrderMilestone", {
workOrderId,
workOrderMilestoneId
},
(responseJSON: {success: boolean; errorMessage?: string; workOrderMilestones?: recordTypes.WorkOrderMilestone[];}) => {
if (responseJSON.success) {
workOrderMilestones = responseJSON.workOrderMilestones;
renderMilestones();
} else {
bulmaJS.alert({
title: "Error Reopening Milestone",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
cityssm.postJSON(
urlPrefix + "/workOrders/doReopenWorkOrderMilestone",
{
workOrderId,
workOrderMilestoneId
},
(responseJSON: {
success: boolean;
errorMessage?: string;
workOrderMilestones?: recordTypes.WorkOrderMilestone[];
}) => {
if (responseJSON.success) {
workOrderMilestones =
responseJSON.workOrderMilestones;
renderMilestones();
} else {
bulmaJS.alert({
title: "Error Reopening Milestone",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
}
}
});
);
};
bulmaJS.confirm({
title: "Reopen Milestone",
message: "Are you sure you want to remove the completion status from this milestone, and reopen it?",
message:
"Are you sure you want to remove the completion status from this milestone, and reopen it?",
contextualColorName: "warning",
okButton: {
text: "Yes, Reopen Milestone",

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

File diff suppressed because one or more lines are too long