Compare commits

..

2 Commits

Author SHA1 Message Date
Hossein Rahmani 2a6e6fffaf Merge branch 'master' into Kahdooei 2024-07-17 15:28:37 +03:30
YasamanKahdooei 4249e8004f A bug fixed 2024-07-17 14:58:16 +03:30
3 changed files with 76 additions and 80 deletions

View File

@ -356,59 +356,71 @@ export default function ComplainsDetails({
>
{data.contents?.map((item: any, index: any, array: any) => {
return (
<div
key={item.id}
className="p-4 bg-white rounded-lg shadow-md "
>
<div className="flex items-center gap-4 justify-between">
<div>
<span className=" flex items-center justify-center w-8 h-8 bg-blue-100 rounded-full -start-4 ring-2 ring-blue bg-blue2 text-black">
<>
<div className="flex flex-row gap-2 ">
<div className="flex">
<span className=" flex items-center justify-center w-7 h-7 mt-1 mr-1 bg-blue-100 rounded-md -start-4 ring-2 ring-blue bg-blue2 text-white bg-blue">
{array.length - index}
</span>
<p className="">
<Badge>
{item.operationWithDescription.description}{" "}
توسط {item.sender == 0 ? "شهروند" : "بازرس"}
</Badge>
</p>
</div>
<div
key={item.id}
className="p-4 bg-white rounded-lg shadow-md w-full relative"
>
<div className="flex items-center sm:gap-4 justify-between flex-col sm:flex-row gap-1">
<div>
{/* <span className="absolute -top-5 right-0 flex items-center justify-center w-7 h-7 mt-1 mr-1 bg-blue-100 rounded-md -start-4 shadow-md bg-blue2 text-blue bg-white">
{array.length - index}
</span> */}
<p className="">
<Badge>
{
item.operationWithDescription
.description
}{" "}
توسط{" "}
{item.sender == 0 ? "شهروند" : "بازرس"}
</Badge>
</p>
</div>
<p className="">
<span className="text-[#7C838A] text-sm">
{convertFullTime(item.dateTime)}
</span>
</p>
</div>
<div className=" text-[#464646] mt-2">
<span className="text-[#7C838A] text-sm">
{item.text ? item.text : "-"}
</span>
</div>
{/* {item.media.length !== 0 && (
<p className="">
<span className="text-[#7C838A] text-sm">
{convertFullTime(item.dateTime)}
</span>
</p>
</div>
<div className=" text-[#464646] mt-2">
<span className="text-[#7C838A] text-sm">
{item.text ? item.text : "-"}
</span>
</div>
{/* {item.media.length !== 0 && (
<Separator className="mt-2 mb-1 " />
)} */}
<div className=" text-[#464646] mt-2">
<div className="flex flex-wrap items-center w-full gap-2 mt-2 text-xs max-md:flex-col">
{item?.media.map((item: any, index: number) => {
return (
<div
key={index}
className=" bg-gray-100 text-[#7C838A] w-full md:w-[30%] rounded-md h-12 p-2 flex justify-between gap-3 items-center cursor-pointer"
onClick={() =>
openFileInNewTab(
item.data,
item.mimeType,
item.title
)
}
>
<a className="flex items-center gap-2 truncate cursor-pointer ">
<File className="w-6 h-6 " />
<p className=" max-w-full truncate">
{item.title}
</p>
</a>
{/* <ArrowDownToLine
<div className=" text-[#464646] mt-2">
<div className="flex flex-wrap items-center w-full gap-2 mt-2 text-xs max-md:flex-col">
{item?.media.map(
(item: any, index: number) => {
return (
<div
key={index}
className=" bg-gray-100 text-[#7C838A] w-full md:w-[30%] rounded-md h-12 p-2 flex justify-between gap-3 items-center cursor-pointer"
onClick={() =>
openFileInNewTab(
item.data,
item.mimeType,
item.title
)
}
>
<a className="flex items-center gap-2 truncate cursor-pointer ">
<File className="w-6 h-6 " />
<p className=" max-w-full truncate">
{item.title}
</p>
</a>
{/* <ArrowDownToLine
className="cursor-pointer "
onClick={() =>
downloadFile(
@ -418,12 +430,15 @@ export default function ComplainsDetails({
)
}
/> */}
</div>
);
})}
</div>
);
}
)}
</div>
</div>
</div>
</div>
</div>
</>
);
})}
</div>

View File

@ -168,8 +168,8 @@ export default function InspectorOperations({
const formatSize = (size: number) => {
const string = formatBytes(size);
return (
<span className="" dir="ltr">
{string}
<span className="" >
{string[0]} {string[1]}
</span>
);
};

View File

@ -47,37 +47,18 @@ export function isAuthorized() {
export function bytesToMB(bytes: number) {
return Math.floor(bytes / (1024 * 1024));
}
export function formatBytes(bytes: number, decimals = 2) {
console.log(bytes);
if (!+bytes) return "0 Bytes";
const k = 1024;
const dm = decimals < 0 ? 0 : decimals;
const sizes = [
"بایت",
"کیلوبایت",
"مگابایت",
"گیگابایت",
"TiB",
"PiB",
"EiB",
"ZiB",
"YiB",
];
// const sizes = [
// "Bytes",
// "KB",
// "MB",
// "GiB",
// "TiB",
// "PiB",
// "EiB",
// "ZiB",
// "YiB",
// ];
const sizes = ["بایت", "کیلوبایت", "مگابایت", "گیگابایت", "ترابایت", "PiB", "EiB", "ZiB", "YiB"];
const i = Math.floor(Math.log(bytes) / Math.log(k));
const psFloaat = parseFloat((bytes / Math.pow(k, i)).toFixed(dm))
const sz = sizes[i]
// return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
return [psFloaat , sz]
return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
}