diff --git a/src/Pages/Tagging.tsx b/src/Pages/Tagging.tsx
index 208fc18..009997b 100644
--- a/src/Pages/Tagging.tsx
+++ b/src/Pages/Tagging.tsx
@@ -6,17 +6,19 @@ import Button from "../components/Button/Button";
import { useModalStore } from "../context/zustand-store/appStore";
import { Popover } from "../components/PopOver/PopOver";
import { Tooltip } from "../components/Tooltip/Tooltip";
-import { DeleteButtonForPopOver } from "../components/PopOverButtons/PopOverButtons";
-import { TagDetails } from "../partials/tagging/TagDetails";
import { SubmitNewTags } from "../partials/tagging/SubmitNewTags";
+import { useNavigate } from "@tanstack/react-router";
+import { TAGS } from "../routes/paths";
+import { DeleteButtonForPopOver } from "../components/PopOverButtons/PopOverButtons";
export default function Tagging() {
const { openModal } = useModalStore();
const [tableInfo, setTableInfo] = useState({ page: 1, page_size: 10 });
const [tagsTableData, setTagsTableData] = useState([]);
+ const navigate = useNavigate();
const { data: tagsData, refetch } = useApiRequest({
- api: "/tag/web/api/v1/tag/",
+ api: "/tag/web/api/v1/tag_batch/",
method: "get",
queryKey: ["tagsList", tableInfo],
params: {
@@ -42,7 +44,6 @@ export default function Tagging() {
tableInfo.page === 1
? index + 1
: index + tableInfo.page_size * (tableInfo.page - 1) + 1,
- item?.tag_code || "-",
item?.organization?.name || "بدون سازمان",
item?.species_code === 1
? "گاو"
@@ -55,40 +56,39 @@ export default function Tagging() {
: item?.species_code === 5
? "بز"
: "نامشخص",
- item?.status === "F"
- ? "آزاد"
- : item?.status === "A"
- ? "پلاک شده"
- : item?.status === "R"
- ? "رزرو"
- : "-",
- item?.ownership_code || "-",
+ item?.serial_from || "-",
+ item?.serial_to || "-",
-
+
,
];
});
setTagsTableData(formattedData);
+ } else {
+ setTagsTableData([]);
}
}, [tagsData]);
@@ -150,11 +150,10 @@ export default function Tagging() {
title="پلاک کوبی"
columns={[
"ردیف",
- "پلاک",
"سازمان ثبت کننده",
"کد گونه",
- "وضعیت",
- "کد مالکیت ثبتی",
+ "از بازه سریال",
+ "تا بازه سریال",
"عملیات",
]}
rows={tagsTableData}
diff --git a/src/Pages/Tags.tsx b/src/Pages/Tags.tsx
new file mode 100644
index 0000000..7af6811
--- /dev/null
+++ b/src/Pages/Tags.tsx
@@ -0,0 +1,142 @@
+import { useEffect, useState } from "react";
+import { useApiRequest } from "../utils/useApiRequest";
+import { Grid } from "../components/Grid/Grid";
+import Table from "../components/Table/Table";
+import Button from "../components/Button/Button";
+import { useModalStore } from "../context/zustand-store/appStore";
+import { Popover } from "../components/PopOver/PopOver";
+import { Tooltip } from "../components/Tooltip/Tooltip";
+import { DeleteButtonForPopOver } from "../components/PopOverButtons/PopOverButtons";
+import { TagDetails } from "../partials/tagging/TagDetails";
+import { useParams } from "@tanstack/react-router";
+
+export default function Tags() {
+ const { openModal } = useModalStore();
+ const [tableInfo, setTableInfo] = useState({ page: 1, page_size: 10 });
+ const [tagsTableData, setTagsTableData] = useState([]);
+ const { id, from, to } = useParams({ strict: false });
+ const { data: tagsData, refetch } = useApiRequest({
+ api: `/tag/web/api/v1/tag/${id ? id + "/tags_by_batch" : ""}`,
+ method: "get",
+ queryKey: ["tagsList", tableInfo],
+ params: {
+ ...tableInfo,
+ },
+ });
+
+ const { data: tagDashboardData } = useApiRequest({
+ api: "/tag/web/api/v1/tag/tag_dashboard/",
+ method: "get",
+ queryKey: ["tagDashboard"],
+ });
+
+ useEffect(() => {
+ if (tagsData?.results) {
+ const formattedData = tagsData.results.map((item: any, index: number) => {
+ return [
+ tableInfo.page === 1
+ ? index + 1
+ : index + tableInfo.page_size * (tableInfo.page - 1) + 1,
+ item?.tag_code || "-",
+ item?.organization?.name || "بدون سازمان",
+ item?.species_code === 1
+ ? "گاو"
+ : item?.species_code === 2
+ ? "گاومیش"
+ : item?.species_code === 3
+ ? "شتر"
+ : item?.species_code === 4
+ ? "گوسفند"
+ : item?.species_code === 5
+ ? "بز"
+ : "نامشخص",
+ item?.status === "F"
+ ? "آزاد"
+ : item?.status === "A"
+ ? "پلاک شده"
+ : item?.status === "R"
+ ? "رزرو"
+ : "-",
+ item?.ownership_code || "-",
+
+
+
+
+ ,
+ ];
+ });
+ setTagsTableData(formattedData);
+ }
+ }, [tagsData]);
+
+ return (
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/routes/paths.ts b/src/routes/paths.ts
index 8d9a5d8..61b9c57 100644
--- a/src/routes/paths.ts
+++ b/src/routes/paths.ts
@@ -52,3 +52,5 @@ export const UNITS_SETTINGS = "/unit-settings";
//TAGGING
export const TAGGING = "/tagging";
+export const TAGS = "/tags";
+export const TAGS_BATCH = "/tags/$id/$from/$to";
diff --git a/src/utils/getCategoryParameters.ts b/src/utils/getCategoryParameters.ts
index 6883c75..fddb8f1 100644
--- a/src/utils/getCategoryParameters.ts
+++ b/src/utils/getCategoryParameters.ts
@@ -23,6 +23,7 @@ import Cooperatives from "../Pages/Cooperatives";
import CooperativeRanchers from "../Pages/CooperativeRanchers";
import SettingsOfUnits from "../Pages/SettingsOfUnits";
import Tagging from "../Pages/Tagging";
+import Tags from "../Pages/Tags";
export const managementCategoryItems = [
{
@@ -171,6 +172,16 @@ export const taggingCategoryItems = [
path: R.TAGGING,
component: Tagging,
},
+ {
+ name: "tags",
+ path: R.TAGS,
+ component: Tags,
+ },
+ {
+ name: "tags",
+ path: R.TAGS_BATCH,
+ component: Tags,
+ },
];
export const posCategoryItems = [
diff --git a/src/utils/getFaPermissions.ts b/src/utils/getFaPermissions.ts
index 8cc9f97..bdb9972 100644
--- a/src/utils/getFaPermissions.ts
+++ b/src/utils/getFaPermissions.ts
@@ -97,6 +97,9 @@ export function getFaPermissions(permission: string) {
case "tagging":
faPermission = "پلاک کوبی";
break;
+ case "tags":
+ faPermission = "پلاک ها";
+ break;
default:
break;
}