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

reduce move duplication

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-04 14:48:35 -05:00
parent abf8f6df37
commit aabaf299f9
15 changed files with 126 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/admin-post/doMoveOccupancyTypeDown.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypeDown, moveOccupancyTypeDownToBottom } from "../../helpers/lotOccupancyDB/moveOccupancyTypeDown.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToBottom === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypeDownToBottom(request.body.occupancyTypeId)
: moveOccupancyTypeDown(request.body.occupancyTypeId);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypeDown.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToBottom === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypeDownToBottom(request.body.occupancyTypeId)
: moveOccupancyTypeDown(request.body.occupancyTypeId);

2
handlers/admin-post/doMoveOccupancyTypeFieldDown.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypeFieldDown, moveOccupancyTypeFieldDownToBottom } from "../../helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToBottom === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypeFieldDownToBottom(request.body.occupancyTypeFieldId)
: moveOccupancyTypeFieldDown(request.body.occupancyTypeFieldId);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypeFieldDown.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToBottom === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypeFieldDownToBottom(request.body.occupancyTypeFieldId)
: moveOccupancyTypeFieldDown(request.body.occupancyTypeFieldId);

2
handlers/admin-post/doMoveOccupancyTypeFieldUp.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypeFieldUp, moveOccupancyTypeFieldUpToTop } from "../../helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToTop === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypeFieldUpToTop(request.body.occupancyTypeFieldId)
: moveOccupancyTypeFieldUp(request.body.occupancyTypeFieldId);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypeFieldUp.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToTop === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypeFieldUpToTop(request.body.occupancyTypeFieldId)
: moveOccupancyTypeFieldUp(request.body.occupancyTypeFieldId);

2
handlers/admin-post/doMoveOccupancyTypePrintDown.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypePrintDown, moveOccupancyTypePrintDownToBottom } from "../../helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToBottom === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypePrintDownToBottom(request.body.occupancyTypeId, request.body.printEJS)
: moveOccupancyTypePrintDown(request.body.occupancyTypeId, request.body.printEJS);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypePrintDown.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToBottom === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypePrintDownToBottom(request.body.occupancyTypeId, request.body.printEJS)
: moveOccupancyTypePrintDown(request.body.occupancyTypeId, request.body.printEJS);

2
handlers/admin-post/doMoveOccupancyTypePrintUp.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypePrintUp, moveOccupancyTypePrintUpToTop } from "../../helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToTop === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypePrintUpToTop(request.body.occupancyTypeId, request.body.printEJS)
: moveOccupancyTypePrintUp(request.body.occupancyTypeId, request.body.printEJS);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypePrintUp.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToTop === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypePrintUpToTop(request.body.occupancyTypeId, request.body.printEJS)
: moveOccupancyTypePrintUp(request.body.occupancyTypeId, request.body.printEJS);

2
handlers/admin-post/doMoveOccupancyTypeUp.js
View File

