diff --git a/LogisticsSupportTool_API_DOCS/environments/lst.bru b/LogisticsSupportTool_API_DOCS/environments/lst.bru index e1d91e8..dd35e96 100644 --- a/LogisticsSupportTool_API_DOCS/environments/lst.bru +++ b/LogisticsSupportTool_API_DOCS/environments/lst.bru @@ -1,7 +1,7 @@ vars { url: http://localhost:4200 session_cookie: - urlv2: http://localhost:3000 + urlv2: http://usmcd1vms036:3000 jwtV2: userID: } diff --git a/frontend/src/lib/authClient.ts b/frontend/src/lib/authClient.ts index 697a0a3..4570f33 100644 --- a/frontend/src/lib/authClient.ts +++ b/frontend/src/lib/authClient.ts @@ -26,7 +26,8 @@ export type UserRoles = { | "supervisor" | "manager" | "admin" - | "systemAdmin"; + | "systemAdmin" + | "user"; }; type UserRoleState = { diff --git a/frontend/src/lib/tableStuff/TableNoExpand.tsx b/frontend/src/lib/tableStuff/TableNoExpand.tsx index 94f4131..923da0c 100644 --- a/frontend/src/lib/tableStuff/TableNoExpand.tsx +++ b/frontend/src/lib/tableStuff/TableNoExpand.tsx @@ -42,8 +42,8 @@ export default function TableNoExpand({ }); return (
- - +
+ {table.getHeaderGroups().map((headerGroup) => ( @@ -89,27 +89,28 @@ export default function TableNoExpand({ ))} -
-
- - -
- -
+ + + + +
+ + +
); } diff --git a/frontend/src/routes/_old/old/quality/-components/QualityRequest.tsx b/frontend/src/routes/_old/old/quality/-components/QualityRequest.tsx index e506cde..ac917ea 100644 --- a/frontend/src/routes/_old/old/quality/-components/QualityRequest.tsx +++ b/frontend/src/routes/_old/old/quality/-components/QualityRequest.tsx @@ -2,14 +2,16 @@ import { useQuery } from "@tanstack/react-query"; import { useNavigate, useRouterState } from "@tanstack/react-router"; import { createColumnHelper } from "@tanstack/react-table"; import axios from "axios"; -import { ArrowDown, ArrowUp } from "lucide-react"; +import { ArrowDown, ArrowUp, Trash2 } from "lucide-react"; import { useState } from "react"; import { toast } from "sonner"; import { Button } from "@/components/ui/button"; import { Select, SelectContent, + SelectGroup, SelectItem, + SelectLabel, SelectTrigger, SelectValue, } from "@/components/ui/select"; @@ -30,7 +32,6 @@ type Pallets = { durationToMove: null; qualityDurationToInspect: number; returnDurationToInspect: number; - locationMovesTo: string; locationDropOff: string; palletStatus: number; palletStatusText: string; @@ -40,6 +41,8 @@ type Pallets = { add_user: string; upd_date: Date; upd_user: string; + palletComplete: string; + canceled: string; }; export default function QualityRequest() { @@ -50,35 +53,35 @@ export default function QualityRequest() { const router = useRouterState(); const currentPath = router.location.href; - const palletCompleted = async (e: any) => { - if (!session || !session.user) { - toast.error("You are allowed to do this unless you are logged in"); - navigate({ to: "/login", search: { redirect: currentPath } }); - return; - } - const data = { - username: session?.user.username, - runningNr: Number(e.original.runningNr), - palletStatusText: "return", - }; - try { - const res = await axios.post("/lst/old/api/quality/newrequest", data); + // const palletCompleted = async (e: any) => { + // if (!session || !session.user) { + // toast.error("You are allowed to do this unless you are logged in"); + // navigate({ to: "/login", search: { redirect: currentPath } }); + // return; + // } + // const data = { + // username: session?.user.username, + // runningNr: Number(e.original.runningNr), + // palletStatusText: "return", + // }; + // try { + // const res = await axios.post("/lst/old/api/quality/newrequest", data); - //console.log(res.data); + // //console.log(res.data); - if (res.data.success) { - toast.success(res.data.message); - refetch(); - } + // if (res.data.success) { + // toast.success(res.data.message); + // refetch(); + // } - if (!res.data.success) { - toast.error(res.data.message); - } - } catch (error) { - console.log(error); - toast.error("Encountered and error please try again"); - } - }; + // if (!res.data.success) { + // toast.error(res.data.message); + // } + // } catch (error) { + // console.log(error); + // toast.error("Encountered and error please try again"); + // } + // }; const columns = [ columnHelper.accessor("article", { @@ -166,14 +169,14 @@ export default function QualityRequest() { ); }, }), - columnHelper.accessor("locationMovesTo", { + columnHelper.accessor("locationMovedTo", { header: ({ column }) => { return ( + ) : ( - Pending to be completed + Pending move )} ); @@ -262,7 +328,9 @@ export default function QualityRequest() { ]; let adminColumns: any = []; - if (userAccess("quality", ["systemAdmin", "admin", "supervisor"])) { + if ( + userAccess("quality", ["systemAdmin", "admin", "supervisor", "manager"]) + ) { adminColumns = [ ...columns, columnHelper.accessor("priority", { @@ -287,7 +355,6 @@ export default function QualityRequest() { // if pending const [p, setP] = useState(`${getValue()}`); - console.log(getValue()); return ( <>