Task page bug fix

This commit is contained in:
2024-03-08 02:12:35 +01:00
parent 28098169b9
commit da26d5c24a
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -282,7 +282,7 @@ export default function FamilyTableNew({
setFamilyTask={setFamilyTask} setFamilyTask={setFamilyTask}
setActiveTask={setActiveTask} setActiveTask={setActiveTask}
activeTask={activeTask} activeTask={activeTask}
familyDetailsData={details.familyDetails.data} // familyDetailsData={details.familyDetails.data}
setUpdatePage={setUpdatePage} setUpdatePage={setUpdatePage}
/> />
)} )}
@@ -7,7 +7,7 @@ import PaginatedList from "../../Pagination/PaginatedList";
import LoadingSpinner from "../../Spinners/LoadingSpinner"; import LoadingSpinner from "../../Spinners/LoadingSpinner";
export default function FamilyNewTasks({ export default function FamilyNewTasks({
familyData = [], familyData,
className, className,
loader, loader,
accountDetails, accountDetails,
@@ -32,6 +32,7 @@ export default function FamilyNewTasks({
const handlePagination = (e) => handlePagingFunc(e, setCurrentPage); const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
console.log(familyData)
return ( return (
<div <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 ${ 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 ${
@@ -44,13 +45,13 @@ export default function FamilyNewTasks({
</div> </div>
) : ( ) : (
<> <>
{familyData.length && ( {familyData?.length && (
<div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full"> <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400"> <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody> <tbody>
{ {
<> <>
{familyData.length > 0 ? ( {familyData?.length > 0 ? (
currentTasks.map((value, index) => { currentTasks.map((value, index) => {
// find due date // find due date
const dueDate = value?.delivery_date.split(" ")[0]; const dueDate = value?.delivery_date.split(" ")[0];
@@ -149,7 +150,7 @@ export default function FamilyNewTasks({
prev={currentPage == 0 ? true : false} prev={currentPage == 0 ? true : false}
next={ next={
currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >= currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
familyData?.result_list.length familyData?.result_list?.length
? true ? true
: false : false
} }
@@ -64,6 +64,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
<div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto"> <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple"> <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
<h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide"> <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
{pathname === '/acc-family/activities' && "activities"}
{pathname === "/manage-family" {pathname === "/manage-family"
? `${state?.firstname}'s Suggested Task` ? `${state?.firstname}'s Suggested Task`
: "Suggest to Parent"} : "Suggest to Parent"}