Matthias-Claudius-Schule/borrow-system
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactor: rename lockerNumber to safe_nr and update related logic

Browse Source
This commit is contained in:
Theis Gaedigk
2025-11-23 21:52:12 +01:00
parent 85e6d7fe00
commit cb6b5858e5
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/src/components/AddItemForm.tsx
View File

@@ -30,7 +30,7 @@ const AddItemForm: React.FC<AddItemFormProps> = ({ onClose, alert }) => {
</Field.Root> </Field.Root>
<Field.Root> <Field.Root>
<Field.Label>Schließfachnummer (immer zwei Zahlen)</Field.Label> <Field.Label>Schließfachnummer (immer zwei Zahlen)</Field.Label>
<Input id="lockerNumber" placeholder="Nummer 01 - 06" /> <Input id="safe_nr" placeholder="Nummer 01 - 06" />
</Field.Root> </Field.Root>
<Field.Root> <Field.Root>
<Field.Label>Ausleih-Berechtigung (Rolle)</Field.Label> <Field.Label>Ausleih-Berechtigung (Rolle)</Field.Label>
@@ -57,17 +57,16 @@ const AddItemForm: React.FC<AddItemFormProps> = ({ onClose, alert }) => {
(document.getElementById("can_borrow_role") as HTMLInputElement) (document.getElementById("can_borrow_role") as HTMLInputElement)
?.value ?.value
); );
const lockerValue = ( const safeNrValue = (
document.getElementById("lockerNumber") as HTMLInputElement document.getElementById("safe_nr") as HTMLInputElement
)?.value.trim(); )?.value.trim();
const lockerNumber = const safeNr = safeNrValue === "" ? null : safeNrValue;
lockerValue === "" ? null : Number(lockerValue);
if (!name || Number.isNaN(role)) return; if (!name || Number.isNaN(role)) return;
if (lockerNumber !== null && Number.isNaN(lockerNumber)) return; if (safeNr !== null && !/^\d{2}$/.test(safeNr)) return;
const res = await createItem(name, role, lockerNumber); const res = await createItem(name, role, safeNr);
if (res.success) { if (res.success) {
alert( alert(
"success", "success",

2
admin/src/utils/userActions.ts
View File

@@ -165,7 +165,7 @@ export const deleteItem = async (itemId: number) => {
export const createItem = async ( export const createItem = async (
item_name: string, item_name: string,
can_borrow_role: number, can_borrow_role: number,
lockerNumber: number | null lockerNumber: string | null
) => { ) => {
console.log(JSON.stringify({ item_name, can_borrow_role, lockerNumber })); console.log(JSON.stringify({ item_name, can_borrow_role, lockerNumber }));
try { try {

4
backendV2/schemeV2.sql
View File

@@ -47,10 +47,6 @@ CREATE TABLE items (
UNIQUE KEY ux_items_safe_nr (safe_nr) UNIQUE KEY ux_items_safe_nr (safe_nr)
) ENGINE=InnoDB; ) ENGINE=InnoDB;
CREATE UNIQUE INDEX ux_items_safe_nr_not_null
ON items (safe_nr)
WHERE safe_nr IS NOT NULL;
CREATE TABLE apiKeys ( CREATE TABLE apiKeys (
id INT NOT NULL AUTO_INCREMENT, id INT NOT NULL AUTO_INCREMENT,
api_key CHAR(8) NOT NULL UNIQUE, api_key CHAR(8) NOT NULL UNIQUE,