Complaints List ui changed + a bug fixed

Kahdooei
Hossein Rahmani 2024-01-24 15:31:29 +03:30
parent 35c31dbb77
commit 95283d0700
9 changed files with 161 additions and 177 deletions

67
components/Pagination.tsx Normal file
View File

@ -0,0 +1,67 @@
"use client";
import React, { useEffect, useState } from "react";
import ReactPaginate from "react-paginate";
import { MdKeyboardArrowRight, MdKeyboardArrowLeft } from "react-icons/md";
import { twMerge } from "tailwind-merge";
// Example items, to simulate fetching from another resources.
const items = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
export default function Pagination({
itemsPerPage,
Page,
countPage,
length,
}: {
itemsPerPage?: any;
Page?: any;
countPage?: any;
length?: any;
}) {
// Here we use item offsets; we could also use page offsets
// following the API or data you're working with.
const [itemOffset, setItemOffset] = useState(0);
// Simulate fetching items from another resources.
// (This could be items from props; or items loaded in a local state
// from an API endpoint with useEffect and useState)
const endOffset = itemOffset + itemsPerPage;
// console.log(`Loading items from ${itemOffset} to ${endOffset}`);
const currentItems = items.slice(itemOffset, endOffset);
const pageCount = Math.ceil(items.length / itemsPerPage);
// Invoke when user click to request another page.
const handlePageClick = (event: any) => {
const newOffset = (event.selected * itemsPerPage) % items.length;
console.log(
`User requested page number ${event.selected}, which is offset ${newOffset}`
);
setItemOffset(newOffset);
// console.log(event.selected);
console.log(event);
Page(event.selected);
};
console.log(countPage);
// console.log(pageCount, "1111");
return (
<>
{/* <Items currentItems={currentItems} /> */}
<ReactPaginate
breakLabel="..."
onPageActive={(e) => console.log(e)}
nextLabel={<MdKeyboardArrowLeft className="w-5 h-5 " />}
onPageChange={handlePageClick}
pageRangeDisplayed={3}
pageCount={Math.ceil(countPage / 5)}
previousLabel={<MdKeyboardArrowRight className="w-5 h-5 " />}
pageClassName=" w-10 h-10 grid place-content-center rounded-lg !text-blue shadow-md"
className={twMerge(
" flex flex-wrap gap-3 text-sm md:text-base w-full bottom-0 rounded-md p-1 bg-white/30 backdrop-blur-lg justify-center text-blue mt-5"
)}
activeClassName=" bg-blue text-blue shadow-md shadow-main"
activeLinkClassName=" text-white w-full p-1 h-full"
previousLinkClassName=" w-10 h-10 grid place-content-center rounded-lg text-sm shadow-md"
nextLinkClassName=" w-10 h-10 grid place-content-center rounded-lg text-sm shadow-md"
/>
</>
);
}

View File

