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

code cleanup

deepsource-autofix-76c6eb20
Dan Gowans 2024-06-25 15:10:16 -04:00
parent a09fcfa82b
commit b2550ca549
4 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public-typescript/workOrderEdit.js
View File

@ -25,9 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
} }
workOrderFormElement.addEventListener('submit', (submitEvent) => { workOrderFormElement.addEventListener('submit', (submitEvent) => {
submitEvent.preventDefault(); submitEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + cityssm.postJSON(`${los.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, submitEvent.currentTarget, (rawResponseJSON) => {
'/workOrders/' +
(isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'), submitEvent.currentTarget, (rawResponseJSON) => {
var _a; var _a;
const responseJSON = rawResponseJSON; const responseJSON = rawResponseJSON;
if (responseJSON.success) { if (responseJSON.success) {
@ -987,7 +985,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
return currentMilestone.workOrderMilestoneId === workOrderMilestoneId; return currentMilestone.workOrderMilestoneId === workOrderMilestoneId;
}); });
function doComplete() { function doComplete() {
cityssm.postJSON(los.urlPrefix + '/workOrders/doCompleteWorkOrderMilestone', { cityssm.postJSON(`${los.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, {
workOrderId, workOrderId,
workOrderMilestoneId workOrderMilestoneId
}, processMilestoneResponse); }, processMilestoneResponse);
@ -1030,7 +1028,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
clickEvent.preventDefault(); clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId; const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId;
function doDelete() { function doDelete() {
cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderMilestone', { cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, {
workOrderMilestoneId, workOrderMilestoneId,
workOrderId workOrderId
}, processMilestoneResponse); }, processMilestoneResponse);
@ -1046,8 +1044,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
}); });
} }
function editMilestone(clickEvent) { function editMilestone(clickEvent) {
var _a;
clickEvent.preventDefault(); clickEvent.preventDefault();
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId, 10); const workOrderMilestoneId = Number.parseInt((_a = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId) !== null && _a !== void 0 ? _a : '', 10);
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => { const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
return currentMilestone.workOrderMilestoneId === workOrderMilestoneId; return currentMilestone.workOrderMilestoneId === workOrderMilestoneId;
}); });
@ -1065,7 +1064,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
} }
cityssm.openHtmlModal('workOrder-editMilestone', { cityssm.openHtmlModal('workOrder-editMilestone', {
onshow(modalElement) { onshow(modalElement) {
var _a, _b, _c, _d, _e; var _a, _b, _c, _d, _e, _f;
; ;
modalElement.querySelector('#milestoneEdit--workOrderId').value = workOrderId; modalElement.querySelector('#milestoneEdit--workOrderId').value = workOrderId;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneId').value = (_b = (_a = workOrderMilestone.workOrderMilestoneId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneId').value = (_b = (_a = workOrderMilestone.workOrderMilestoneId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
@ -1088,18 +1087,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
const optionElement = document.createElement('option'); const optionElement = document.createElement('option');
optionElement.value = optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString(); workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.textContent = workOrderMilestone.workOrderMilestoneType; optionElement.textContent = (_c = workOrderMilestone.workOrderMilestoneType) !== null && _c !== void 0 ? _c : '';
optionElement.selected = true; optionElement.selected = true;
milestoneTypeElement.append(optionElement); milestoneTypeElement.append(optionElement);
} }
workOrderMilestoneDateStringElement = modalElement.querySelector('#milestoneEdit--workOrderMilestoneDateString'); workOrderMilestoneDateStringElement = modalElement.querySelector('#milestoneEdit--workOrderMilestoneDateString');
workOrderMilestoneDateStringElement.value = (_c = workOrderMilestone.workOrderMilestoneDateString) !== null && _c !== void 0 ? _c : ''; workOrderMilestoneDateStringElement.value =
(_d = workOrderMilestone.workOrderMilestoneDateString) !== null && _d !== void 0 ? _d : '';
if (workOrderMilestone.workOrderMilestoneTime) { if (workOrderMilestone.workOrderMilestoneTime) {
; ;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneTimeString').value = (_d = workOrderMilestone.workOrderMilestoneTimeString) !== null && _d !== void 0 ? _d : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneTimeString').value = (_e = workOrderMilestone.workOrderMilestoneTimeString) !== null && _e !== void 0 ? _e : '';
} }
; ;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneDescription').value = (_e = workOrderMilestone.workOrderMilestoneDescription) !== null && _e !== void 0 ? _e : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneDescription').value = (_f = workOrderMilestone.workOrderMilestoneDescription) !== null && _f !== void 0 ? _f : '';
}, },
onshown(modalElement, closeModalFunction) { onshown(modalElement, closeModalFunction) {
var _a; var _a;
@ -1132,6 +1132,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
panelBlockElement.className = 'panel-block is-block container--milestone'; panelBlockElement.className = 'panel-block is-block container--milestone';
panelBlockElement.dataset.workOrderMilestoneId = panelBlockElement.dataset.workOrderMilestoneId =
milestone.workOrderMilestoneId.toString(); milestone.workOrderMilestoneId.toString();
// eslint-disable-next-line no-unsanitized/property
panelBlockElement.innerHTML = panelBlockElement.innerHTML =
'<div class="columns is-mobile">' + '<div class="columns is-mobile">' +
('<div class="column is-narrow">' + ('<div class="column is-narrow">' +

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

@ -25,9 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
} }
workOrderFormElement.addEventListener('submit', (submitEvent) => { workOrderFormElement.addEventListener('submit', (submitEvent) => {
submitEvent.preventDefault(); submitEvent.preventDefault();
cityssm.postJSON(los.urlPrefix + cityssm.postJSON(`${los.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`, submitEvent.currentTarget, (rawResponseJSON) => {
'/workOrders/' +
(isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'), submitEvent.currentTarget, (rawResponseJSON) => {
var _a; var _a;
const responseJSON = rawResponseJSON; const responseJSON = rawResponseJSON;
if (responseJSON.success) { if (responseJSON.success) {
@ -236,7 +234,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
return currentMilestone.workOrderMilestoneId === workOrderMilestoneId; return currentMilestone.workOrderMilestoneId === workOrderMilestoneId;
}); });
function doComplete() { function doComplete() {
cityssm.postJSON(los.urlPrefix + '/workOrders/doCompleteWorkOrderMilestone', { cityssm.postJSON(`${los.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`, {
workOrderId, workOrderId,
workOrderMilestoneId workOrderMilestoneId
}, processMilestoneResponse); }, processMilestoneResponse);
@ -279,7 +277,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
clickEvent.preventDefault(); clickEvent.preventDefault();
const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId; const workOrderMilestoneId = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId;
function doDelete() { function doDelete() {
cityssm.postJSON(los.urlPrefix + '/workOrders/doDeleteWorkOrderMilestone', { cityssm.postJSON(`${los.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`, {
workOrderMilestoneId, workOrderMilestoneId,
workOrderId workOrderId
}, processMilestoneResponse); }, processMilestoneResponse);
@ -295,8 +293,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
}); });
} }
function editMilestone(clickEvent) { function editMilestone(clickEvent) {
var _a;
clickEvent.preventDefault(); clickEvent.preventDefault();
const workOrderMilestoneId = Number.parseInt(clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId, 10); const workOrderMilestoneId = Number.parseInt((_a = clickEvent.currentTarget.closest('.container--milestone').dataset.workOrderMilestoneId) !== null && _a !== void 0 ? _a : '', 10);
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => { const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
return currentMilestone.workOrderMilestoneId === workOrderMilestoneId; return currentMilestone.workOrderMilestoneId === workOrderMilestoneId;
}); });
@ -314,7 +313,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
} }
cityssm.openHtmlModal('workOrder-editMilestone', { cityssm.openHtmlModal('workOrder-editMilestone', {
onshow(modalElement) { onshow(modalElement) {
var _a, _b, _c, _d, _e; var _a, _b, _c, _d, _e, _f;
; ;
modalElement.querySelector('#milestoneEdit--workOrderId').value = workOrderId; modalElement.querySelector('#milestoneEdit--workOrderId').value = workOrderId;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneId').value = (_b = (_a = workOrderMilestone.workOrderMilestoneId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneId').value = (_b = (_a = workOrderMilestone.workOrderMilestoneId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
@ -337,18 +336,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
const optionElement = document.createElement('option'); const optionElement = document.createElement('option');
optionElement.value = optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString(); workOrderMilestone.workOrderMilestoneTypeId.toString();
optionElement.textContent = workOrderMilestone.workOrderMilestoneType; optionElement.textContent = (_c = workOrderMilestone.workOrderMilestoneType) !== null && _c !== void 0 ? _c : '';
optionElement.selected = true; optionElement.selected = true;
milestoneTypeElement.append(optionElement); milestoneTypeElement.append(optionElement);
} }
workOrderMilestoneDateStringElement = modalElement.querySelector('#milestoneEdit--workOrderMilestoneDateString'); workOrderMilestoneDateStringElement = modalElement.querySelector('#milestoneEdit--workOrderMilestoneDateString');
workOrderMilestoneDateStringElement.value = (_c = workOrderMilestone.workOrderMilestoneDateString) !== null && _c !== void 0 ? _c : ''; workOrderMilestoneDateStringElement.value =
(_d = workOrderMilestone.workOrderMilestoneDateString) !== null && _d !== void 0 ? _d : '';
if (workOrderMilestone.workOrderMilestoneTime) { if (workOrderMilestone.workOrderMilestoneTime) {
; ;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneTimeString').value = (_d = workOrderMilestone.workOrderMilestoneTimeString) !== null && _d !== void 0 ? _d : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneTimeString').value = (_e = workOrderMilestone.workOrderMilestoneTimeString) !== null && _e !== void 0 ? _e : '';
} }
; ;
modalElement.querySelector('#milestoneEdit--workOrderMilestoneDescription').value = (_e = workOrderMilestone.workOrderMilestoneDescription) !== null && _e !== void 0 ? _e : ''; modalElement.querySelector('#milestoneEdit--workOrderMilestoneDescription').value = (_f = workOrderMilestone.workOrderMilestoneDescription) !== null && _f !== void 0 ? _f : '';
}, },
onshown(modalElement, closeModalFunction) { onshown(modalElement, closeModalFunction) {
var _a; var _a;
@ -381,6 +381,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
panelBlockElement.className = 'panel-block is-block container--milestone'; panelBlockElement.className = 'panel-block is-block container--milestone';
panelBlockElement.dataset.workOrderMilestoneId = panelBlockElement.dataset.workOrderMilestoneId =
milestone.workOrderMilestoneId.toString(); milestone.workOrderMilestoneId.toString();
// eslint-disable-next-line no-unsanitized/property
panelBlockElement.innerHTML = panelBlockElement.innerHTML =
'<div class="columns is-mobile">' + '<div class="columns is-mobile">' +
('<div class="column is-narrow">' + ('<div class="column is-narrow">' +

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

@ -49,9 +49,7 @@ declare const exports: Record<string, unknown>
submitEvent.preventDefault() submitEvent.preventDefault()
cityssm.postJSON( cityssm.postJSON(
los.urlPrefix + `${los.urlPrefix}/workOrders/${isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'}`,
'/workOrders/' +
(isCreate ? 'doCreateWorkOrder' : 'doUpdateWorkOrder'),
submitEvent.currentTarget, submitEvent.currentTarget,
(rawResponseJSON) => { (rawResponseJSON) => {
const responseJSON = rawResponseJSON as { const responseJSON = rawResponseJSON as {
@ -346,7 +344,7 @@ declare const exports: Record<string, unknown>
function doComplete(): void { function doComplete(): void {
cityssm.postJSON( cityssm.postJSON(
los.urlPrefix + '/workOrders/doCompleteWorkOrderMilestone', `${los.urlPrefix}/workOrders/doCompleteWorkOrderMilestone`,
{ {
workOrderId, workOrderId,
workOrderMilestoneId workOrderMilestoneId
@ -415,7 +413,7 @@ declare const exports: Record<string, unknown>
function doDelete(): void { function doDelete(): void {
cityssm.postJSON( cityssm.postJSON(
los.urlPrefix + '/workOrders/doDeleteWorkOrderMilestone', `${los.urlPrefix}/workOrders/doDeleteWorkOrderMilestone`,
{ {
workOrderMilestoneId, workOrderMilestoneId,
workOrderId workOrderId
@ -443,13 +441,13 @@ declare const exports: Record<string, unknown>
(clickEvent.currentTarget as HTMLElement).closest( (clickEvent.currentTarget as HTMLElement).closest(
'.container--milestone' '.container--milestone'
) as HTMLElement ) as HTMLElement
).dataset.workOrderMilestoneId!, ).dataset.workOrderMilestoneId ?? '',
10 10
) )
const workOrderMilestone = workOrderMilestones.find((currentMilestone) => { const workOrderMilestone = workOrderMilestones.find((currentMilestone) => {
return currentMilestone.workOrderMilestoneId === workOrderMilestoneId return currentMilestone.workOrderMilestoneId === workOrderMilestoneId
})! }) as recordTypes.WorkOrderMilestone
let editCloseModalFunction: () => void let editCloseModalFunction: () => void
let workOrderMilestoneDateStringElement: HTMLInputElement let workOrderMilestoneDateStringElement: HTMLInputElement
@ -519,18 +517,17 @@ declare const exports: Record<string, unknown>
const optionElement = document.createElement('option') const optionElement = document.createElement('option')
optionElement.value = optionElement.value =
workOrderMilestone.workOrderMilestoneTypeId.toString() workOrderMilestone.workOrderMilestoneTypeId.toString()
optionElement.textContent = workOrderMilestone.workOrderMilestoneType! optionElement.textContent = workOrderMilestone.workOrderMilestoneType ?? ''
optionElement.selected = true optionElement.selected = true
milestoneTypeElement.append(optionElement) milestoneTypeElement.append(optionElement)
} }
workOrderMilestoneDateStringElement = ( workOrderMilestoneDateStringElement = modalElement.querySelector(
modalElement.querySelector( '#milestoneEdit--workOrderMilestoneDateString'
'#milestoneEdit--workOrderMilestoneDateString' ) as HTMLInputElement
) as HTMLInputElement
) workOrderMilestoneDateStringElement.value =
workOrderMilestone.workOrderMilestoneDateString ?? ''
workOrderMilestoneDateStringElement.value = workOrderMilestone.workOrderMilestoneDateString ?? ''
if (workOrderMilestone.workOrderMilestoneTime) { if (workOrderMilestone.workOrderMilestoneTime) {
;( ;(
@ -559,15 +556,12 @@ declare const exports: Record<string, unknown>
'#milestoneEdit--conflictingMilestonesPanel' '#milestoneEdit--conflictingMilestonesPanel'
) as HTMLElement ) as HTMLElement
workOrderMilestoneDateStringElement.addEventListener( workOrderMilestoneDateStringElement.addEventListener('change', () => {
'change', refreshConflictingMilestones(
() => { workOrderMilestoneDateStringElement.value,
refreshConflictingMilestones( conflictingMilestonePanelElement
workOrderMilestoneDateStringElement.value, )
conflictingMilestonePanelElement })
)
}
)
refreshConflictingMilestones( refreshConflictingMilestones(
workOrderMilestoneDateStringElement.value, workOrderMilestoneDateStringElement.value,
@ -600,14 +594,15 @@ declare const exports: Record<string, unknown>
panelBlockElement.dataset.workOrderMilestoneId = panelBlockElement.dataset.workOrderMilestoneId =
milestone.workOrderMilestoneId!.toString() milestone.workOrderMilestoneId!.toString()
// eslint-disable-next-line no-unsanitized/property
panelBlockElement.innerHTML = panelBlockElement.innerHTML =
'<div class="columns is-mobile">' + '<div class="columns is-mobile">' +
('<div class="column is-narrow">' + ('<div class="column is-narrow">' +
(milestone.workOrderMilestoneCompletionDate (milestone.workOrderMilestoneCompletionDate
? '<span class="button is-static" data-tooltip="Completed ' + ? '<span class="button is-static" data-tooltip="Completed ' +
milestone.workOrderMilestoneCompletionDateString! + milestone.workOrderMilestoneCompletionDateString +
'" aria-label="Completed ' + '" aria-label="Completed ' +
milestone.workOrderMilestoneCompletionDateString! + milestone.workOrderMilestoneCompletionDateString +
'">' + '">' +
'<span class="icon is-small"><i class="fas fa-check" aria-hidden="true"></i></span>' + '<span class="icon is-small"><i class="fas fa-check" aria-hidden="true"></i></span>' +
'</span>' '</span>'
@ -625,7 +620,7 @@ declare const exports: Record<string, unknown>
? '<span class="has-text-grey">(No Set Date)</span>' ? '<span class="has-text-grey">(No Set Date)</span>'
: milestone.workOrderMilestoneDateString) + : milestone.workOrderMilestoneDateString) +
(milestone.workOrderMilestoneTime (milestone.workOrderMilestoneTime
? ' ' + milestone.workOrderMilestoneTimePeriodString! ? ' ' + milestone.workOrderMilestoneTimePeriodString
: '') + : '') +
'<br />' + '<br />' +
'<span class="is-size-7">' + '<span class="is-size-7">' +
@ -692,7 +687,6 @@ declare const exports: Record<string, unknown>
document document
.querySelector('#button--addMilestone') .querySelector('#button--addMilestone')
?.addEventListener('click', () => { ?.addEventListener('click', () => {
let addFormElement: HTMLFormElement let addFormElement: HTMLFormElement
let workOrderMilestoneDateStringElement: HTMLInputElement let workOrderMilestoneDateStringElement: HTMLInputElement
let addCloseModalFunction: () => void let addCloseModalFunction: () => void
@ -774,7 +768,6 @@ declare const exports: Record<string, unknown>
workOrderMilestoneDateStringElement.valueAsDate = new Date() workOrderMilestoneDateStringElement.valueAsDate = new Date()
}, },
onshown(modalElement, closeModalFunction) { onshown(modalElement, closeModalFunction) {
addCloseModalFunction = closeModalFunction addCloseModalFunction = closeModalFunction
los.initializeDatePickers(modalElement) los.initializeDatePickers(modalElement)

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

File diff suppressed because one or more lines are too long