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

polish fees admin 

- more mobile friendly
- faster sorting with shift key
deepsource-autofix-76c6eb20
Dan Gowans 2022-10-03 11:27:54 -04:00
parent efa724cd11
commit 5dea999758
33 changed files with 534 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/admin-post/doMoveFeeCategoryDown.js
View File

@ -1,7 +1,9 @@
import { moveFeeCategoryDown } from "../../helpers/lotOccupancyDB/moveFeeCategoryDown.js";
import { moveFeeCategoryDown, moveFeeCategoryDownToBottom } from "../../helpers/lotOccupancyDB/moveFeeCategoryDown.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = moveFeeCategoryDown(request.body.feeCategoryId);
const success = request.body.moveToBottom === "1"
? moveFeeCategoryDownToBottom(request.body.feeCategoryId)
: moveFeeCategoryDown(request.body.feeCategoryId);
const feeCategories = getFeeCategories({}, {
includeFees: true
});

10
handlers/admin-post/doMoveFeeCategoryDown.ts
View File

@ -1,11 +1,17 @@
import type { RequestHandler } from "express";
import { moveFeeCategoryDown } from "../../helpers/lotOccupancyDB/moveFeeCategoryDown.js";
import {
moveFeeCategoryDown,
moveFeeCategoryDownToBottom
} from "../../helpers/lotOccupancyDB/moveFeeCategoryDown.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler: RequestHandler = async (request, response) => {
const success = moveFeeCategoryDown(request.body.feeCategoryId);
const success =
request.body.moveToBottom === "1"
? moveFeeCategoryDownToBottom(request.body.feeCategoryId)
: moveFeeCategoryDown(request.body.feeCategoryId);
const feeCategories = getFeeCategories(
{},

6
handlers/admin-post/doMoveFeeCategoryUp.js
View File

@ -1,7 +1,9 @@
import { moveFeeCategoryUp } from "../../helpers/lotOccupancyDB/moveFeeCategoryUp.js";
import { moveFeeCategoryUp, moveFeeCategoryUpToTop } from "../../helpers/lotOccupancyDB/moveFeeCategoryUp.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = moveFeeCategoryUp(request.body.feeCategoryId);
const success = request.body.moveToTop === "1"
? moveFeeCategoryUpToTop(request.body.feeCategoryId)
: moveFeeCategoryUp(request.body.feeCategoryId);
const feeCategories = getFeeCategories({}, {
includeFees: true
});

10
handlers/admin-post/doMoveFeeCategoryUp.ts
View File

@ -1,11 +1,17 @@
import type { RequestHandler } from "express";
import { moveFeeCategoryUp } from "../../helpers/lotOccupancyDB/moveFeeCategoryUp.js";
import {
moveFeeCategoryUp,
moveFeeCategoryUpToTop
} from "../../helpers/lotOccupancyDB/moveFeeCategoryUp.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler: RequestHandler = async (request, response) => {
const success = moveFeeCategoryUp(request.body.feeCategoryId);
const success =
request.body.moveToTop === "1"
? moveFeeCategoryUpToTop(request.body.feeCategoryId)
: moveFeeCategoryUp(request.body.feeCategoryId);
const feeCategories = getFeeCategories(
{},

6
handlers/admin-post/doMoveFeeDown.js
View File

@ -1,7 +1,9 @@
import { moveFeeDown } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = moveFeeDown(request.body.feeId);
const success = request.body.moveToBottom === "1"
? moveFeeDownToBottom(request.body.feeId)
: moveFeeDown(request.body.feeId);
const feeCategories = getFeeCategories({}, {
includeFees: true
});

7
handlers/admin-post/doMoveFeeDown.ts
View File

@ -1,11 +1,14 @@
import type { RequestHandler } from "express";
import { moveFeeDown } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler: RequestHandler = async (request, response) => {
const success = moveFeeDown(request.body.feeId);
const success =
request.body.moveToBottom === "1"
? moveFeeDownToBottom(request.body.feeId)
: moveFeeDown(request.body.feeId);
const feeCategories = getFeeCategories(
{},

6
handlers/admin-post/doMoveFeeUp.js
View File

@ -1,7 +1,9 @@
import { moveFeeUp } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = moveFeeUp(request.body.feeId);
const success = request.body.moveToTop === "1"
? moveFeeUpToTop(request.body.feeId)
: moveFeeUp(request.body.feeId);
const feeCategories = getFeeCategories({}, {
includeFees: true
});

7
handlers/admin-post/doMoveFeeUp.ts
View File

@ -1,11 +1,14 @@
import type { RequestHandler } from "express";
import { moveFeeUp } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler: RequestHandler = async (request, response) => {
const success = moveFeeUp(request.body.feeId);
const success =
request.body.moveToTop === "1"
? moveFeeUpToTop(request.body.feeId)
: moveFeeUp(request.body.feeId);
const feeCategories = getFeeCategories(
{},

2
helpers/lotOccupancyDB/addFee.js
View File

@ -14,7 +14,7 @@ export const addFee = (feeForm, requestSession) => {
" recordCreate_userName, recordCreate_timeMillis," +
" recordUpdate_userName, recordUpdate_timeMillis)" +
" values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
.run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId || undefined, feeForm.lotTypeId || undefined, feeForm.feeAmount || undefined, feeForm.feeFunction || undefined, feeForm.taxAmount || undefined, feeForm.taxPercentage || undefined, feeForm.includeQuantity ? 1 : 0, feeForm.quantityUnit, feeForm.isRequired ? 1 : 0, feeForm.orderNumber || 0, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
.run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId || undefined, feeForm.lotTypeId || undefined, feeForm.feeAmount || undefined, feeForm.feeFunction || undefined, feeForm.taxAmount || undefined, feeForm.taxPercentage || undefined, feeForm.includeQuantity ? 1 : 0, feeForm.quantityUnit, feeForm.isRequired ? 1 : 0, feeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
database.close();
return result.lastInsertRowid;
};

2
helpers/lotOccupancyDB/addFee.ts
View File

@ -53,7 +53,7 @@ export const addFee = (
feeForm.includeQuantity ? 1 : 0,
feeForm.quantityUnit,
feeForm.isRequired ? 1 : 0,
feeForm.orderNumber || 0,
feeForm.orderNumber || -1,
requestSession.user.userName,
rightNowMillis,
requestSession.user.userName,

2
helpers/lotOccupancyDB/addFeeCategory.js
View File

@ -9,7 +9,7 @@ export const addFeeCategory = (feeCategoryForm, requestSession) => {
" recordCreate_userName, recordCreate_timeMillis," +
" recordUpdate_userName, recordUpdate_timeMillis)" +
" values (?, ?, ?, ?, ?, ?)")
.run(feeCategoryForm.feeCategory, feeCategoryForm.orderNumber || 0, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
.run(feeCategoryForm.feeCategory, feeCategoryForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
database.close();
return result.lastInsertRowid;
};

2
helpers/lotOccupancyDB/addFeeCategory.ts
View File

@ -26,7 +26,7 @@ export const addFeeCategory = (
)
.run(
feeCategoryForm.feeCategory,
feeCategoryForm.orderNumber || 0,
feeCategoryForm.orderNumber || -1,
requestSession.user.userName,
rightNowMillis,
requestSession.user.userName,

3
helpers/lotOccupancyDB/getFee.d.ts vendored
View File

@ -1,3 +1,4 @@
import sqlite from "better-sqlite3";
import type * as recordTypes from "../../types/recordTypes";
export declare const getFee: (feeId: number | string) => recordTypes.Fee;
export declare const getFee: (feeId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.Fee;
export default getFee;

15
helpers/lotOccupancyDB/getFee.js
View File

@ -1,9 +1,10 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
export const getFee = (feeId) => {
const database = sqlite(databasePath, {
readonly: true
});
export const getFee = (feeId, connectedDatabase) => {
const database = connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const fee = database
.prepare("select f.feeId," +
" f.feeCategoryId, c.feeCategory," +
@ -13,7 +14,7 @@ export const getFee = (feeId) => {
" ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction," +
" f.taxAmount, f.taxPercentage," +
" f.includeQuantity, f.quantityUnit," +
" f.isRequired" +
" f.isRequired, f.orderNumber" +
" from Fees f" +
" left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" +
" left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" +
@ -21,7 +22,9 @@ export const getFee = (feeId) => {
" where f.recordDelete_timeMillis is null" +
" and f.feeId = ?")
.get(feeId);
database.close();
if (!connectedDatabase) {
database.close();
}
return fee;
};
export default getFee;

19
helpers/lotOccupancyDB/getFee.ts
View File

@ -4,10 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
export const getFee = (feeId: number | string): recordTypes.Fee => {
const database = sqlite(databasePath, {
readonly: true
});
export const getFee = (
feeId: number | string,
connectedDatabase?: sqlite.Database
): recordTypes.Fee => {
const database =
connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const fee = database
.prepare(
@ -19,7 +24,7 @@ export const getFee = (feeId: number | string): recordTypes.Fee => {
" ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction," +
" f.taxAmount, f.taxPercentage," +
" f.includeQuantity, f.quantityUnit," +
" f.isRequired" +
" f.isRequired, f.orderNumber" +
" from Fees f" +
" left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" +
" left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" +
@ -29,7 +34,9 @@ export const getFee = (feeId: number | string): recordTypes.Fee => {
)
.get(feeId);
database.close();
if (!connectedDatabase) {
database.close();
}
return fee;
};

1
helpers/lotOccupancyDB/moveFeeCategoryDown.d.ts vendored
View File

@ -1,2 +1,3 @@
export declare const moveFeeCategoryDown: (feeCategoryId: number | string) => boolean;
export declare const moveFeeCategoryDownToBottom: (feeCategoryId: number | string) => boolean;
export default moveFeeCategoryDown;

32
helpers/lotOccupancyDB/moveFeeCategoryDown.js
View File

@ -3,9 +3,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
export const moveFeeCategoryDown = (feeCategoryId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber" +
" from FeeCategories" +
" where feeCategoryId = ?")
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
database
.prepare("update FeeCategories" +
@ -14,11 +12,33 @@ export const moveFeeCategoryDown = (feeCategoryId) => {
" and orderNumber = ? + 1")
.run(currentOrderNumber);
const result = database
.prepare("update FeeCategories" +
" set orderNumber = ? + 1" +
" where feeCategoryId = ?")
.prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?")
.run(currentOrderNumber, feeCategoryId);
database.close();
return result.changes > 0;
};
export const moveFeeCategoryDownToBottom = (feeCategoryId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
const maxOrderNumber = database
.prepare("select max(orderNumber) as maxOrderNumber" +
" from FeeCategories" +
" where recordDelete_timeMillis is null")
.get().maxOrderNumber;
if (currentOrderNumber !== maxOrderNumber) {
database
.prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?")
.run(maxOrderNumber, feeCategoryId);
database
.prepare("update FeeCategories" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and orderNumber > ?")
.run(currentOrderNumber);
}
database.close();
return true;
};
export default moveFeeCategoryDown;

51
helpers/lotOccupancyDB/moveFeeCategoryDown.ts
View File

@ -2,17 +2,11 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
export const moveFeeCategoryDown = (
feeCategoryId: number | string
): boolean => {
export const moveFeeCategoryDown = (feeCategoryId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare(
"select orderNumber" +
" from FeeCategories" +
" where feeCategoryId = ?"
)
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
database
@ -25,11 +19,7 @@ export const moveFeeCategoryDown = (
.run(currentOrderNumber);
const result = database
.prepare(
"update FeeCategories" +
" set orderNumber = ? + 1" +
" where feeCategoryId = ?"
)
.prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?")
.run(currentOrderNumber, feeCategoryId);
database.close();
@ -37,4 +27,39 @@ export const moveFeeCategoryDown = (
return result.changes > 0;
};
export const moveFeeCategoryDownToBottom = (feeCategoryId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
const maxOrderNumber: number = database
.prepare(
"select max(orderNumber) as maxOrderNumber" +
" from FeeCategories" +
" where recordDelete_timeMillis is null"
)
.get().maxOrderNumber;
if (currentOrderNumber !== maxOrderNumber) {
database
.prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?")
.run(maxOrderNumber, feeCategoryId);
database
.prepare(
"update FeeCategories" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and orderNumber > ?"
)
.run(currentOrderNumber);
}
database.close();
return true;
};
export default moveFeeCategoryDown;

1
helpers/lotOccupancyDB/moveFeeCategoryUp.d.ts vendored
View File

@ -1,2 +1,3 @@
export declare const moveFeeCategoryUp: (feeCategoryId: number | string) => boolean;
export declare const moveFeeCategoryUpToTop: (feeCategoryId: number | string) => boolean;
export default moveFeeCategoryUp;

27
helpers/lotOccupancyDB/moveFeeCategoryUp.js
View File

@ -3,9 +3,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
export const moveFeeCategoryUp = (feeCategoryId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber" +
" from FeeCategories" +
" where feeCategoryId = ?")
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
if (currentOrderNumber <= 0) {
database.close();
@ -18,11 +16,28 @@ export const moveFeeCategoryUp = (feeCategoryId) => {
" and orderNumber = ? - 1")
.run(currentOrderNumber);
const result = database
.prepare("update FeeCategories" +
" set orderNumber = ? - 1" +
" where feeCategoryId = ?")
.prepare("update FeeCategories set orderNumber = ? - 1 where feeCategoryId = ?")
.run(currentOrderNumber, feeCategoryId);
database.close();
return result.changes > 0;
};
export const moveFeeCategoryUpToTop = (feeCategoryId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
if (currentOrderNumber > 0) {
database
.prepare("update FeeCategories set orderNumber = -1 where feeCategoryId = ?")
.run(feeCategoryId);
database
.prepare("update FeeCategories" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and orderNumber < ?")
.run(currentOrderNumber);
}
database.close();
return true;
};
export default moveFeeCategoryUp;

39
helpers/lotOccupancyDB/moveFeeCategoryUp.ts
View File

@ -6,11 +6,7 @@ export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare(
"select orderNumber" +
" from FeeCategories" +
" where feeCategoryId = ?"
)
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
if (currentOrderNumber <= 0) {
@ -28,11 +24,7 @@ export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => {
.run(currentOrderNumber);
const result = database
.prepare(
"update FeeCategories" +
" set orderNumber = ? - 1" +
" where feeCategoryId = ?"
)
.prepare("update FeeCategories set orderNumber = ? - 1 where feeCategoryId = ?")
.run(currentOrderNumber, feeCategoryId);
database.close();
@ -40,4 +32,31 @@ export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => {
return result.changes > 0;
};
export const moveFeeCategoryUpToTop = (feeCategoryId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare("select orderNumber from FeeCategories where feeCategoryId = ?")
.get(feeCategoryId).orderNumber;
if (currentOrderNumber > 0) {
database
.prepare("update FeeCategories set orderNumber = -1 where feeCategoryId = ?")
.run(feeCategoryId);
database
.prepare(
"update FeeCategories" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and orderNumber < ?"
)
.run(currentOrderNumber);
}
database.close();
return true;
};
export default moveFeeCategoryUp;

1
helpers/lotOccupancyDB/moveFeeDown.d.ts vendored
View File

@ -1,2 +1,3 @@
export declare const moveFeeDown: (feeId: number | string) => boolean;
export declare const moveFeeDownToBottom: (feeId: number | string) => boolean;
export default moveFeeDown;

36
helpers/lotOccupancyDB/moveFeeDown.js
View File

@ -1,20 +1,44 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
export const moveFeeDown = (feeId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber" + " from Fees" + " where feeId = ?")
.get(feeId).orderNumber;
const currentFee = getFee(feeId, database);
database
.prepare("update Fees" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber = ? + 1")
.run(currentOrderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const result = database
.prepare("update Fees" + " set orderNumber = ? + 1" + " where feeId = ?")
.run(currentOrderNumber, feeId);
.prepare("update Fees set orderNumber = ? + 1 where feeId = ?")
.run(currentFee.orderNumber, feeId);
database.close();
return result.changes > 0;
};
export const moveFeeDownToBottom = (feeId) => {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
const maxOrderNumber = database
.prepare("select max(orderNumber) as maxOrderNumber" +
" from Fees" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?")
.get(currentFee.feeCategoryId).maxOrderNumber;
if (currentFee.orderNumber !== maxOrderNumber) {
database
.prepare("update Fees set orderNumber = ? + 1 where feeId = ?")
.run(maxOrderNumber, feeId);
database
.prepare("update Fees" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber > ?")
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
};
export default moveFeeDown;

50
helpers/lotOccupancyDB/moveFeeDown.ts
View File

@ -2,31 +2,65 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
export const moveFeeDown = (feeId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare("select orderNumber" + " from Fees" + " where feeId = ?")
.get(feeId).orderNumber;
const currentFee = getFee(feeId, database);
database
.prepare(
"update Fees" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber = ? + 1"
)
.run(currentOrderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const result = database
.prepare(
"update Fees" + " set orderNumber = ? + 1" + " where feeId = ?"
)
.run(currentOrderNumber, feeId);
.prepare("update Fees set orderNumber = ? + 1 where feeId = ?")
.run(currentFee.orderNumber, feeId);
database.close();
return result.changes > 0;
};
export const moveFeeDownToBottom = (feeId: number | string): boolean => {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
const maxOrderNumber: number = database
.prepare(
"select max(orderNumber) as maxOrderNumber" +
" from Fees" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?"
)
.get(currentFee.feeCategoryId).maxOrderNumber;
if (currentFee.orderNumber !== maxOrderNumber) {
database
.prepare("update Fees set orderNumber = ? + 1 where feeId = ?")
.run(maxOrderNumber, feeId);
database
.prepare(
"update Fees" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber > ?"
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
};
export default moveFeeDown;

1
helpers/lotOccupancyDB/moveFeeUp.d.ts vendored
View File

@ -1,2 +1,3 @@
export declare const moveFeeUp: (feeId: number | string) => boolean;
export declare const moveFeeUpToTop: (feeId: number | string) => boolean;
export default moveFeeUp;

30
helpers/lotOccupancyDB/moveFeeUp.js
View File

@ -1,11 +1,10 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
export const moveFeeUp = (feeId) => {
const database = sqlite(databasePath);
const currentOrderNumber = database
.prepare("select orderNumber" + " from Fees" + " where feeId = ?")
.get(feeId).orderNumber;
if (currentOrderNumber <= 0) {
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
@ -13,12 +12,29 @@ export const moveFeeUp = (feeId) => {
.prepare("update Fees" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber = ? - 1")
.run(currentOrderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const result = database
.prepare("update Fees" + " set orderNumber = ? - 1" + " where feeId = ?")
.run(currentOrderNumber, feeId);
.prepare("update Fees set orderNumber = ? - 1 where feeId = ?")
.run(currentFee.orderNumber, feeId);
database.close();
return result.changes > 0;
};
export const moveFeeUpToTop = (feeId) => {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
database.prepare("update Fees set orderNumber = -1 where feeId = ?").run(feeId);
database
.prepare("update Fees" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber < ?")
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
};
export default moveFeeUp;

41
helpers/lotOccupancyDB/moveFeeUp.ts
View File

@ -2,14 +2,14 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
export const moveFeeUp = (feeId: number | string): boolean => {
const database = sqlite(databasePath);
const currentOrderNumber: number = database
.prepare("select orderNumber" + " from Fees" + " where feeId = ?")
.get(feeId).orderNumber;
const currentFee = getFee(feeId, database);
if (currentOrderNumber <= 0) {
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
@ -19,19 +19,42 @@ export const moveFeeUp = (feeId: number | string): boolean => {
"update Fees" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber = ? - 1"
)
.run(currentOrderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const result = database
.prepare(
"update Fees" + " set orderNumber = ? - 1" + " where feeId = ?"
)
.run(currentOrderNumber, feeId);
.prepare("update Fees set orderNumber = ? - 1 where feeId = ?")
.run(currentFee.orderNumber, feeId);
database.close();
return result.changes > 0;
};
export const moveFeeUpToTop = (feeId: number | string): boolean => {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
database.prepare("update Fees set orderNumber = -1 where feeId = ?").run(feeId);
database
.prepare(
"update Fees" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
" and feeCategoryId = ?" +
" and orderNumber < ?"
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
};
export default moveFeeUp;

4
helpers/lotOccupancyDB/moveLotTypeFieldUp.js
View File

@ -4,7 +4,7 @@ import { clearLotTypesCache } from "../functions.cache.js";
export const moveLotTypeFieldUp = (lotTypeFieldId) => {
const database = sqlite(databasePath);
const currentField = database
.prepare("select lotTypeId, orderNumber" + " from LotTypeFields" + " where lotTypeFieldId = ?")
.prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?")
.get(lotTypeFieldId);
if (currentField.orderNumber <= 0) {
database.close();
@ -18,7 +18,7 @@ export const moveLotTypeFieldUp = (lotTypeFieldId) => {
" and orderNumber = ? - 1")
.run(currentField.lotTypeId, currentField.orderNumber);
const result = database
.prepare("update LotTypeFields" + " set orderNumber = ? - 1" + " where lotTypeFieldId = ?")
.prepare("update LotTypeFields set orderNumber = ? - 1 where lotTypeFieldId = ?")
.run(currentField.orderNumber, lotTypeFieldId);
database.close();
clearLotTypesCache();

6
helpers/lotOccupancyDB/moveLotTypeFieldUp.ts
View File

@ -8,9 +8,7 @@ export const moveLotTypeFieldUp = (lotTypeFieldId: number | string): boolean =>
const database = sqlite(databasePath);
const currentField: { lotTypeId: number; orderNumber: number } = database
.prepare(
"select lotTypeId, orderNumber" + " from LotTypeFields" + " where lotTypeFieldId = ?"
)
.prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?")
.get(lotTypeFieldId);
if (currentField.orderNumber <= 0) {
@ -29,7 +27,7 @@ export const moveLotTypeFieldUp = (lotTypeFieldId: number | string): boolean =>
.run(currentField.lotTypeId, currentField.orderNumber);
const result = database
.prepare("update LotTypeFields" + " set orderNumber = ? - 1" + " where lotTypeFieldId = ?")
.prepare("update LotTypeFields set orderNumber = ? - 1 where lotTypeFieldId = ?")
.run(currentField.orderNumber, lotTypeFieldId);
database.close();

164
public-typescript/adminFees.js
View File

@ -17,42 +17,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
feeCategoriesContainerElement.innerHTML = "";
for (const feeCategory of feeCategories) {
const feeCategoryContainerElement = document.createElement("section");
feeCategoryContainerElement.className =
"panel container--feeCategory";
feeCategoryContainerElement.className = "panel container--feeCategory";
feeCategoryContainerElement.dataset.feeCategoryId =
feeCategory.feeCategoryId.toString();
feeCategoryContainerElement.innerHTML =
'<div class="panel-heading">' +
'<div class="level is-mobile">' +
('<div class="level-left">' +
'<div class="level-item">' +
'<div class="columns">' +
('<div class="column">' +
'<h2 class="title is-4">' +
cityssm.escapeHTML(feeCategory.feeCategory) +
"</h2>" +
"</div>" +
"</div>") +
('<div class="level-right">' +
('<div class="column is-narrow">' +
'<div class="field is-grouped is-justify-content-end">' +
(feeCategory.fees.length === 0
? '<div class="level-item">' +
? '<div class="control">' +
'<button class="button is-small is-danger button--deleteFeeCategory" type="button">' +
'<span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>' +
"<span>Delete Category</span>" +
"</button>" +
"</div>"
: "") +
('<div class="level-item">' +
('<div class="control">' +
'<button class="button is-small is-primary button--editFeeCategory" type="button">' +
'<span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span>' +
"<span>Edit Category</span>" +
"</button>" +
"</div>") +
('<div class="level-item">' +
('<div class="control">' +
'<button class="button is-small is-success button--addFee" type="button">' +
'<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>' +
"<span>Add Fee</span>" +
"</button>" +
"</div>") +
('<div class="level-item">' +
('<div class="control">' +
'<div class="field has-addons">' +
'<div class="control">' +
'<button class="button is-small button--moveFeeCategoryUp" data-tooltip="Move Up" type="button" aria-label="Move Up">' +
@ -81,8 +79,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
else {
for (const fee of feeCategory.fees) {
const panelBlockElement = document.createElement("div");
panelBlockElement.className =
"panel-block is-block container--fee";
panelBlockElement.className = "panel-block is-block container--fee";
panelBlockElement.dataset.feeId = fee.feeId.toString();
panelBlockElement.innerHTML =
'<div class="columns">' +
@ -92,15 +89,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
cityssm.escapeHTML(fee.feeName) +
"</a><br />" +
"<small>" +
cityssm
.escapeHTML(fee.feeDescription)
.replace(/\n/g, "<br />") +
cityssm.escapeHTML(fee.feeDescription).replace(/\n/g, "<br />") +
"</small>" +
"</p>" +
'<p class="tags">' +
(fee.isRequired
? '<span class="tag is-warning">Required</span>'
: "") +
(fee.isRequired ? '<span class="tag is-warning">Required</span>' : "") +
(fee.occupancyTypeId
? ' <span class="tag has-tooltip-bottom" data-tooltip="' +
cityssm.escapeHTML(exports.aliases.occupancy) +
@ -117,31 +110,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
: "") +
"</p>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
"<br />" +
"<small>Fee Function</small>"
: "$" +
fee.feeAmount.toFixed(2) +
"<br />" +
"<small>Fee</small>") +
"</div>") +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + "%"
: "$" + fee.taxAmount.toFixed(2)) +
"<br /><small>Tax</small>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit) +
"<br />" +
"<small>Quantity</small>"
: "") +
('<div class="column">' +
'<div class="columns is-mobile">' +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
"<br />" +
"<small>Fee Function</small>"
: "$" +
fee.feeAmount.toFixed(2) +
"<br />" +
"<small>Fee</small>") +
"</div>") +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + "%"
: "$" + fee.taxAmount.toFixed(2)) +
"<br /><small>Tax</small>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit) +
"<br />" +
"<small>Quantity</small>"
: "") +
"</div>") +
"</div>" +
"</div>") +
('<div class="column is-narrow">' +
'<div class="field has-addons">' +
'<div class="field has-addons is-justify-content-end">' +
'<div class="control">' +
'<button class="button is-small button--moveFeeUp" data-tooltip="Move Up" type="button" aria-label="Move Up">' +
'<i class="fas fa-arrow-up" aria-hidden="true"></i>' +
@ -155,9 +152,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
"</div>" +
"</div>") +
"</div>";
panelBlockElement
.querySelector("a")
.addEventListener("click", openEditFee);
panelBlockElement.querySelector("a").addEventListener("click", openEditFee);
panelBlockElement
.querySelector(".button--moveFeeUp")
.addEventListener("click", moveFeeUp);
@ -187,9 +182,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
feeCategoriesContainerElement.append(feeCategoryContainerElement);
}
};
document
.querySelector("#button--addFeeCategory")
.addEventListener("click", () => {
document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
let addCloseModalFunction;
const doAddFeeCategory = (submitEvent) => {
submitEvent.preventDefault();
@ -213,9 +206,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
bulmaJS.toggleHtmlClipped();
modalElement.querySelector("#feeCategoryAdd--feeCategory").focus();
addCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doAddFeeCategory);
modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
},
onremoved: () => {
bulmaJS.toggleHtmlClipped();
@ -253,9 +244,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
onshown: (modalElement, closeModalFunction) => {
bulmaJS.toggleHtmlClipped();
editCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doUpdateFeeCategory);
modalElement.querySelector("form").addEventListener("submit", doUpdateFeeCategory);
modalElement.querySelector("#feeCategoryEdit--feeCategory").focus();
},
onremoved: () => {
@ -295,7 +284,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
const moveFeeCategoryUp = (clickEvent) => {
const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10);
cityssm.postJSON(urlPrefix + "/admin/doMoveFeeCategoryUp", {
feeCategoryId
feeCategoryId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;
@ -313,7 +303,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
const moveFeeCategoryDown = (clickEvent) => {
const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10);
cityssm.postJSON(urlPrefix + "/admin/doMoveFeeCategoryDown", {
feeCategoryId
feeCategoryId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;
@ -363,8 +354,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const occupancyTypeElement = modalElement.querySelector("#feeAdd--occupancyTypeId");
for (const occupancyType of exports.occupancyTypes) {
const optionElement = document.createElement("option");
optionElement.value =
occupancyType.occupancyTypeId.toString();
optionElement.value = occupancyType.occupancyTypeId.toString();
optionElement.textContent = occupancyType.occupancyType;
occupancyTypeElement.append(optionElement);
}
@ -381,9 +371,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
onshown: (modalElement, closeModalFunction) => {
bulmaJS.toggleHtmlClipped();
addCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doAddFee);
modalElement.querySelector("form").addEventListener("submit", doAddFee);
modalElement.querySelector("#feeAdd--feeName").focus();
modalElement
.querySelector("#feeAdd--feeFunction")
@ -391,16 +379,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
const feeAmountElement = modalElement.querySelector("#feeAdd--feeAmount");
const feeFunctionElement = modalElement.querySelector("#feeAdd--feeFunction");
if (feeFunctionElement.value === "") {
feeFunctionElement
.closest(".select")
.classList.remove("is-success");
feeFunctionElement.closest(".select").classList.remove("is-success");
feeAmountElement.classList.add("is-success");
feeAmountElement.disabled = false;
}
else {
feeFunctionElement
.closest(".select")
.classList.add("is-success");
feeFunctionElement.closest(".select").classList.add("is-success");
feeAmountElement.classList.remove("is-success");
feeAmountElement.disabled = true;
}
@ -437,7 +421,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
clickEvent.preventDefault();
const feeContainerElement = clickEvent.currentTarget.closest(".container--fee");
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
const feeCategoryId = Number.parseInt(feeContainerElement.closest(".container--feeCategory").dataset.feeCategoryId);
const feeCategoryId = Number.parseInt(feeContainerElement.closest(".container--feeCategory").dataset
.feeCategoryId);
const feeCategory = feeCategories.find((currentFeeCategory) => {
return currentFeeCategory.feeCategoryId === feeCategoryId;
});
@ -497,16 +482,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
const feeAmountElement = editModalElement.querySelector("#feeEdit--feeAmount");
const feeFunctionElement = editModalElement.querySelector("#feeEdit--feeFunction");
if (feeFunctionElement.value === "") {
feeFunctionElement
.closest(".select")
.classList.remove("is-success");
feeFunctionElement.closest(".select").classList.remove("is-success");
feeAmountElement.classList.add("is-success");
feeAmountElement.disabled = false;
}
else {
feeFunctionElement
.closest(".select")
.classList.add("is-success");
feeFunctionElement.closest(".select").classList.add("is-success");
feeAmountElement.classList.remove("is-success");
feeAmountElement.disabled = true;
}
@ -527,12 +508,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
};
const toggleQuantityFields = () => {
editModalElement.querySelector("#feeEdit--quantityUnit").disabled =
editModalElement.querySelector("#feeEdit--includeQuantity").value === "";
editModalElement.querySelector("#feeEdit--includeQuantity")
.value === "";
};
cityssm.openHtmlModal("adminFees-editFee", {
onshow: (modalElement) => {
editModalElement = modalElement;
modalElement.querySelector("#feeEdit--feeId").value = fee.feeId.toString();
modalElement.querySelector("#feeEdit--feeId").value =
fee.feeId.toString();
const feeCategoryElement = modalElement.querySelector("#feeEdit--feeCategoryId");
for (const feeCategory of feeCategories) {
const optionElement = document.createElement("option");
@ -543,13 +526,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
feeCategoryElement.append(optionElement);
}
modalElement.querySelector("#feeEdit--feeName").value = fee.feeName;
modalElement.querySelector("#feeEdit--feeName").value =
fee.feeName;
modalElement.querySelector("#feeEdit--feeDescription").value = fee.feeDescription;
const occupancyTypeElement = modalElement.querySelector("#feeEdit--occupancyTypeId");
for (const occupancyType of exports.occupancyTypes) {
const optionElement = document.createElement("option");
optionElement.value =
occupancyType.occupancyTypeId.toString();
optionElement.value = occupancyType.occupancyTypeId.toString();
optionElement.textContent = occupancyType.occupancyType;
if (occupancyType.occupancyTypeId === fee.occupancyTypeId) {
optionElement.selected = true;
@ -566,16 +549,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
}
lotTypeElement.append(optionElement);
}
modalElement.querySelector("#feeEdit--feeAmount").value = fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
modalElement.querySelector("#feeEdit--feeAmount").value =
fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
modalElement
.querySelector("#feeEdit--feeFunction")
.addEventListener("change", toggleFeeFields);
toggleFeeFields();
modalElement.querySelector("#feeEdit--taxAmount").value = fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
modalElement.querySelector("#feeEdit--taxAmount").value =
fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
const taxPercentageElement = modalElement.querySelector("#feeEdit--taxPercentage");
taxPercentageElement.value = fee.taxPercentage
? fee.taxPercentage.toString()
: "";
taxPercentageElement.value = fee.taxPercentage ? fee.taxPercentage.toString() : "";
taxPercentageElement.addEventListener("keyup", toggleTaxFields);
toggleTaxFields();
const includeQuantityElement = modalElement.querySelector("#feeEdit--includeQuantity");
@ -583,7 +566,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
includeQuantityElement.value = "1";
}
includeQuantityElement.addEventListener("change", toggleQuantityFields);
modalElement.querySelector("#feeEdit--quantityUnit").value = fee.quantityUnit || "";
modalElement.querySelector("#feeEdit--quantityUnit").value =
fee.quantityUnit || "";
toggleQuantityFields();
if (fee.isRequired) {
modalElement.querySelector("#feeEdit--isRequired").value = "1";
@ -593,9 +577,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
onshown: (modalElement, closeModalFunction) => {
bulmaJS.toggleHtmlClipped();
editCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doUpdateFee);
modalElement.querySelector("form").addEventListener("submit", doUpdateFee);
bulmaJS.init(modalElement);
modalElement
.querySelector(".button--deleteFee")
@ -610,7 +592,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
const feeContainerElement = clickEvent.currentTarget.closest(".container--fee");
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
cityssm.postJSON(urlPrefix + "/admin/doMoveFeeUp", {
feeId
feeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;
@ -629,7 +612,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
const feeContainerElement = clickEvent.currentTarget.closest(".container--fee");
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
cityssm.postJSON(urlPrefix + "/admin/doMoveFeeDown", {
feeId
feeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
}, (responseJSON) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;

344
public-typescript/adminFees.ts
View File

@ -35,47 +35,44 @@ declare const bulmaJS: BulmaJS;
feeCategoriesContainerElement.innerHTML = "";
for (const feeCategory of feeCategories) {
const feeCategoryContainerElement =
document.createElement("section");
const feeCategoryContainerElement = document.createElement("section");
feeCategoryContainerElement.className =
"panel container--feeCategory";
feeCategoryContainerElement.className = "panel container--feeCategory";
feeCategoryContainerElement.dataset.feeCategoryId =
feeCategory.feeCategoryId.toString();
feeCategoryContainerElement.innerHTML =
'<div class="panel-heading">' +
'<div class="level is-mobile">' +
('<div class="level-left">' +
'<div class="level-item">' +
'<div class="columns">' +
('<div class="column">' +
'<h2 class="title is-4">' +
cityssm.escapeHTML(feeCategory.feeCategory) +
"</h2>" +
"</div>" +
"</div>") +
('<div class="level-right">' +
('<div class="column is-narrow">' +
'<div class="field is-grouped is-justify-content-end">' +
(feeCategory.fees.length === 0
? '<div class="level-item">' +
? '<div class="control">' +
'<button class="button is-small is-danger button--deleteFeeCategory" type="button">' +
'<span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>' +
"<span>Delete Category</span>" +
"</button>" +
"</div>"
: "") +
('<div class="level-item">' +
('<div class="control">' +
'<button class="button is-small is-primary button--editFeeCategory" type="button">' +
'<span class="icon is-small"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span>' +
"<span>Edit Category</span>" +
"</button>" +
"</div>") +
('<div class="level-item">' +
('<div class="control">' +
'<button class="button is-small is-success button--addFee" type="button">' +
'<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>' +
"<span>Add Fee</span>" +
"</button>" +
"</div>") +
('<div class="level-item">' +
('<div class="control">' +
'<div class="field has-addons">' +
'<div class="control">' +
'<button class="button is-small button--moveFeeCategoryUp" data-tooltip="Move Up" type="button" aria-label="Move Up">' +
@ -107,8 +104,7 @@ declare const bulmaJS: BulmaJS;
} else {
for (const fee of feeCategory.fees) {
const panelBlockElement = document.createElement("div");
panelBlockElement.className =
"panel-block is-block container--fee";
panelBlockElement.className = "panel-block is-block container--fee";
panelBlockElement.dataset.feeId = fee.feeId.toString();
panelBlockElement.innerHTML =
@ -119,20 +115,14 @@ declare const bulmaJS: BulmaJS;
cityssm.escapeHTML(fee.feeName) +
"</a><br />" +
"<small>" +
cityssm
.escapeHTML(fee.feeDescription)
.replace(/\n/g, "<br />") +
cityssm.escapeHTML(fee.feeDescription).replace(/\n/g, "<br />") +
"</small>" +
"</p>" +
'<p class="tags">' +
(fee.isRequired
? '<span class="tag is-warning">Required</span>'
: "") +
(fee.isRequired ? '<span class="tag is-warning">Required</span>' : "") +
(fee.occupancyTypeId
? ' <span class="tag has-tooltip-bottom" data-tooltip="' +
cityssm.escapeHTML(
exports.aliases.occupancy
) +
cityssm.escapeHTML(exports.aliases.occupancy) +
' Type Filter">' +
cityssm.escapeHTML(fee.occupancyType) +
"</span>"
@ -146,31 +136,35 @@ declare const bulmaJS: BulmaJS;
: "") +
"</p>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
"<br />" +
"<small>Fee Function</small>"
: "$" +
fee.feeAmount.toFixed(2) +
"<br />" +
"<small>Fee</small>") +
"</div>") +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + "%"
: "$" + fee.taxAmount.toFixed(2)) +
"<br /><small>Tax</small>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit) +
"<br />" +
"<small>Quantity</small>"
: "") +
('<div class="column">' +
'<div class="columns is-mobile">' +
('<div class="column has-text-centered">' +
(fee.feeFunction
? cityssm.escapeHTML(fee.feeFunction) +
"<br />" +
"<small>Fee Function</small>"
: "$" +
fee.feeAmount.toFixed(2) +
"<br />" +
"<small>Fee</small>") +
"</div>") +
('<div class="column has-text-centered">' +
(fee.taxPercentage
? fee.taxPercentage + "%"
: "$" + fee.taxAmount.toFixed(2)) +
"<br /><small>Tax</small>" +
"</div>") +
('<div class="column has-text-centered">' +
(fee.includeQuantity
? cityssm.escapeHTML(fee.quantityUnit) +
"<br />" +
"<small>Quantity</small>"
: "") +
"</div>") +
"</div>" +
"</div>") +
('<div class="column is-narrow">' +
'<div class="field has-addons">' +
'<div class="field has-addons is-justify-content-end">' +
'<div class="control">' +
'<button class="button is-small button--moveFeeUp" data-tooltip="Move Up" type="button" aria-label="Move Up">' +
'<i class="fas fa-arrow-up" aria-hidden="true"></i>' +
@ -185,9 +179,7 @@ declare const bulmaJS: BulmaJS;
"</div>") +
"</div>";
panelBlockElement
.querySelector("a")
.addEventListener("click", openEditFee);
panelBlockElement.querySelector("a").addEventListener("click", openEditFee);
panelBlockElement
.querySelector(".button--moveFeeUp")
@ -230,56 +222,50 @@ declare const bulmaJS: BulmaJS;
* Fee Categories
*/
document
.querySelector("#button--addFeeCategory")
.addEventListener("click", () => {
let addCloseModalFunction: () => void;
document.querySelector("#button--addFeeCategory").addEventListener("click", () => {
let addCloseModalFunction: () => void;
const doAddFeeCategory = (submitEvent: SubmitEvent) => {
submitEvent.preventDefault();
const doAddFeeCategory = (submitEvent: SubmitEvent) => {
submitEvent.preventDefault();
cityssm.postJSON(
urlPrefix + "/admin/doAddFeeCategory",
submitEvent.currentTarget,
(responseJSON: {
success: boolean;
errorMessage?: string;
feeCategories: recordTypes.FeeCategory[];
}) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;
addCloseModalFunction();
renderFeeCategories();
} else {
bulmaJS.alert({
title: "Error Creating Fee Category",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
}
cityssm.postJSON(
urlPrefix + "/admin/doAddFeeCategory",
submitEvent.currentTarget,
(responseJSON: {
success: boolean;
errorMessage?: string;
feeCategories: recordTypes.FeeCategory[];
}) => {
if (responseJSON.success) {
feeCategories = responseJSON.feeCategories;
addCloseModalFunction();
renderFeeCategories();
} else {
bulmaJS.alert({
title: "Error Creating Fee Category",
message: responseJSON.errorMessage,
contextualColorName: "danger"
});
}
);
};
cityssm.openHtmlModal("adminFees-addFeeCategory", {
onshown: (modalElement, closeModalFunction) => {
bulmaJS.toggleHtmlClipped();
(
modalElement.querySelector(
"#feeCategoryAdd--feeCategory"
) as HTMLInputElement
).focus();
addCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doAddFeeCategory);
},
onremoved: () => {
bulmaJS.toggleHtmlClipped();
}
});
);
};
cityssm.openHtmlModal("adminFees-addFeeCategory", {
onshown: (modalElement, closeModalFunction) => {
bulmaJS.toggleHtmlClipped();
(
modalElement.querySelector("#feeCategoryAdd--feeCategory") as HTMLInputElement
).focus();
addCloseModalFunction = closeModalFunction;
modalElement.querySelector("form").addEventListener("submit", doAddFeeCategory);
},
onremoved: () => {
bulmaJS.toggleHtmlClipped();
}
});
});
const openEditFeeCategory = (clickEvent: Event) => {
const feeCategoryId = Number.parseInt(
@ -331,9 +317,7 @@ declare const bulmaJS: BulmaJS;
) as HTMLInputElement
).value = feeCategory.feeCategoryId.toString();
(
modalElement.querySelector(
"#feeCategoryEdit--feeCategory"
) as HTMLInputElement
modalElement.querySelector("#feeCategoryEdit--feeCategory") as HTMLInputElement
).value = feeCategory.feeCategory;
},
onshown: (modalElement, closeModalFunction) => {
@ -341,14 +325,10 @@ declare const bulmaJS: BulmaJS;
editCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doUpdateFeeCategory);
modalElement.querySelector("form").addEventListener("submit", doUpdateFeeCategory);
(
modalElement.querySelector(
"#feeCategoryEdit--feeCategory"
) as HTMLInputElement
modalElement.querySelector("#feeCategoryEdit--feeCategory") as HTMLInputElement
).focus();
},
onremoved: () => {
@ -403,7 +383,7 @@ declare const bulmaJS: BulmaJS;
});
};
const moveFeeCategoryUp = (clickEvent: Event) => {
const moveFeeCategoryUp = (clickEvent: MouseEvent) => {
const feeCategoryId = Number.parseInt(
(
(clickEvent.currentTarget as HTMLElement).closest(
@ -416,7 +396,8 @@ declare const bulmaJS: BulmaJS;
cityssm.postJSON(
urlPrefix + "/admin/doMoveFeeCategoryUp",
{
feeCategoryId
feeCategoryId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -437,7 +418,7 @@ declare const bulmaJS: BulmaJS;
);
};
const moveFeeCategoryDown = (clickEvent: Event) => {
const moveFeeCategoryDown = (clickEvent: MouseEvent) => {
const feeCategoryId = Number.parseInt(
(
(clickEvent.currentTarget as HTMLElement).closest(
@ -450,7 +431,8 @@ declare const bulmaJS: BulmaJS;
cityssm.postJSON(
urlPrefix + "/admin/doMoveFeeCategoryDown",
{
feeCategoryId
feeCategoryId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -537,8 +519,7 @@ declare const bulmaJS: BulmaJS;
for (const occupancyType of exports.occupancyTypes as recordTypes.OccupancyType[]) {
const optionElement = document.createElement("option");
optionElement.value =
occupancyType.occupancyTypeId.toString();
optionElement.value = occupancyType.occupancyTypeId.toString();
optionElement.textContent = occupancyType.occupancyType;
occupancyTypeElement.append(optionElement);
}
@ -554,11 +535,9 @@ declare const bulmaJS: BulmaJS;
lotTypeElement.append(optionElement);
}
(
modalElement.querySelector(
"#feeAdd--taxPercentage"
) as HTMLInputElement
).value = (exports.taxPercentageDefault as number).toString();
(modalElement.querySelector("#feeAdd--taxPercentage") as HTMLInputElement).value = (
exports.taxPercentageDefault as number
).toString();
los.populateAliases(modalElement);
},
@ -567,15 +546,9 @@ declare const bulmaJS: BulmaJS;
addCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doAddFee);
modalElement.querySelector("form").addEventListener("submit", doAddFee);
(
modalElement.querySelector(
"#feeAdd--feeName"
) as HTMLInputElement
).focus();
(modalElement.querySelector("#feeAdd--feeName") as HTMLInputElement).focus();
modalElement
.querySelector("#feeAdd--feeFunction")
@ -588,16 +561,12 @@ declare const bulmaJS: BulmaJS;
) as HTMLSelectElement;
if (feeFunctionElement.value === "") {
feeFunctionElement
.closest(".select")
.classList.remove("is-success");
feeFunctionElement.closest(".select").classList.remove("is-success");
feeAmountElement.classList.add("is-success");
feeAmountElement.disabled = false;
} else {
feeFunctionElement
.closest(".select")
.classList.add("is-success");
feeFunctionElement.closest(".select").classList.add("is-success");
feeAmountElement.classList.remove("is-success");
feeAmountElement.disabled = true;
@ -631,9 +600,7 @@ declare const bulmaJS: BulmaJS;
.querySelector("#feeAdd--includeQuantity")
.addEventListener("change", () => {
(
modalElement.querySelector(
"#feeAdd--quantityUnit"
) as HTMLInputElement
modalElement.querySelector("#feeAdd--quantityUnit") as HTMLInputElement
).disabled =
(
modalElement.querySelector(
@ -651,17 +618,14 @@ declare const bulmaJS: BulmaJS;
const openEditFee = (clickEvent: Event) => {
clickEvent.preventDefault();
const feeContainerElement = (
clickEvent.currentTarget as HTMLElement
).closest(".container--fee") as HTMLElement;
const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest(
".container--fee"
) as HTMLElement;
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
const feeCategoryId = Number.parseInt(
(
feeContainerElement.closest(
".container--feeCategory"
) as HTMLElement
).dataset.feeCategoryId
(feeContainerElement.closest(".container--feeCategory") as HTMLElement).dataset
.feeCategoryId
);
const feeCategory = feeCategories.find((currentFeeCategory) => {
@ -750,16 +714,12 @@ declare const bulmaJS: BulmaJS;
) as HTMLSelectElement;
if (feeFunctionElement.value === "") {
feeFunctionElement
.closest(".select")
.classList.remove("is-success");
feeFunctionElement.closest(".select").classList.remove("is-success");
feeAmountElement.classList.add("is-success");
feeAmountElement.disabled = false;
} else {
feeFunctionElement
.closest(".select")
.classList.add("is-success");
feeFunctionElement.closest(".select").classList.add("is-success");
feeAmountElement.classList.remove("is-success");
feeAmountElement.disabled = true;
@ -789,26 +749,18 @@ declare const bulmaJS: BulmaJS;
const toggleQuantityFields = () => {
(
editModalElement.querySelector(
"#feeEdit--quantityUnit"
) as HTMLInputElement
editModalElement.querySelector("#feeEdit--quantityUnit") as HTMLInputElement
).disabled =
(
editModalElement.querySelector(
"#feeEdit--includeQuantity"
) as HTMLSelectElement
).value === "";
(editModalElement.querySelector("#feeEdit--includeQuantity") as HTMLSelectElement)
.value === "";
};
cityssm.openHtmlModal("adminFees-editFee", {
onshow: (modalElement) => {
editModalElement = modalElement;
(
modalElement.querySelector(
"#feeEdit--feeId"
) as HTMLInputElement
).value = fee.feeId.toString();
(modalElement.querySelector("#feeEdit--feeId") as HTMLInputElement).value =
fee.feeId.toString();
const feeCategoryElement = modalElement.querySelector(
"#feeEdit--feeCategoryId"
@ -826,15 +778,10 @@ declare const bulmaJS: BulmaJS;
feeCategoryElement.append(optionElement);
}
(modalElement.querySelector("#feeEdit--feeName") as HTMLInputElement).value =
fee.feeName;
(
modalElement.querySelector(
"#feeEdit--feeName"
) as HTMLInputElement
).value = fee.feeName;
(
modalElement.querySelector(
"#feeEdit--feeDescription"
) as HTMLTextAreaElement
modalElement.querySelector("#feeEdit--feeDescription") as HTMLTextAreaElement
).value = fee.feeDescription;
const occupancyTypeElement = modalElement.querySelector(
@ -843,8 +790,7 @@ declare const bulmaJS: BulmaJS;
for (const occupancyType of exports.occupancyTypes as recordTypes.OccupancyType[]) {
const optionElement = document.createElement("option");
optionElement.value =
occupancyType.occupancyTypeId.toString();
optionElement.value = occupancyType.occupancyTypeId.toString();
optionElement.textContent = occupancyType.occupancyType;
if (occupancyType.occupancyTypeId === fee.occupancyTypeId) {
@ -870,29 +816,21 @@ declare const bulmaJS: BulmaJS;
lotTypeElement.append(optionElement);
}
(
modalElement.querySelector(
"#feeEdit--feeAmount"
) as HTMLInputElement
).value = fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
(modalElement.querySelector("#feeEdit--feeAmount") as HTMLInputElement).value =
fee.feeAmount ? fee.feeAmount.toFixed(2) : "";
modalElement
.querySelector("#feeEdit--feeFunction")
.addEventListener("change", toggleFeeFields);
toggleFeeFields();
(
modalElement.querySelector(
"#feeEdit--taxAmount"
) as HTMLInputElement
).value = fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
(modalElement.querySelector("#feeEdit--taxAmount") as HTMLInputElement).value =
fee.taxAmount ? fee.taxAmount.toFixed(2) : "";
const taxPercentageElement = modalElement.querySelector(
"#feeEdit--taxPercentage"
) as HTMLInputElement;
taxPercentageElement.value = fee.taxPercentage
? fee.taxPercentage.toString()
: "";
taxPercentageElement.value = fee.taxPercentage ? fee.taxPercentage.toString() : "";
taxPercentageElement.addEventListener("keyup", toggleTaxFields);
toggleTaxFields();
@ -905,24 +843,16 @@ declare const bulmaJS: BulmaJS;
includeQuantityElement.value = "1";
}
includeQuantityElement.addEventListener(
"change",
toggleQuantityFields
);
includeQuantityElement.addEventListener("change", toggleQuantityFields);
(
modalElement.querySelector(
"#feeEdit--quantityUnit"
) as HTMLInputElement
).value = fee.quantityUnit || "";
(modalElement.querySelector("#feeEdit--quantityUnit") as HTMLInputElement).value =
fee.quantityUnit || "";
toggleQuantityFields();
if (fee.isRequired) {
(
modalElement.querySelector(
"#feeEdit--isRequired"
) as HTMLSelectElement
modalElement.querySelector("#feeEdit--isRequired") as HTMLSelectElement
).value = "1";
}
@ -933,9 +863,7 @@ declare const bulmaJS: BulmaJS;
editCloseModalFunction = closeModalFunction;
modalElement
.querySelector("form")
.addEventListener("submit", doUpdateFee);
modalElement.querySelector("form").addEventListener("submit", doUpdateFee);
bulmaJS.init(modalElement);
@ -949,17 +877,18 @@ declare const bulmaJS: BulmaJS;
});
};
const moveFeeUp = (clickEvent: Event) => {
const feeContainerElement = (
clickEvent.currentTarget as HTMLElement
).closest(".container--fee") as HTMLElement;
const moveFeeUp = (clickEvent: MouseEvent) => {
const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest(
".container--fee"
) as HTMLElement;
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
cityssm.postJSON(
urlPrefix + "/admin/doMoveFeeUp",
{
feeId
feeId,
moveToTop: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;
@ -980,17 +909,18 @@ declare const bulmaJS: BulmaJS;
);
};
const moveFeeDown = (clickEvent: Event) => {
const feeContainerElement = (
clickEvent.currentTarget as HTMLElement
).closest(".container--fee") as HTMLElement;
const moveFeeDown = (clickEvent: MouseEvent) => {
const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest(
".container--fee"
) as HTMLElement;
const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10);
cityssm.postJSON(
urlPrefix + "/admin/doMoveFeeDown",
{
feeId
feeId,
moveToBottom: clickEvent.shiftKey ? "1" : "0"
},
(responseJSON: {
success: boolean;

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

File diff suppressed because one or more lines are too long

6
views/admin-fees.ejs
View File

@ -23,16 +23,16 @@
</ul>
</nav>
<div class="level is-mobile">
<div class="level">
<div class="level-left">
<div class="level-item">
<div class="level-item is-justify-content-start">
<h1 class="title is-1">
Fee Management
</h1>
</div>
</div>
<div class="level-right">
<div class="level-item">
<div class="level-item is-justify-content-end">
<button class="button is-success" id="button--addFeeCategory" type="button" accesskey="n">
<span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
<span>Add Fee Category</span>