version changed to 02.64

src/Pages/TagDistributionDetails.tsx

@@ -1,12 +1,22 @@
-import { useEffect, useState } from "react";
 import { useParams } from "@tanstack/react-router";
+import { Bars3Icon, CubeIcon, SparklesIcon } from "@heroicons/react/24/outline";
 import { useApiRequest } from "../utils/useApiRequest";
+import { formatJustDate, formatJustTime } from "../utils/formatTime";
+import ShowMoreInfo from "../components/ShowMoreInfo/ShowMoreInfo";
 import { Grid } from "../components/Grid/Grid";
+import Typography from "../components/Typography/Typography";
 import Table from "../components/Table/Table";
 
+const speciesMap: Record<number, string> = {
+  1: "گاو",
+  2: "گاومیش",
+  3: "شتر",
+  4: "گوسفند",
+  5: "بز",
+};
+
 export default function TagDistribtutionDetails() {
   const { id } = useParams({ strict: false });
-  const [tableData, setTableData] = useState([]);
 
   const { data } = useApiRequest({
     api: `/tag/web/api/v1/tag_distribution_batch/${id}/`,
@@ -15,42 +25,126 @@ export default function TagDistribtutionDetails() {
     enabled: !!id,
   });
 
-  useEffect(() => {
-    if (data?.distributions) {
-      const rows = data.distributions.map((item: any, index: number) => [
-        index + 1,
-        item?.dist_identity,
-        item?.batch_identity,
-        item?.distribution_type === "batch" ? "توزیع گروهی" : "توزیع تصادفی",
-        item?.species_code,
-        item?.total_tag_count,
-        item?.distributed_number,
-        item?.remaining_number,
-        `از ${item?.serial_from} تا ${item?.serial_to}`,
-      ]);
-      setTableData(rows);
-    }
-  }, [data]);
+  const dist = data?.distributions;
 
   return (
-    <Grid container column className="gap-4">
+    <Grid container column className="gap-4 mt-2">
+      <Grid isDashboard>
         <Table
-        title="جزئیات توزیع پلاک"
+          isDashboard
+          title="مشخصات توزیع پلاک"
           noSearch
           noPagination
           columns={[
-          "ردیف",
             "شناسه توزیع",
-          "شناسه پلاک",
+            "تاریخ ثبت",
+            "توزیع کننده",
+            "دریافت کننده",
+            "تعداد کل پلاک",
+            "پلاک های توزیع شده",
+            "پلاک های باقیمانده",
             "نوع توزیع",
-          "کد گونه",
-          "تعداد کل پلاک ها",
-          "تعداد توزیع شده",
-          "تعداد باقیمانده",
-          "بازه سریال",
+            "جزئیات توزیع",
+          ]}
+          rows={[
+            [
+              data?.dist_batch_identity ?? "-",
+              `${formatJustDate(data?.create_date) ?? "-"} (${
+                formatJustDate(data?.create_date)
+                  ? (formatJustTime(data?.create_date) ?? "-")
+                  : "-"
+              })`,
+              data?.assigner_org?.name ?? "-",
+              data?.assigned_org?.name ?? "-",
+              data?.total_tag_count?.toLocaleString() ?? "-",
+              data?.total_distributed_tag_count?.toLocaleString() ?? "-",
+              data?.remaining_tag_count?.toLocaleString() ?? "-",
+              data?.distribution_type === "batch"
+                ? "توزیع گروهی"
+                : "توزیع تصادفی",
+              <ShowMoreInfo key={data?.id} title="جزئیات توزیع">
+                <Grid container column className="gap-4 w-full">
+                  {dist?.map((opt: any, index: number) => (
+                    <Grid
+                      key={index}
+                      container
+                      column
+                      className="gap-3 w-full rounded-xl border border-gray-200 dark:border-gray-700 p-4"
+                    >
+                      <Grid container className="gap-2 items-center">
+                        <SparklesIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                        <Typography variant="body2" className="font-medium">
+                          گونه:
+                        </Typography>
+                        <Typography
+                          variant="body2"
+                          className="text-gray-700 dark:text-gray-300"
+                        >
+                          {speciesMap[opt?.species_code] ?? "-"}
+                        </Typography>
+                      </Grid>
+
+                      {data?.distribution_type === "batch" &&
+                        opt?.serial_from != null && (
+                          <Grid container className="gap-2 items-center">
+                            <Bars3Icon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                            <Typography variant="body2" className="font-medium">
+                              بازه سریال:
+                            </Typography>
+                            <Typography
+                              variant="body2"
+                              className="text-gray-600 dark:text-gray-400"
+                            >
+                              از {opt?.serial_from ?? "-"} تا{" "}
+                              {opt?.serial_to ?? "-"}
+                            </Typography>
+                          </Grid>
+                        )}
+
+                      <Grid container className="gap-2 items-center">
+                        <CubeIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                        <Typography variant="body2" className="font-medium">
+                          تعداد پلاک:
+                        </Typography>
+                        <Typography
+                          variant="body2"
+                          className="text-gray-700 dark:text-gray-300"
+                        >
+                          {opt?.total_tag_count?.toLocaleString() ?? "-"}
+                        </Typography>
+                      </Grid>
+                      <Grid container className="gap-2 items-center">
+                        <CubeIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                        <Typography variant="body2" className="font-medium">
+                          پلاک های توزیع شده:
+                        </Typography>
+                        <Typography
+                          variant="body2"
+                          className="text-gray-700 dark:text-gray-300"
+                        >
+                          {opt?.distributed_number?.toLocaleString() ?? "-"}
+                        </Typography>
+                      </Grid>
+                      <Grid container className="gap-2 items-center">
+                        <CubeIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                        <Typography variant="body2" className="font-medium">
+                          پلاک های باقیمانده:
+                        </Typography>
+                        <Typography
+                          variant="body2"
+                          className="text-gray-700 dark:text-gray-300"
+                        >
+                          {opt?.remaining_number?.toLocaleString() ?? "-"}
+                        </Typography>
+                      </Grid>
+                    </Grid>
+                  ))}
+                </Grid>
+              </ShowMoreInfo>,
+            ],
           ]}
-        rows={tableData}
         />
       </Grid>
+    </Grid>
   );
 }

src/components/Button/Button.tsx

@@ -7,6 +7,7 @@ import React, {
 } from "react";
 import clsx from "clsx";
 import {
+  ArrowUpCircleIcon,
   ChartBarIcon,
   DocumentChartBarIcon,
   EyeIcon,
@@ -56,7 +57,8 @@ type ButtonProps = {
     | "view"
     | "info"
     | "chart"
-    | "set";
+    | "set"
+    | "share";
   page?: string;
   access?: string;
   height?: string | number;
@@ -161,6 +163,10 @@ const Button: React.FC<ButtonProps> = ({
         return (
           <WrenchIcon className="w-5 h-5 text-purple-400 dark:text-purple-100" />
         );
+      case "share":
+        return (
+          <ArrowUpCircleIcon className="w-5 h-5 text-purple-400 dark:text-purple-100" />
+        );
       default:
         return null;
     }
@@ -181,7 +187,7 @@ const Button: React.FC<ButtonProps> = ({
       return true;
     } else {
       const finded = profile?.permissions?.find(
-        (item: any) => item.page_name === page
+        (item: any) => item.page_name === page,
       );
       if (finded && finded.page_access.includes(access)) {
         return true;
@@ -237,7 +243,7 @@ const Button: React.FC<ButtonProps> = ({
           sizeStyles.padding,
           sizeStyles.text,
           className,
-          checkIsMobile() && !icon && !variant && children && mobileBorders
+          checkIsMobile() && !icon && !variant && children && mobileBorders,
         )}
         style={{ height }}
       >
@@ -256,7 +262,7 @@ const Button: React.FC<ButtonProps> = ({
                   .then((response) => {
                     closeBackdrop();
                     const url = window.URL.createObjectURL(
-                      new Blob([response.data])
+                      new Blob([response.data]),
                     );
 
                     const link = document.createElement("a");

src/partials/tagging/DistributeFromDistribution.tsx

@@ -0,0 +1,254 @@
+import { z } from "zod";
+import { useEffect, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Grid } from "../../components/Grid/Grid";
+import Button from "../../components/Button/Button";
+import Textfield from "../../components/Textfeild/Textfeild";
+import { FormApiBasedAutoComplete } from "../../components/FormItems/FormApiBasedAutoComplete";
+import AutoComplete from "../../components/AutoComplete/AutoComplete";
+import { zValidateAutoComplete } from "../../data/getFormTypeErrors";
+import { useApiMutation, useApiRequest } from "../../utils/useApiRequest";
+import { useToast } from "../../hooks/useToast";
+import { useModalStore } from "../../context/zustand-store/appStore";
+
+const schema = z.object({
+  organization: zValidateAutoComplete("سازمان"),
+});
+
+type FormValues = z.infer<typeof schema>;
+
+type ParentDistItem = {
+  id: number;
+  dist_identity?: number;
+  batch_identity: string | number | null;
+  species_code: number;
+  maxCount: number;
+  label?: string;
+};
+
+export const DistributeFromDistribution = ({ item, getData }: any) => {
+  const showToast = useToast();
+  const { closeModal } = useModalStore();
+
+  const [dists, setDists] = useState<ParentDistItem[]>([]);
+  const [selectedSpeciesKeys, setSelectedSpeciesKeys] = useState<
+    (string | number)[]
+  >([]);
+  const [counts, setCounts] = useState<Record<number, number | "">>({});
+
+  const {
+    control,
+    handleSubmit,
+    setValue,
+    trigger,
+    formState: { errors },
+  } = useForm<FormValues>({
+    resolver: zodResolver(schema),
+    defaultValues: {
+      organization: [],
+    },
+  });
+
+  const { data: batchDetail } = useApiRequest({
+    api: `/tag/web/api/v1/tag_distribution_batch/${item?.id}/`,
+    method: "get",
+    queryKey: ["tagDistributionBatchDetail", item?.id],
+    enabled: !!item?.id,
+  });
+
+  const mutation = useApiMutation({
+    api: `/tag/web/api/v1/tag_distribution/${item?.id}/distribute_distribution/`,
+    method: "post",
+  });
+
+  const { data: speciesData } = useApiRequest({
+    api: "/livestock/web/api/v1/livestock_species",
+    method: "get",
+    params: { page: 1, pageSize: 1000 },
+    queryKey: ["species"],
+  });
+
+  useEffect(() => {
+    const sourceDistributions = item?.distributions?.length
+      ? item.distributions
+      : batchDetail?.distributions;
+
+    if (!sourceDistributions?.length) {
+      setDists([]);
+      setCounts({});
+      return;
+    }
+
+    const parentDists: ParentDistItem[] = sourceDistributions.map((d: any) => {
+      const maxCount = d?.remaining_number || 0;
+      return {
+        id: d?.id ?? d?.dist_identity,
+        dist_identity: d?.dist_identity,
+        batch_identity: d?.batch_identity ?? null,
+        species_code: d?.species_code,
+        maxCount: Number(maxCount) || 0,
+        label:
+          d?.serial_from != null && d?.serial_to != null
+            ? `از ${d.serial_from} تا ${d.serial_to}`
+            : undefined,
+      };
+    });
+
+    setDists(parentDists);
+    setCounts({});
+    setSelectedSpeciesKeys([]);
+  }, [item?.distributions, batchDetail?.distributions]);
+
+  const speciesOptions = () =>
+    speciesData?.results?.map((opt: any) => ({
+      key: opt?.value,
+      value: opt?.name,
+    })) ?? [];
+
+  const getSpeciesName = (speciesCode: number) =>
+    speciesOptions().find((s: any) => s.key === speciesCode)?.value ?? "نامشخص";
+
+  const visibleDists = dists.filter((d) =>
+    selectedSpeciesKeys.includes(d.species_code),
+  );
+
+  const onSubmit = async (data: FormValues) => {
+    const distsPayload = visibleDists
+      .filter((d) => {
+        const c = counts[d.id];
+        return c !== "" && c !== undefined && c !== null && Number(c) > 0;
+      })
+      .map((d) => {
+        const fromItem = item?.distributions?.find(
+          (x: any) => x.id === d.id || x.dist_identity === d.id,
+        );
+        const batch_identity =
+          fromItem != null ? fromItem.batch_identity : d.batch_identity;
+        return {
+          parent_tag_distribution: d.id,
+          batch_identity: batch_identity != null ? batch_identity : null,
+          species_code: d.species_code,
+          count: Number(counts[d.id] ?? 0),
+        };
+      });
+
+    if (distsPayload.length === 0) {
+      showToast("حداقل یک گونه با تعداد معتبر وارد کنید", "error");
+      return;
+    }
+
+    try {
+      await mutation.mutateAsync({
+        assigned_org: data.organization[0],
+        parent_distribution_batch: item.id,
+        dists: distsPayload,
+      });
+
+      showToast("توزیع از توزیع با موفقیت انجام شد", "success");
+      getData();
+      closeModal();
+    } catch (error: any) {
+      showToast(
+        error?.response?.data?.message || "خطا در ثبت اطلاعات!",
+        "error",
+      );
+    }
+  };
+
+  const handleCountChange = (distId: number, value: number | "") => {
+    setCounts((prev) => ({ ...prev, [distId]: value }));
+  };
+
+  const isValidCount = (dist: ParentDistItem) => {
+    const c = counts[dist.id];
+    if (c === "" || c === undefined || c === null) return false;
+    const num = Number(c);
+    return num > 0 && num <= dist.maxCount;
+  };
+
+  const speciesOptionsFromParent = () => {
+    const uniqueSpecies = Array.from(
+      new Map(dists.map((d) => [d.species_code, d])).values(),
+    );
+    return uniqueSpecies.map((d) => ({
+      key: d.species_code,
+      value: getSpeciesName(d.species_code),
+    }));
+  };
+
+  const hasValidDists =
+    visibleDists.length > 0 && visibleDists.every((d) => isValidCount(d));
+
+  return (
+    <form onSubmit={handleSubmit(onSubmit)}>
+      <Grid container column className="gap-3">
+        <Controller
+          name="organization"
+          control={control}
+          render={() => (
+            <FormApiBasedAutoComplete
+              title="انتخاب سازمان (دریافت‌کننده)"
+              api={`auth/api/v1/organization/organizations_by_province?exclude=PSP&province=${item?.assigner_org?.province}`}
+              keyField="id"
+              valueField="name"
+              error={!!errors.organization}
+              errorMessage={errors.organization?.message}
+              onChange={(r) => {
+                setValue("organization", [r]);
+                trigger("organization");
+              }}
+            />
+          )}
+        />
+
+        {dists.length > 0 && speciesData?.results && (
+          <>
+            <AutoComplete
+              data={speciesOptionsFromParent()}
+              multiselect
+              selectedKeys={selectedSpeciesKeys}
+              onChange={(keys: (string | number)[]) => {
+                setSelectedSpeciesKeys(keys);
+              }}
+              title="گونه"
+            />
+            {visibleDists.map((dist) => {
+              const countVal = counts[dist.id];
+              const numCount =
+                countVal !== "" && countVal !== undefined && countVal !== null
+                  ? Number(countVal)
+                  : null;
+              const isOverMax = numCount !== null && numCount > dist.maxCount;
+              const isEmpty = countVal === "" || countVal === undefined;
+              const helperText = isOverMax
+                ? `تعداد نباید بیشتر از ${dist.maxCount.toLocaleString()} باشد`
+                : isEmpty
+                  ? "لطفا تعداد را وارد کنید"
+                  : undefined;
+
+              return (
+                <Textfield
+                  key={dist.id}
+                  fullWidth
+                  formattedNumber
+                  placeholder={`تعداد ${getSpeciesName(dist.species_code)}${dist.label ? ` (${dist.label})` : ""} — حداکثر: ${dist.maxCount.toLocaleString()}`}
+                  value={counts[dist.id] ?? ""}
+                  onChange={(e) =>
+                    handleCountChange(dist.id, Number(e.target.value))
+                  }
+                  error={isOverMax}
+                  helperText={helperText}
+                />
+              );
+            })}
+          </>
+        )}
+
+        <Button disabled={!hasValidDists} type="submit">
+          ثبت
+        </Button>
+      </Grid>
+    </form>
+  );
+};

src/partials/tagging/TagActiveDistributions.tsx

@@ -16,6 +16,7 @@ import Button from "../../components/Button/Button";
 import { Tooltip } from "../../components/Tooltip/Tooltip";
 import { DeleteButtonForPopOver } from "../../components/PopOverButtons/PopOverButtons";
 import { SubmitTagDistribution } from "./SubmitTagDistribution";
+import { DistributeFromDistribution } from "./DistributeFromDistribution";
 import Table from "../../components/Table/Table";
 import { BooleanQuestion } from "../../components/BooleanQuestion/BooleanQuestion";
 import { TableButton } from "../../components/TableButton/TableButton";
@@ -74,6 +75,8 @@ export default function TagActiveDistributions() {
           item?.assigner_org?.name,
           item?.assigned_org?.name,
           item?.total_tag_count,
+          item?.total_distributed_tag_count,
+          item?.remaining_tag_count,
           item?.distribution_type === "batch" ? "توزیع گروهی" : "توزیع تصادفی",
           <ShowMoreInfo key={item?.id} title="جزئیات توزیع">
             <Grid container column className="gap-4 w-full">
@@ -84,6 +87,19 @@ export default function TagActiveDistributions() {
                   column
                   className="gap-3 w-full rounded-xl border border-gray-200 dark:border-gray-700 p-4"
                 >
+                  <Grid container className="gap-2 items-center">
+                    <SparklesIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                    <Typography variant="body2" className="font-medium">
+                      گونه:
+                    </Typography>
+                    <Typography
+                      variant="body2"
+                      className="text-gray-700 dark:text-gray-300"
+                    >
+                      {speciesMap[opt?.species_code] ?? "-"}
+                    </Typography>
+                  </Grid>
+
                   {item?.distribution_type === "batch" && opt?.serial_from && (
                     <Grid container className="gap-2 items-center">
                       <Bars3Icon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
@@ -111,17 +127,28 @@ export default function TagActiveDistributions() {
                       {opt?.total_tag_count?.toLocaleString()}
                     </Typography>
                   </Grid>
-
                   <Grid container className="gap-2 items-center">
-                    <SparklesIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                    <CubeIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
                     <Typography variant="body2" className="font-medium">
-                      گونه:
+                      پلاک های توزیع شده:
                     </Typography>
                     <Typography
                       variant="body2"
                       className="text-gray-700 dark:text-gray-300"
                     >
-                      {speciesMap[opt?.species_code] ?? "-"}
+                      {opt?.distributed_number?.toLocaleString()}
+                    </Typography>
+                  </Grid>
+                  <Grid container className="gap-2 items-center">
+                    <CubeIcon className="w-5 h-5 text-gray-500 dark:text-gray-300" />
+                    <Typography variant="body2" className="font-medium">
+                      پلاک های باقیمانده:
+                    </Typography>
+                    <Typography
+                      variant="body2"
+                      className="text-gray-700 dark:text-gray-300"
+                    >
+                      {opt?.remaining_number?.toLocaleString()}
                     </Typography>
                   </Grid>
                 </Grid>
@@ -163,6 +190,24 @@ export default function TagActiveDistributions() {
                 }}
               />
             </Tooltip>
+            <Tooltip title="توزیع مجدد" position="right">
+              <Button
+                variant="share"
+                page="tag_distribution"
+                access="Distribute-From-Distribution"
+                onClick={() => {
+                  openModal({
+                    title: "توزیع مجدد",
+                    content: (
+                      <DistributeFromDistribution
+                        getData={handleUpdate}
+                        item={item}
+                      />
+                    ),
+                  });
+                }}
+              />
+            </Tooltip>
             <Tooltip title={"لغو توزیع"} position="right">
               <Button
                 page="tag_distribution"
@@ -272,6 +317,8 @@ export default function TagActiveDistributions() {
           "توزیع کننده",
           "دریافت کننده",
           "تعداد کل پلاک",
+          "پلاک های توزیع شده",
+          "پلاک های باقیمانده",
           "نوع توزیع",
           "جزئیات توزیع",
           "عملیات",

src/version.txt

@@ -1 +1 @@
-02.62
+02.64