@ -48,7 +48,6 @@ export default function ProfileDropDown() {
} = useQuery({ } = useQuery({
queryKey: ["Profile"], queryKey: ["Profile"],
queryFn: () => getProfile(), queryFn: () => getProfile(),
refetchOnWindowFocus: false,
}); });
const revokeMutation = useMutation({ const revokeMutation = useMutation({

View File

@ -18,14 +18,24 @@ import {
} from "@/components/ui/alert-dialog"; } from "@/components/ui/alert-dialog";
import { IoMdClose } from "react-icons/io"; import { IoMdClose } from "react-icons/io";
import { useMediaQuery } from "react-responsive"; import { useMediaQuery } from "react-responsive";
export default function Search({ mode }: { mode: string }) { export default function Search({
mode,
value,
action,
changeValue,
}: {
mode?: string;
value?: any;
action?: (any: any) => any;
changeValue?: (any: any) => any;
}) {
// useEffect(() => { // useEffect(() => {
// const isMobile = useMediaQuery({ query: "(max-width: 768px)" }); // const isMobile = useMediaQuery({ query: "(max-width: 768px)" });
// }, []); // }, []);
return ( return (
<div> <div>
{mode === "controller" || mode === "admin" ? ( {mode === "controller" || mode === "admin" ? (
<div className="relative flex bg-gray-300 rounded-xl items-center"> <div className="relative flex bg-gray-300 rounded-xl items-center my-2">
<Input <Input
// type="search" // type="search"
id="default-search" id="default-search"
@ -38,6 +48,12 @@ export default function Search({ mode }: { mode: string }) {
"w-full min-w-full bg-white lg:min-w-full h-11" "w-full min-w-full bg-white lg:min-w-full h-11"
} }
`} `}
value={value}
onChange={(e) => {
if (changeValue) {
changeValue(e.target.value);
}
}}
placeholder="جستجو..." placeholder="جستجو..."
required required
/> />
@ -46,7 +62,7 @@ export default function Search({ mode }: { mode: string }) {
> >
<CiSearch /> <CiSearch />
</Button> */} </Button> */}
<button className="absolute left-3"> <button onClick={action} className="absolute left-3">
<CiSearch /> <CiSearch />
</button> </button>
</div> </div>

View File

@ -1,5 +1,5 @@
"use client"; "use client";
import React, { useState } from "react"; import React, { useEffect, useState } from "react";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import TableController from "./TableController"; import TableController from "./TableController";
import Search from "./Search"; import Search from "./Search";
@ -22,167 +22,50 @@ import { Decrypt } from "@/lib/utils";
import useData from "@/store/useData"; import useData from "@/store/useData";
import { toast } from "sonner"; import { toast } from "sonner";
import { getComplaints } from "@/utils/citizenApi"; import { getComplaints } from "@/utils/citizenApi";
import Pagination from "./Pagination";
export default function TabController() { export default function TabController() {
const saveData = useData((state) => state.saveData); const saveData = useData((state) => state.saveData);
const [selectedFile, setSelectedFile] = useState<any>(null); const [selectedFile, setSelectedFile] = useState<any>(null);
const [page, setPage] = useState<any>(1);
const [totalCount, setTotalCount] = useState<any>(0);
const router = useRouter(); const router = useRouter();
const { data, isLoading } = useQuery({ const [search, setSearch] = useState<any>(null);
queryKey: ["CitizenList"],
queryFn: () => getComplaints(), const { data, isLoading, refetch } = useQuery({
queryKey: ["CitizenList", page],
queryFn: () =>
getComplaints({
TrackingNumber: search,
PageNumber: page,
}),
refetchOnWindowFocus: false, refetchOnWindowFocus: false,
}); });
const checkKey = (item: any) => { console.log(data);
const dcKey = Decrypt(item.cipherKeyInspector, selectedFile); useEffect(() => {
if (dcKey != false && dcKey != null) { if (data) {
saveData({ const headersData = JSON.parse(data.headers["x-pagination"]);
trackingNumber: item.trackingNumber, setTotalCount(headersData.TotalCount);
password: Decrypt(item.cipherKeyInspector, selectedFile),
});
router.push(`/UserPanel/ControllerDashboard/Complaints/${item.id}`);
} else {
toast("کلید شما معتبر نمی باشد.", {
className: "!bg-red-500 !text-white",
});
} }
}, [data]);
const handelSearch = (event: any) => {
refetch();
}; };
console.log(data);
const newComplaints = data?.filter((item: any) => item.status == 0);
const inProgressComplaints = data?.filter((item: any) => item.status == 1);
const waitingForCitizenResponseComplaints = data?.filter(
(item: any) => item.status == 2
);
const citizenRepliedComplaints = data?.filter(
(item: any) => item.status == 3
);
const finishedComplaints = data?.filter((item: any) => item.status == 4);
console.log(newComplaints);
return ( return (
<div className="w-[95vw] lg:w-[82vw] xl:w-[70vw] 3xl:w-[65vw] mt-16 pt-9"> <div className="w-[95vw] lg:w-[82vw] xl:w-[70vw] 3xl:w-[65vw] mt-16 pt-9">
<Dialog> <Search
{/* <DialogTrigger className=" appearance-none" asChild> value={search}
<Button changeValue={(data: any) => setSearch(data)}
// onClick={handelVerify} mode="controller"
type="submit" action={handelSearch}
className="bg-brown hover:bg-brown/90 text-white w-36 p-2 rounded-xl mt-6 md:mt-12 mb-2"
>
+ بارگذاری کلید جدید
</Button>
</DialogTrigger> */}
<Tabs defaultValue="tab1" className="" dir="rtl">
<div className="w-full flex flex-col-reverse lg:flex-row gap-4 lg:gap-5 justify-between items-center mb-10">
{/* Tab Title */}
<TabsList className="w-full flex gap-1 md:gap-4 lg:gap-7">
<p className="3xl:ml-6 text-xs sm:text-sm font-bold">
لیست شکایت ها |
</p>
<TabsTrigger
value="tab1"
className="hover:border-b-2 border-b-blue"
>
ثبت شده
</TabsTrigger>
<TabsTrigger
value="tab2"
className="hover:border-b-2 border-b-blue"
>
در انتظار پاسخ
</TabsTrigger>
<TabsTrigger
value="tab3"
className="hover:border-b-2 border-b-blue"
>
در حال بررسی
</TabsTrigger>
<TabsTrigger
value="tab4"
className="hover:border-b-2 border-b-blue"
>
پاسخ داده شده
</TabsTrigger>
<TabsTrigger
value="tab5"
className="hover:border-b-2 border-b-blue"
>
پایان یافته
</TabsTrigger>
</TabsList>
{/* Search Box */}
<Search mode="controller" />
</div>
{/* Tab Content */}
<TabsContent value="tab1">
<TableController
checkKey={(item: any) => checkKey(item)}
data={newComplaints}
/> />
</TabsContent> <TableController data={data?.data} />
<Pagination
<TabsContent value="tab2"> countPage={totalCount}
<TableController Page={(num: number) => setPage(num + 1)}
checkKey={(item: any) => checkKey(item)}
data={waitingForCitizenResponseComplaints}
/> />
</TabsContent>
<TabsContent value="tab3">
<TableController
checkKey={(item: any) => checkKey(item)}
data={inProgressComplaints}
/>
</TabsContent>
<TabsContent value="tab4">
<TableController
checkKey={(item: any) => checkKey(item)}
data={citizenRepliedComplaints}
/>
</TabsContent>
<TabsContent value="tab5">
<TableController
checkKey={(item: any) => checkKey(item)}
data={finishedComplaints}
/>
</TabsContent>
</Tabs>
<DialogContent dir="rtl" className="sm:max-w-[425px]">
<DialogHeader dir="rtl">
<DialogTitle dir="rtl">بارگذاری کلید خصوصی</DialogTitle>
<DialogDescription>
لطفا کلید خصوصی خود را آپلود نمایید.
</DialogDescription>
</DialogHeader>
<div className="grid w-full max-w-sm items-center gap-1.5">
{/* <Label htmlFor="picture">Picture</Label> */}
{/* <Input
dir="rtl"
id="picture"
onChange={handleFileChange}
type="file"
accept=".txt"
/> */}
</div>
<DialogFooter>
<DialogClose asChild>
<Button
onClick={() => {
toast("کلید شما با موفقیت ذخیره شد.", {
className: "!bg-green-500 !text-white",
});
}}
type="submit"
>
ذخیره
</Button>
</DialogClose>
</DialogFooter>
</DialogContent>
</Dialog>
</div> </div>
); );
} }

View File

@ -41,19 +41,17 @@ interface Complaint {
title: string; title: string;
description: string; description: string;
}; };
statusWithDescription: {
value: number;
description: string;
};
status: number; status: number;
registeredAt: string; registeredAt: string;
lastChanged: string; lastChanged: string;
lastActor: number; lastActor: number;
cipherKeyInspector: string; cipherKeyInspector: string;
} }
export default function TableController({ export default function TableController({ data }: { data: Complaint[] }) {
data,
checkKey,
}: {
data: Complaint[];
checkKey: (item: any) => any;
}) {
console.log(data); console.log(data);
const saveData = useData((state) => state.saveData); const saveData = useData((state) => state.saveData);
const [selectedFile, setSelectedFile] = useState<any>(null); const [selectedFile, setSelectedFile] = useState<any>(null);
@ -71,17 +69,7 @@ export default function TableController({
reader.readAsText(file); reader.readAsText(file);
}; };
// const checkKey = (item: any) => {
// const dcKey = Decrypt(item.cipherKeyInspector, selectedFile);
// if (dcKey != false && dcKey != null) {
// saveData({
// trackingNumber: item.trackingNumber,
// password: Decrypt(item.cipherKeyInspector, selectedFile),
// });
// router.push(`/UserPanel/ControllerDashboard/Complaints/${item.id}`);
// } else {
// }
// };
return ( return (
<div> <div>
<Table className="border-[1px] border-solid border-muted rounded-md "> <Table className="border-[1px] border-solid border-muted rounded-md ">
@ -92,6 +80,7 @@ export default function TableController({
<TableHead>تاریخ</TableHead> <TableHead>تاریخ</TableHead>
<TableHead>کد پیگیری</TableHead> <TableHead>کد پیگیری</TableHead>
<TableHead>موضوع</TableHead> <TableHead>موضوع</TableHead>
<TableHead>وضعیت</TableHead>
<TableHead>دستگاه مربوطه</TableHead> <TableHead>دستگاه مربوطه</TableHead>
</TableRow> </TableRow>
</TableHeader> </TableHeader>
@ -123,12 +112,18 @@ export default function TableController({
<TableCell className="w-2/12"> <TableCell className="w-2/12">
{item?.title ? item.title : "-"} {item?.title ? item.title : "-"}
</TableCell> </TableCell>
<TableCell className="w-5/12"> <TableCell className="w-2/12">
{item?.statusWithDescription
? item.statusWithDescription.description
: "-"}
</TableCell>
<TableCell className="w-3/12">
{item?.complaintOrganization {item?.complaintOrganization
? item?.complaintOrganization.title ? item?.complaintOrganization.title
: "-"} : "-"}
</TableCell> </TableCell>
{/* </Link> */} {/* </Link> */}
</TableRow> </TableRow>
); );
})} })}

12
package-lock.json generated
View File

@ -50,6 +50,7 @@
"react-leaflet": "^4.2.1", "react-leaflet": "^4.2.1",
"react-loader-spinner": "^6.1.6", "react-loader-spinner": "^6.1.6",
"react-otp-input": "^3.1.1", "react-otp-input": "^3.1.1",
"react-paginate": "^8.2.0",
"react-responsive": "^9.0.2", "react-responsive": "^9.0.2",
"react-spinners": "^0.13.8", "react-spinners": "^0.13.8",
"react-to-print": "^2.14.15", "react-to-print": "^2.14.15",
@ -8159,6 +8160,17 @@
"react-dom": ">=16.8.6 || ^17.0.0 || ^18.0.0" "react-dom": ">=16.8.6 || ^17.0.0 || ^18.0.0"
} }
}, },
"node_modules/react-paginate": {
"version": "8.2.0",
"resolved": "https://registry.npmjs.org/react-paginate/-/react-paginate-8.2.0.tgz",
"integrity": "sha512-sJCz1PW+9PNIjUSn919nlcRVuleN2YPoFBOvL+6TPgrH/3lwphqiSOgdrLafLdyLDxsgK+oSgviqacF4hxsDIw==",
"dependencies": {
"prop-types": "^15"
},
"peerDependencies": {
"react": "^16 || ^17 || ^18"
}
},
"node_modules/react-remove-scroll": { "node_modules/react-remove-scroll": {
"version": "2.5.5", "version": "2.5.5",
"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz", "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",

View File

@ -51,6 +51,7 @@
"react-leaflet": "^4.2.1", "react-leaflet": "^4.2.1",
"react-loader-spinner": "^6.1.6", "react-loader-spinner": "^6.1.6",
"react-otp-input": "^3.1.1", "react-otp-input": "^3.1.1",
"react-paginate": "^8.2.0",
"react-responsive": "^9.0.2", "react-responsive": "^9.0.2",
"react-spinners": "^0.13.8", "react-spinners": "^0.13.8",
"react-to-print": "^2.14.15", "react-to-print": "^2.14.15",

View File

@ -39,7 +39,6 @@ module.exports = {
blue50: "#335F9380", blue50: "#335F9380",
yellow: "#F7A600", yellow: "#F7A600",
brown: "#D28249", brown: "#D28249",
gray: "#BFBFBF",
border: "hsl(var(--border))", border: "hsl(var(--border))",
input: "hsl(var(--input))", input: "hsl(var(--input))",
ring: "hsl(var(--ring))", ring: "hsl(var(--ring))",

View File

@ -44,7 +44,19 @@ export async function postComplaintsDetails(payload: FormData) {
return data.data; return data.data;
} }
export async function getComplaints() { export async function getComplaints({
const data = await axios.get("api/Citizen/List"); states = 0,
return data.data; TrackingNumber,
PageNumber = 1,
PageSize = 5,
}: {
states?: number;
TrackingNumber?: string;
PageNumber?: number;
PageSize?: number;
}) {
const data = await axios.get("api/Citizen/List", {
params: { TrackingNumber: TrackingNumber, PageNumber, PageSize },
});
return data;
} }