@ -1,7 +1,7 @@
import { moveOccupancyTypeUp, moveOccupancyTypeUpToTop } from "../../helpers/lotOccupancyDB/moveOccupancyTypeUp.js";
import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js";
export const handler = async (request, response) => {
const success = request.body.moveToTop === "1"
const success = request.body.moveToEnd === "1"
? moveOccupancyTypeUpToTop(request.body.occupancyTypeId)
: moveOccupancyTypeUp(request.body.occupancyTypeId);
const occupancyTypes = getOccupancyTypes();

2
handlers/admin-post/doMoveOccupancyTypeUp.ts
View File

@ -9,7 +9,7 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/func
export const handler: RequestHandler = async (request, response) => {
const success =
request.body.moveToTop === "1"
request.body.moveToEnd === "1"
? moveOccupancyTypeUpToTop(request.body.occupancyTypeId)
: moveOccupancyTypeUp(request.body.occupancyTypeId);

79
public-typescript/adminOccupancyTypes.js
View File

@ -123,20 +123,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
}
function moveOccupancyTypeUp(clickEvent) {
clickEvent.preventDefault();
function moveOccupancyType(clickEvent) {
const buttonElement = clickEvent.currentTarget;
const occupancyTypeId = clickEvent.currentTarget.closest(".container--occupancyType").dataset.occupancyTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypeUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypeUp"
: "doMoveOccupancyTypeDown"), {
occupancyTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function moveOccupancyTypeDown(clickEvent) {
clickEvent.preventDefault();
const occupancyTypeId = clickEvent.currentTarget.closest(".container--occupancyType").dataset.occupancyTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypeDown", {
occupancyTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function openEditOccupancyTypeField(occupancyTypeId, occupancyTypeFieldId) {
@ -241,20 +237,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
const occupancyTypeId = Number.parseInt(clickEvent.currentTarget.closest(".container--occupancyType").dataset.occupancyTypeId, 10);
openEditOccupancyTypeField(occupancyTypeId, occupancyTypeFieldId);
}
function moveOccupancyTypeFieldUp(clickEvent) {
clickEvent.preventDefault();
function moveOccupancyTypeField(clickEvent) {
const buttonElement = clickEvent.currentTarget;
const occupancyTypeFieldId = clickEvent.currentTarget.closest(".container--occupancyTypeField").dataset.occupancyTypeFieldId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypeFieldUp", {
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypeFieldUp"
: "doMoveOccupancyTypeFieldDown"), {
occupancyTypeFieldId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function moveOccupancyTypeFieldDown(clickEvent) {
clickEvent.preventDefault();
const occupancyTypeFieldId = clickEvent.currentTarget.closest(".container--occupancyTypeField").dataset.occupancyTypeFieldId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypeFieldDown", {
occupancyTypeFieldId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function renderOccupancyTypeFields(panelElement, occupancyTypeId, occupancyTypeFields) {
@ -296,8 +288,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
panelBlockElement
.querySelector(".button--editOccupancyTypeField")
.addEventListener("click", openEditOccupancyTypeFieldByClick);
panelBlockElement.querySelector(".button--moveOccupancyTypeFieldUp").addEventListener("click", moveOccupancyTypeFieldUp);
panelBlockElement.querySelector(".button--moveOccupancyTypeFieldDown").addEventListener("click", moveOccupancyTypeFieldDown);
panelBlockElement.querySelector(".button--moveOccupancyTypeFieldUp").addEventListener("click", moveOccupancyTypeField);
panelBlockElement.querySelector(".button--moveOccupancyTypeFieldDown").addEventListener("click", moveOccupancyTypeField);
panelElement.append(panelBlockElement);
}
}
@ -333,24 +325,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
});
}
function moveOccupancyTypePrintUp(clickEvent) {
clickEvent.preventDefault();
const printEJS = clickEvent.currentTarget.closest(".container--occupancyTypePrint").dataset.printEJS;
const occupancyTypeId = clickEvent.currentTarget.closest(".container--occupancyTypePrintList").dataset.occupancyTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypePrintUp", {
function moveOccupancyTypePrint(clickEvent) {
const buttonElement = clickEvent.currentTarget;
const printEJS = buttonElement.closest(".container--occupancyTypePrint")
.dataset.printEJS;
const occupancyTypeId = buttonElement.closest(".container--occupancyTypePrintList").dataset.occupancyTypeId;
cityssm.postJSON(los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypePrintUp"
: "doMoveOccupancyTypePrintDown"), {
occupancyTypeId,
printEJS,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function moveOccupancyTypePrintDown(clickEvent) {
clickEvent.preventDefault();
const printEJS = clickEvent.currentTarget.closest(".container--occupancyTypePrint").dataset.printEJS;
const occupancyTypeId = clickEvent.currentTarget.closest(".container--occupancyTypePrintList").dataset.occupancyTypeId;
cityssm.postJSON(los.urlPrefix + "/admin/doMoveOccupancyTypePrintDown", {
occupancyTypeId,
printEJS,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
}, occupancyTypeResponseHandler);
}
function deleteOccupancyTypePrint(clickEvent) {
@ -420,8 +407,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>") +
"</div>" +
"</div>";
panelBlockElement.querySelector(".button--moveOccupancyTypePrintUp").addEventListener("click", moveOccupancyTypePrintUp);
panelBlockElement.querySelector(".button--moveOccupancyTypePrintDown").addEventListener("click", moveOccupancyTypePrintDown);
panelBlockElement.querySelector(".button--moveOccupancyTypePrintUp").addEventListener("click", moveOccupancyTypePrint);
panelBlockElement.querySelector(".button--moveOccupancyTypePrintDown").addEventListener("click", moveOccupancyTypePrint);
panelBlockElement
.querySelector(".button--deleteOccupancyTypePrint")
.addEventListener("click", deleteOccupancyTypePrint);
@ -530,8 +517,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
occupancyTypeContainer
.querySelector(".button--addOccupancyTypeField")
.addEventListener("click", openAddOccupancyTypeField);
occupancyTypeContainer.querySelector(".button--moveOccupancyTypeUp").addEventListener("click", moveOccupancyTypeUp);
occupancyTypeContainer.querySelector(".button--moveOccupancyTypeDown").addEventListener("click", moveOccupancyTypeDown);
occupancyTypeContainer.querySelector(".button--moveOccupancyTypeUp").addEventListener("click", moveOccupancyType);
occupancyTypeContainer.querySelector(".button--moveOccupancyTypeDown").addEventListener("click", moveOccupancyType);
occupancyTypesContainerElement.append(occupancyTypeContainer);
}
// Prints

130
public-typescript/adminOccupancyTypes.ts
View File

@ -246,8 +246,8 @@ declare const bulmaJS: BulmaJS;
});
}
function moveOccupancyTypeUp(clickEvent: MouseEvent) {
clickEvent.preventDefault();
function moveOccupancyType(clickEvent: MouseEvent) {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const occupancyTypeId = (
(clickEvent.currentTarget as HTMLElement).closest(
@ -256,29 +256,14 @@ declare const bulmaJS: BulmaJS;
).dataset.occupancyTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypeUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypeUp"
: "doMoveOccupancyTypeDown"),
{
occupancyTypeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
}
function moveOccupancyTypeDown(clickEvent: MouseEvent) {
clickEvent.preventDefault();
const occupancyTypeId = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyType"
) as HTMLElement
).dataset.occupancyTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypeDown",
{
occupancyTypeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
@ -471,8 +456,8 @@ declare const bulmaJS: BulmaJS;
openEditOccupancyTypeField(occupancyTypeId, occupancyTypeFieldId);
}
function moveOccupancyTypeFieldUp(clickEvent: MouseEvent) {
clickEvent.preventDefault();
function moveOccupancyTypeField(clickEvent: MouseEvent) {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const occupancyTypeFieldId = (
(clickEvent.currentTarget as HTMLElement).closest(
@ -481,29 +466,14 @@ declare const bulmaJS: BulmaJS;
).dataset.occupancyTypeFieldId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypeFieldUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypeFieldUp"
: "doMoveOccupancyTypeFieldDown"),
{
occupancyTypeFieldId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
}
function moveOccupancyTypeFieldDown(clickEvent: MouseEvent) {
clickEvent.preventDefault();
const occupancyTypeFieldId = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyTypeField"
) as HTMLElement
).dataset.occupancyTypeFieldId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypeFieldDown",
{
occupancyTypeFieldId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
@ -566,13 +536,13 @@ declare const bulmaJS: BulmaJS;
panelBlockElement.querySelector(
".button--moveOccupancyTypeFieldUp"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypeFieldUp);
).addEventListener("click", moveOccupancyTypeField);
(
panelBlockElement.querySelector(
".button--moveOccupancyTypeFieldDown"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypeFieldDown);
).addEventListener("click", moveOccupancyTypeField);
panelElement.append(panelBlockElement);
}
@ -640,53 +610,26 @@ declare const bulmaJS: BulmaJS;
});
}
function moveOccupancyTypePrintUp(clickEvent: MouseEvent): void {
clickEvent.preventDefault();
function moveOccupancyTypePrint(clickEvent: MouseEvent): void {
const buttonElement = clickEvent.currentTarget as HTMLButtonElement;
const printEJS = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyTypePrint"
) as HTMLElement
).dataset.printEJS;
const printEJS = (buttonElement.closest(".container--occupancyTypePrint") as HTMLElement)
.dataset.printEJS;
const occupancyTypeId = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyTypePrintList"
) as HTMLElement
buttonElement.closest(".container--occupancyTypePrintList") as HTMLElement
).dataset.occupancyTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypePrintUp",
los.urlPrefix +
"/admin/" +
(buttonElement.dataset.direction === "up"
? "doMoveOccupancyTypePrintUp"
: "doMoveOccupancyTypePrintDown"),
{
occupancyTypeId,
printEJS,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
}
function moveOccupancyTypePrintDown(clickEvent: MouseEvent): void {
clickEvent.preventDefault();
const printEJS = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyTypePrint"
) as HTMLElement
).dataset.printEJS;
const occupancyTypeId = (
(clickEvent.currentTarget as HTMLElement).closest(
".container--occupancyTypePrintList"
) as HTMLElement
).dataset.occupancyTypeId;
cityssm.postJSON(
los.urlPrefix + "/admin/doMoveOccupancyTypePrintDown",
{
occupancyTypeId,
printEJS,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
moveToEnd: clickEvent.shiftKey ? "1" : "0"
},
occupancyTypeResponseHandler
);
@ -795,13 +738,13 @@ declare const bulmaJS: BulmaJS;
panelBlockElement.querySelector(
".button--moveOccupancyTypePrintUp"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypePrintUp);
).addEventListener("click", moveOccupancyTypePrint);
(
panelBlockElement.querySelector(
".button--moveOccupancyTypePrintDown"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypePrintDown);
).addEventListener("click", moveOccupancyTypePrint);
panelBlockElement
.querySelector(".button--deleteOccupancyTypePrint")!
@ -952,13 +895,13 @@ declare const bulmaJS: BulmaJS;
occupancyTypeContainer.querySelector(
".button--moveOccupancyTypeUp"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypeUp);
).addEventListener("click", moveOccupancyType);
(
occupancyTypeContainer.querySelector(
".button--moveOccupancyTypeDown"
) as HTMLButtonElement
).addEventListener("click", moveOccupancyTypeDown);
).addEventListener("click", moveOccupancyType);
occupancyTypesContainerElement.append(occupancyTypeContainer);
}
@ -1008,9 +951,7 @@ declare const bulmaJS: BulmaJS;
}
}
document.querySelector("#button--addOccupancyType")!.addEventListener(
"click",
() => {
document.querySelector("#button--addOccupancyType")!.addEventListener("click", () => {
let addCloseModalFunction: () => void;
const doAdd = (submitEvent: SubmitEvent) => {
@ -1060,8 +1001,7 @@ declare const bulmaJS: BulmaJS;
bulmaJS.toggleHtmlClipped();
}
});
}
);
});
renderOccupancyTypes();
})();

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

File diff suppressed because one or more lines are too long