Skip to content

Updating branch #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 27, 2024
Merged

Updating branch #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7080ff
land fill managers api and trip apis completed
shawon-majid Mar 27, 2024
e27ce0d
Merge pull request #37 from definecoder/data-entry-interface
codermehraj Mar 27, 2024
837a9c5
getting vehicle from db
nafi-ullah Mar 27, 2024
db28225
Merge pull request #38 from definecoder/sts-systems
nafi-ullah Mar 27, 2024
0ae95ad
Merge pull request #39 from definecoder/main
nafi-ullah Mar 27, 2024
f84c86f
Merge pull request #40 from definecoder/landfill-manager-integration
codermehraj Mar 27, 2024
bb4100f
included land fill information with vehicle ion get current sts entry…
shawon-majid Mar 27, 2024
c2f624a
Merge pull request #41 from definecoder/data-entry-interface
shawon-majid Mar 27, 2024
a5c6344
vehicle name updated
nafi-ullah Mar 27, 2024
8d50411
new schedules
nafi-ullah Mar 27, 2024
dc8eace
STS Entered vehicle showed and delete functionality added
codermehraj Mar 27, 2024
036fb9e
Merge pull request #42 from definecoder/sts-systems
codermehraj Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/components/dashboard-componenets/mainContent/stsManagerContents/Schedules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import EmptyFillContainer from "../../cards/EmptyFillContainer";
import { ChakraProvider, theme } from "@chakra-ui/react";
import OptimizedRouteMap from "@/components/maps/OptimizedRoute";
import RouteMap from "@/components/maps/RouteMap";
import STSVehicleList from "@/components/dataTables/StsVehicleList";

export default function STSManagerSchedules() {
return (
Expand All @@ -11,6 +12,7 @@ export default function STSManagerSchedules() {
<div className="col-span-1 row-span-2 min-h-48">
<EmptyFillContainer>
UPCOMING - CRITICAL FIRST SCHEDULES
<STSVehicleList />
</EmptyFillContainer>
</div>
{/* <div className="col-span-1 row-span-1 min-h-48">
Expand Down
323 changes: 323 additions & 0 deletions client/components/dataTables/StsVehicleList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,323 @@
"use client";

import * as React from "react";
import {
CaretSortIcon,
ChevronDownIcon,
DotsHorizontalIcon,
} from "@radix-ui/react-icons";

import { Button } from "@/components/ui/button";

import {
ColumnDef,
ColumnFiltersState,
SortingState,
VisibilityState,
flexRender,
getCoreRowModel,
getFilteredRowModel,
getPaginationRowModel,
getSortedRowModel,
useReactTable,
} from "@tanstack/react-table";

import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Input } from "@/components/ui/input";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import useGetAllUser from "@/hooks/user_data/useGetAllUser";
import { DeleteUserModal } from "../modals/DeleteUserModal";
import { Copy, EditIcon } from "lucide-react";
import { EditUserModal } from "../modals/EditUserInfoModal";
import gettAllRoles from "@/hooks/user_data/useGetAllRole";
import { roleList } from "@/data/roles";
import useGetAllSTS from "@/hooks/dataQuery/useGetAllSTS";
import { EditSTSInfoModal } from "../modals/EditSTSInfoModal";
import { DeleteSTSModal } from "../modals/DeleteSTSModal";
import useVehicleList from "@/hooks/vehicles/useVehiclesData";
import useVehicleListForSTS from "@/hooks/vehicles/useGetVeicleForSTS";
import { DeleteVehicleModalForSTS } from "../modals/DeleteVehicleModalForSTS";

type Vehicle = {
entryId: string,
id: string,
vehicleNumber: string,
vehicleType: string,
capacity: string,
loadedFuelCostPerKm: string,
unloadedFuelCostPerKm: string,
landFillId: string,
entryTime: string,
landFillName: string,
stsLattitude: string,
stsLongitude: string,
landfillLattitude: string,
landfillLongitude: string,
};

export const columns: ColumnDef<Vehicle>[] = [
{
accessorKey: "vehicleNumber",
header: ({ column }) => {
return (
<div className="flex justify-center items-center">
<Button
variant="ghost"
className="text-center"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Name
<CaretSortIcon className="ml-2 h-4 w-4" />
</Button>
</div>
);
},
cell: ({ row }) => (
<div className="text-center font-medium">{row.getValue("vehicleNumber")}</div>
),
},
{
accessorKey: "vehicleType",
header: ({ column }) => {
return (
<div className="flex justify-center items-center">
<Button
variant="ghost"
className="text-center"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Vehicle Type
<CaretSortIcon className="ml-2 h-4 w-4" />
</Button>
</div>
);
},
cell: ({ row }) => (
<div className="text-center font-medium">
{row.getValue("vehicleType")}
</div>
),
},
{
accessorKey: "entryTime",
header: ({ column }) => {
return (
<div className="flex justify-center items-center">
<Button
variant="ghost"
className="text-center"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Entry time
<CaretSortIcon className="ml-2 h-4 w-4" />
</Button>
</div>
);
},
cell: ({ row }) => (
<div className="text-center font-medium">{row.getValue("entryTime")}</div>
),
},
{
accessorKey: "landFillName",
header: ({ column }) => {
return (
<div className="flex justify-center items-center">
<Button
variant="ghost"
className="text-center"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Land Fill Name
<CaretSortIcon className="ml-2 h-4 w-4" />
</Button>
</div>
);
},
cell: ({ row }) => (
<div className="text-center font-medium">{row.getValue("landFillName")}</div>
),
},
{
id: "actions",
enableHiding: false,
cell: ({ row }) => {
const sts: Vehicle = row.original;

return (
<div>
<DeleteVehicleModalForSTS vehicleInfo={sts} />
{/* <EditSTSInfoModal stsInfo={sts} /> */}
</div>
);
},
},
];

