z1glr/golunteer
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

changed names of database columns

Browse Source
This commit is contained in:
z1glr
2025-01-23 10:12:12 +00:00
parent 7265a4e36a
commit c752bc6c14
36 changed files with 604 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/app/admin/(availabilities)/Availabilities.tsx
View File

@@ -40,7 +40,7 @@ export default function Availabilities() {
switch (sortDescriptor.column) {
case "text":
cmp = a.name.localeCompare(b.name);
cmp = a.availabilityName.localeCompare(b.availabilityName);
break;
case "enabled":
if (a.enabled && !b.enabled) {
@@ -78,9 +78,11 @@ export default function Availabilities() {
availabilities.reload();
}
async function sendDeleteAvailability(id: number | undefined) {
if (id !== undefined) {
const result = await apiCall("DELETE", "availabilities", { id });
async function sendDeleteAvailability(availabilityID: number | undefined) {
if (availabilityID !== undefined) {
const result = await apiCall("DELETE", "availabilities", {
availabilityID,
});
if (result.ok) {
reload();
@@ -133,7 +135,7 @@ export default function Availabilities() {
</TableHeader>
<TableBody items={availabilities.items}>
{(availability) => (
<TableRow key={availability.name}>
<TableRow key={availability.availabilityName}>
<TableCell>
<AvailabilityChip availability={availability} />
</TableCell>
@@ -190,7 +192,9 @@ export default function Availabilities() {
!isOpen ? setDeleteAvailability(undefined) : null
}
itemName="Availability"
onDelete={() => sendDeleteAvailability(deleteAvailability?.id)}
onDelete={() =>
sendDeleteAvailability(deleteAvailability?.availabilityID)
}
>
{!!deleteAvailability ? (
<>

19
client/src/app/admin/(availabilities)/AvailabilityEditor.tsx
View File

@@ -1,4 +1,5 @@
import ColorSelector from "@/components/Colorselector";
import { AllString } from "@/lib";
import {
Checkbox,
Form,
@@ -12,9 +13,9 @@ import {
import React, { FormEvent, useEffect, useState } from "react";
export interface Availability {
name: string;
availabilityName: string;
color: string;
id: number | undefined;
availabilityID: number | undefined;
enabled: boolean;
}
@@ -26,7 +27,7 @@ export default function AvailabilityEditor(props: {
onOpenChange?: (isOpen: boolean) => void;
onSubmit?: (e: Availability) => void;
}) {
const [name, setName] = useState(props.value?.name ?? "");
const [name, setName] = useState(props.value?.availabilityName ?? "");
const [color, setColor] = useState(props.value?.color ?? "Red");
const [enabled, setEnabled] = useState(props.value?.enabled ?? true);
@@ -40,15 +41,13 @@ export default function AvailabilityEditor(props: {
}, [props.isOpen]);
function submit(e: FormEvent<HTMLFormElement>) {
const formData = Object.fromEntries(new FormData(e.currentTarget)) as {
name: string;
color: string;
enabled: string;
};
const formData = Object.fromEntries(
new FormData(e.currentTarget),
) as AllString<Exclude<Availability, "availabilityID">>;
props.onSubmit?.({
...formData,
id: props.value?.id,
availabilityID: props.value?.availabilityID,
enabled: formData.enabled == "true",
});
}
@@ -77,7 +76,7 @@ export default function AvailabilityEditor(props: {
<Input
value={name}
onValueChange={setName}
name="name"
name="availabilityName"
label="Name"
isRequired
variant="bordered"

2
client/src/app/admin/(availabilities)/EditAvailability.tsx
View File

@@ -21,7 +21,7 @@ export default function EditAvailability(props: {
return (
<AvailabilityEditor
key={props.value?.id}
key={props.value?.availabilityID}
header={
<>
Edit Availability{" "}

4
client/src/app/admin/(tasks)/EditTask.tsx
View File

@@ -20,12 +20,12 @@ export default function EditTask(props: {
return (
<TaskEditor
key={props.value?.name}
key={props.value?.taskName}
header={
<>
Edit Task{" "}
<span className="font-numbers font-normal italic">
&quot;{props.value?.name}&quot;
&quot;{props.value?.taskName}&quot;
</span>
</>
}

15
client/src/app/admin/(tasks)/TaskEditor.tsx
View File

@@ -1,4 +1,4 @@
import { Task } from "@/lib";
import { AllString, Task } from "@/lib";
import {
Checkbox,
Form,
@@ -19,7 +19,7 @@ export default function TaskEditor(props: {
onOpenChange?: (isOpen: boolean) => void;
onSubmit?: (e: Task) => void;
}) {
const [name, setName] = useState(props.value?.name ?? "");
const [name, setName] = useState(props.value?.taskName ?? "");
const [enabled, setEnabled] = useState(props.value?.enabled ?? true);
// clear the inputs on closing
@@ -31,14 +31,13 @@ export default function TaskEditor(props: {
}, [props.isOpen]);
function submit(e: FormEvent<HTMLFormElement>) {
const formData = Object.fromEntries(new FormData(e.currentTarget)) as {
name: string;
enabled: string;
};
const formData = Object.fromEntries(
new FormData(e.currentTarget),
) as AllString<Exclude<Task, "taskID">>;
props.onSubmit?.({
...formData,
id: props.value?.id,
taskID: props.value?.taskID,
enabled: formData.enabled == "true",
});
}
@@ -68,7 +67,7 @@ export default function TaskEditor(props: {
<Input
value={name}
onValueChange={setName}
name="name"
name="taskName"
label="Name"
isRequired
variant="bordered"

16
client/src/app/admin/(tasks)/Tasks.tsx
View File

@@ -47,7 +47,7 @@ export default function Tasks() {
switch (sortDescriptor.column) {
case "text":
cmp = a.name.localeCompare(b.name);
cmp = a.taskName.localeCompare(b.taskName);
break;
case "enabled":
if (a.enabled && !b.enabled) {
@@ -76,9 +76,9 @@ export default function Tasks() {
tasks.reload();
}
async function sendDeleteTask(id: number | undefined) {
if (id !== undefined) {
const result = await apiCall("DELETE", "tasks", { id });
async function sendDeleteTask(taskID: number | undefined) {
if (taskID !== undefined) {
const result = await apiCall("DELETE", "tasks", { taskID });
if (result.ok) {
tasks.reload();
@@ -130,8 +130,8 @@ export default function Tasks() {
</TableHeader>
<TableBody items={tasks.items}>
{(task) => (
<TableRow key={task.id}>
<TableCell>{task.name}</TableCell>
<TableRow key={task.taskID}>
<TableCell>{task.taskName}</TableCell>
<TableCell>
<Checkbox isSelected={task.enabled} />
</TableCell>
@@ -181,13 +181,13 @@ export default function Tasks() {
isOpen={!!deleteTask}
onOpenChange={(isOpen) => (!isOpen ? setDeleteTask(undefined) : null)}
itemName="Task"
onDelete={() => sendDeleteTask(deleteTask?.id)}
onDelete={() => sendDeleteTask(deleteTask?.taskID)}
>
{!!deleteTask ? (
<>
The task{" "}
<span className="font-numbers text-accent-1">
{deleteTask.name}
{deleteTask.taskName}
</span>{" "}
will be deleted.
</>

14
client/src/app/admin/(users)/UserEditor.tsx
View File

@@ -1,4 +1,8 @@
import { classNames, validatePassword as validatePassword } from "@/lib";
import {
AllString,
classNames,
validatePassword as validatePassword,
} from "@/lib";
import zustand, { User, UserAddModify } from "@/Zustand";
import {
Checkbox,
@@ -29,11 +33,9 @@ export default function UserEditor(props: {
// update the user in the backend
async function submit(e: FormEvent<HTMLFormElement>) {
const formData = Object.fromEntries(new FormData(e.currentTarget)) as {
userName: string;
password: string;
admin: string;
};
const formData = Object.fromEntries(
new FormData(e.currentTarget),
) as AllString<UserAddModify>;
const data = {
...formData,