diff --git a/src/components/FamilyAcc/FamilyActivities.jsx b/src/components/FamilyAcc/FamilyActivities.jsx index 75f8ef4..c93649c 100644 --- a/src/components/FamilyAcc/FamilyActivities.jsx +++ b/src/components/FamilyAcc/FamilyActivities.jsx @@ -23,7 +23,7 @@ export default function FamilyActivities() { Tasks & Chores - + item.status_text === "Waiting" - ); - let familyPendingData = familyData?.filter( - (item) => item.status_text !== "Waiting" - ); - - console.log({ - Waitings: familyWaitingData, - Pending: familyPendingData, - Tasks: tasksData, - }); + let _familyWaitData = familyWaitingRes?.data?.result_list; + let familyPendingData = familyPendingRes?.data?.result_list; // Function to check for errors in data const checkDataError = (data) => data?.internal_return < 0; if ( checkDataError(tasksData) || - checkDataError(familyWaitingData) || + checkDataError(_familyWaitData) || checkDataError(familyPendingData) ) { return; @@ -159,7 +146,7 @@ export default function FamilyTableNew({ setDetails({ familyTasks: { loading: false, data: tasksData }, - familyWaitList: { loading: false, data: familyWaitingData }, + familyWaitList: { loading: false, data: _familyWaitData }, familyPending: { loading: false, data: familyPendingData }, }); } catch (error) { diff --git a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx index 9328ff6..9a39eb3 100644 --- a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx @@ -111,7 +111,7 @@ export default function FamilyPending({ - +
) : ( <> - {currentTask && ( + {familyData && (
@@ -66,7 +66,7 @@ const FamilyNewWaitlist = ({ const selectedImage = require(`../../../assets/images/family/${ value?.banner || "default.jpg" }`); - console.log("VALUE", value); + // console.log("VALUE", value); // let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}` return ( = familyData?.length} - data={currentTask} + data={familyData} start={indexOfFirstItem} stop={indexOfLastItem} /> diff --git a/src/components/FamilyAcc/index.jsx b/src/components/FamilyAcc/index.jsx index 08f74bd..7e200f0 100644 --- a/src/components/FamilyAcc/index.jsx +++ b/src/components/FamilyAcc/index.jsx @@ -165,12 +165,12 @@ export default function FamilyAcc() {
- + Activities @@ -178,7 +178,7 @@ export default function FamilyAcc() {