export default function STSVehicleList() {
const [data, setData] = React.useState<Vehicle[]>([]);
const { getVehicleList, vehicleList } = useVehicleListForSTS();
const [sorting, setSorting] = React.useState<SortingState>([]);
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
[]
);
const [columnVisibility, setColumnVisibility] =
React.useState<VisibilityState>({});
const [rowSelection, setRowSelection] = React.useState({});

React.useEffect(() => {
getVehicleList();
}, []);

React.useEffect(() => {
setData(vehicleList);
}, [vehicleList]);

const table = useReactTable({
data,
columns,
onSortingChange: setSorting,
onColumnFiltersChange: setColumnFilters,
getCoreRowModel: getCoreRowModel(),
getPaginationRowModel: getPaginationRowModel(),
getSortedRowModel: getSortedRowModel(),
getFilteredRowModel: getFilteredRowModel(),
onColumnVisibilityChange: setColumnVisibility,
onRowSelectionChange: setRowSelection,
state: {
sorting,
columnFilters,
columnVisibility,
rowSelection,
},
});
return (
<>
<div className="flex items-center py-4 gap-4">
<Input
placeholder="Search by STS Name..."
value={(table.getColumn("name")?.getFilterValue() as string) ?? ""}
onChange={(event) =>
table.getColumn("name")?.setFilterValue(event.target.value)
}
className="max-w-sm"
/>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" className="ml-auto">
Columns <ChevronDownIcon className="ml-2 h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{table
.getAllColumns()
.filter((column) => column.getCanHide())
.map((column) => {
return (
<DropdownMenuCheckboxItem
key={column.id}
className="capitalize"
checked={column.getIsVisible()}
onCheckedChange={(value) =>
column.toggleVisibility(!!value)
}
>
{column.id}
</DropdownMenuCheckboxItem>
);
})}
</DropdownMenuContent>
</DropdownMenu>
</div>
<div className="rounded-md border">
<Table>
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
return (
<TableHead key={header.id}>
{header.isPlaceholder
? null
: flexRender(
header.column.columnDef.header,
header.getContext()
)}
</TableHead>
);
})}
</TableRow>
))}
</TableHeader>
<TableBody>
{table.getRowModel().rows?.length ? (
table.getRowModel().rows.map((row) => (
<TableRow
key={row.id}
data-state={row.getIsSelected() && "selected"}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
cell.getContext()
)}
</TableCell>
))}
</TableRow>
))
) : (
<TableRow>
<TableCell
colSpan={columns.length}
className="h-24 text-center"
>
No results.
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
<div className="flex items-center justify-end space-x-2 py-4">
<div className="flex-1 text-sm text-muted-foreground">
{table.getFilteredSelectedRowModel().rows.length} of{" "}
{table.getFilteredRowModel().rows.length} row(s) selected.
</div>
<div className="space-x-2">
<Button
variant="outline"
size="sm"
onClick={() => table.previousPage()}
disabled={!table.getCanPreviousPage()}
>
Previous
</Button>
<Button
variant="outline"
size="sm"
onClick={() => table.nextPage()}
disabled={!table.getCanNextPage()}
>
Next
</Button>
</div>
</div>
</>
);
}
Loading