adjusted events view to only show the availability selector, when a user can do at least one task of the event
This commit is contained in:
@@ -177,6 +177,14 @@ func (userName UserName) ChangePassword(password string) (string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (userName UserName) GetTasks() ([]tasks.TaskID, error) {
|
||||||
|
var tasks []tasks.TaskID
|
||||||
|
|
||||||
|
err := db.DB.Select(&tasks, "SELECT taskID FROM USER_TASKS WHERE userName = $1", userName)
|
||||||
|
|
||||||
|
return tasks, err
|
||||||
|
}
|
||||||
|
|
||||||
func (userName UserName) SetTasks(tasks []tasks.TaskID) error {
|
func (userName UserName) SetTasks(tasks []tasks.TaskID) error {
|
||||||
// remove all current possible tasks
|
// remove all current possible tasks
|
||||||
if _, err := db.DB.Exec("DELETE FROM USER_TASKS WHERE userName = $1", userName); err != nil {
|
if _, err := db.DB.Exec("DELETE FROM USER_TASKS WHERE userName = $1", userName); err != nil {
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ func init() {
|
|||||||
"events/user/assigned": (*Handler).getEventsUserAssigned,
|
"events/user/assigned": (*Handler).getEventsUserAssigned,
|
||||||
"tasks": (*Handler).getTasks, // all available tasks
|
"tasks": (*Handler).getTasks, // all available tasks
|
||||||
"users": (*Handler).getUsers, // all users
|
"users": (*Handler).getUsers, // all users
|
||||||
|
"user/tasks": (*Handler).getUserTasks, // get all possible tasks for the user
|
||||||
"availabilities": (*Handler).getAvailabilities, // all available availabilities
|
"availabilities": (*Handler).getAvailabilities, // all available availabilities
|
||||||
},
|
},
|
||||||
"POST": {
|
"POST": {
|
||||||
|
|||||||
@@ -20,6 +20,16 @@ func (a *Handler) getUsers() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *Handler) getUserTasks() {
|
||||||
|
if tasks, err := a.UserName.GetTasks(); err != nil {
|
||||||
|
a.Status = fiber.StatusInternalServerError
|
||||||
|
|
||||||
|
logger.Error().Msgf("getting possible user-tasks failed: %v", err)
|
||||||
|
} else {
|
||||||
|
a.Data = tasks
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (a *Handler) postUser() {
|
func (a *Handler) postUser() {
|
||||||
|
|
||||||
// check admin
|
// check admin
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { create } from "zustand";
|
import { create } from "zustand";
|
||||||
import { Task } from "./lib";
|
import { Task, TaskID } from "./lib";
|
||||||
import { Availability } from "./app/admin/(availabilities)/AvailabilityEditor";
|
import { Availability } from "./app/admin/(availabilities)/AvailabilityEditor";
|
||||||
|
|
||||||
export interface BaseEvent {
|
export interface BaseEvent {
|
||||||
@@ -41,6 +41,7 @@ export type UserAddModify = User & {
|
|||||||
|
|
||||||
interface Zustand {
|
interface Zustand {
|
||||||
user: StateUser | null;
|
user: StateUser | null;
|
||||||
|
userTasks?: TaskID[];
|
||||||
tasks?: Task[];
|
tasks?: Task[];
|
||||||
availabilities?: Availability[];
|
availabilities?: Availability[];
|
||||||
users?: User[];
|
users?: User[];
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import AddEvent from "@/components/Event/AddEvent";
|
import AddEvent from "@/components/Event/AddEvent";
|
||||||
import AssignmentTable from "@/components/Event/AssignmentTable";
|
import AssignmentTable from "@/components/Event/AssignmentTable";
|
||||||
import Event from "@/components/Event/Event";
|
import Event from "@/components/Event/Event";
|
||||||
import { apiCall } from "@/lib";
|
import { apiCall, getUserTasks } from "@/lib";
|
||||||
import zustand, { EventDataWithAvailability } from "@/Zustand";
|
import zustand, { EventDataWithAvailability } from "@/Zustand";
|
||||||
import { Add } from "@carbon/icons-react";
|
import { Add } from "@carbon/icons-react";
|
||||||
import { Button, Tab, Tabs } from "@heroui/react";
|
import { Button, Tab, Tabs } from "@heroui/react";
|
||||||
@@ -37,6 +37,14 @@ export default function Events() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const userTasks = useAsyncList({
|
||||||
|
async load() {
|
||||||
|
return {
|
||||||
|
items: await getUserTasks(),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
function showEvent(event: EventDataWithAvailability): boolean {
|
function showEvent(event: EventDataWithAvailability): boolean {
|
||||||
switch (filter) {
|
switch (filter) {
|
||||||
case "assigned":
|
case "assigned":
|
||||||
@@ -45,13 +53,17 @@ export default function Events() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
case "pending":
|
case "pending":
|
||||||
return event.availability === null;
|
return event.availability === null && showAvailabilitySelector(event);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showAvailabilitySelector(event: EventDataWithAvailability): boolean {
|
||||||
|
return event.tasks.some((t) => userTasks.items.includes(t.taskID));
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="relative flex flex-1 flex-col gap-4">
|
<div className="relative flex flex-1 flex-col gap-4">
|
||||||
<h2 className="text-center text-4xl">Upcoming Events</h2>
|
<h2 className="text-center text-4xl">Upcoming Events</h2>
|
||||||
@@ -75,7 +87,9 @@ export default function Events() {
|
|||||||
tasks={e.tasks}
|
tasks={e.tasks}
|
||||||
className="mt-auto"
|
className="mt-auto"
|
||||||
/>
|
/>
|
||||||
<AvailabilitySelector event={e} startSelection={e.availability} />
|
{showAvailabilitySelector(e) ? (
|
||||||
|
<AvailabilitySelector event={e} startSelection={e.availability} />
|
||||||
|
) : undefined}
|
||||||
</Event>
|
</Event>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import Header from "./Header";
|
|||||||
import Main from "./Main";
|
import Main from "./Main";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
title: "Create Next App",
|
title: "Golunteer",
|
||||||
description: "Generated by create next app",
|
description: "Volunteeer coordination",
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface SiteLink {
|
export interface SiteLink {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export default function Event({
|
|||||||
|
|
||||||
{Array.isArray(children) ? children[0] : children}
|
{Array.isArray(children) ? children[0] : children}
|
||||||
</CardBody>
|
</CardBody>
|
||||||
{Array.isArray(children) ? (
|
{Array.isArray(children) && !!children[1] ? (
|
||||||
<>
|
<>
|
||||||
<Divider />
|
<Divider />
|
||||||
<CardFooter>{children[1]}</CardFooter>
|
<CardFooter>{children[1]}</CardFooter>
|
||||||
|
|||||||
@@ -144,8 +144,10 @@ export function validatePassword(password: string): string[] {
|
|||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type TaskID = number;
|
||||||
|
|
||||||
export interface Task {
|
export interface Task {
|
||||||
taskID: number | undefined;
|
taskID: TaskID | undefined;
|
||||||
taskName: string;
|
taskName: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}
|
}
|
||||||
@@ -219,3 +221,24 @@ export async function getUsers(): Promise<User[]> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getUserTasks(): Promise<TaskID[]> {
|
||||||
|
// check wether it is cached in zustand
|
||||||
|
const state = zustand.getState();
|
||||||
|
|
||||||
|
if (!!state.userTasks) {
|
||||||
|
return state.userTasks;
|
||||||
|
} else {
|
||||||
|
const result = await apiCall<TaskID[]>("GET", "user/tasks");
|
||||||
|
|
||||||
|
if (result.ok) {
|
||||||
|
const userTasks = await result.json();
|
||||||
|
|
||||||
|
state.patch({ userTasks });
|
||||||
|
|
||||||
|
return userTasks;
|
||||||
|
} else {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user