Added assign popup dropdown, fixed the right api for my task page

This commit was merged in pull request #636.
This commit is contained in:
2024-03-11 18:15:31 +01:00
parent 00c7f65092
commit 4f675b30ef
6 changed files with 89 additions and 41 deletions
@@ -25,7 +25,7 @@ export default function FamilyPending({ familyData, image_link, loader }) {
handlePagingFunc(e, setCurrentPage);
};
console.log(image_link)
console.log(image_link);
return (
<div
@@ -10,33 +10,33 @@ export default function FamilyNewTasks({
familyData,
className,
loader,
accountDetails,
action,
image_link,
}) {
let navigate = useNavigate();
let { pathname } = useLocation();
// ...
const filteredFamilyData = useMemo(
() =>
familyData?.result_list?.filter(
(data) => data?.family_uid === accountDetails?.family_uid
),
[familyData, accountDetails]
let filteredFamilyData = useMemo(
() => familyData?.filter((data) => data.family_uid !== ""),
[familyData]
);
const [currentPage, setCurrentPage] = useState(0);
const indexOfFirstItem = Number(currentPage);
const indexOfLastItem =
Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
const currentTasks = familyData?.slice(indexOfFirstItem, indexOfLastItem);
const currentTasks = filteredFamilyData?.slice(
indexOfFirstItem,
indexOfLastItem
);
const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
return (
<div
className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[538px] overflow-hidden rounded-2xl section-shadow p-3 ${
familyData && "flex items-center justify-center"
familyData?.length <= 0 && "flex items-center justify-center"
}`}
>
{loader ? (
@@ -76,11 +76,9 @@ export default function FamilyNewTasks({
value?.currency_code,
value?.currency
);
let image = `${
familyData.session_image_server
}${localStorage.getItem("session_token")}/job/${
value.job_uid
}`;
let image = `${image_link}${localStorage.getItem(
"session_token"
)}/job/${value.job_uid}`;
return (
<tr
key={index}
@@ -133,7 +131,6 @@ export default function FamilyNewTasks({
state: {
...value,
pathname,
accountDetails,
},
});
}}
@@ -156,11 +153,11 @@ export default function FamilyNewTasks({
prev={currentPage == 0 ? true : false}
next={
currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
familyData?.result_list?.length
filteredFamilyData?.length
? true
: false
}
data={familyData?.result_list}
data={filteredFamilyData}
start={indexOfFirstItem}
stop={indexOfLastItem}
/>