From da26d5c24a3481168562fd0d958dfb802e7ae988 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Fri, 8 Mar 2024 02:12:35 +0100
Subject: [PATCH 1/3] Task page bug fix

---
 src/components/FamilyAcc/FamilyTableNew.jsx      | 2 +-
 src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx | 9 +++++----
 src/components/FamilyPopup/SuggestTask.jsx       | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyTableNew.jsx b/src/components/FamilyAcc/FamilyTableNew.jsx
index bc1de5d..741cb84 100644
--- a/src/components/FamilyAcc/FamilyTableNew.jsx
+++ b/src/components/FamilyAcc/FamilyTableNew.jsx
@@ -282,7 +282,7 @@ export default function FamilyTableNew({
           setFamilyTask={setFamilyTask}
           setActiveTask={setActiveTask}
           activeTask={activeTask}
-          familyDetailsData={details.familyDetails.data}
+        //   familyDetailsData={details.familyDetails.data}
           setUpdatePage={setUpdatePage}
         />
       )}
diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
index aa65341..c39e3fc 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
@@ -7,7 +7,7 @@ import PaginatedList from "../../Pagination/PaginatedList";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
 export default function FamilyNewTasks({
-  familyData = [],
+  familyData,
   className,
   loader,
   accountDetails,
@@ -32,6 +32,7 @@ export default function FamilyNewTasks({
 
   const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
 
+  console.log(familyData)
   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 ${
@@ -44,13 +45,13 @@ export default function FamilyNewTasks({
         </div>
       ) : (
         <>
-          {familyData.length && (
+          {familyData?.length && (
             <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">
                 <tbody>
                   {
                     <>
-                      {familyData.length > 0 ? (
+                      {familyData?.length > 0 ? (
                         currentTasks.map((value, index) => {
                           // find due date
                           const dueDate = value?.delivery_date.split(" ")[0];
@@ -149,7 +150,7 @@ export default function FamilyNewTasks({
                 prev={currentPage == 0 ? true : false}
                 next={
                   currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-                  familyData?.result_list.length
+                  familyData?.result_list?.length
                     ? true
                     : false
                 }
diff --git a/src/components/FamilyPopup/SuggestTask.jsx b/src/components/FamilyPopup/SuggestTask.jsx
index a46c0d6..958a78f 100644
--- a/src/components/FamilyPopup/SuggestTask.jsx
+++ b/src/components/FamilyPopup/SuggestTask.jsx
@@ -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-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">
+            {pathname === '/acc-family/activities' && "activities"}
             {pathname === "/manage-family"
               ? `${state?.firstname}'s Suggested Task`
               : "Suggest to Parent"}

From 69d711eddc53216a6e35ec37ce7afd1ae7fad8c2 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Fri, 8 Mar 2024 03:47:57 +0100
Subject: [PATCH 2/3] Fixed suggested task bug

---
 src/components/FamilyAcc/FamilyActivities.jsx |  2 +-
 src/components/FamilyAcc/FamilyTableNew.jsx   | 17 +++---------
 .../FamilyAcc/Tabs/FamilyNewTasks.jsx         |  1 +
 .../FamilyAcc/Tabs/FamilyNewWaitlist.jsx      |  3 +--
 src/components/FamilyPopup/SuggestTask.jsx    | 26 ++++++++++---------
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyActivities.jsx b/src/components/FamilyAcc/FamilyActivities.jsx
index 0cbfa89..75f8ef4 100644
--- a/src/components/FamilyAcc/FamilyActivities.jsx
+++ b/src/components/FamilyAcc/FamilyActivities.jsx
@@ -23,7 +23,7 @@ export default function FamilyActivities() {
                 <span className={``}>Tasks & Chores</span>
               </h1>
             </div>
-            <Link className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium dark:text-white h-12 px-2 flex items-center gap-2" to="/acc-family">
+            <Link className="item-content relative text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]" to="/acc-family">
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 fill="none"
diff --git a/src/components/FamilyAcc/FamilyTableNew.jsx b/src/components/FamilyAcc/FamilyTableNew.jsx
index 741cb84..75685bb 100644
--- a/src/components/FamilyAcc/FamilyTableNew.jsx
+++ b/src/components/FamilyAcc/FamilyTableNew.jsx
@@ -85,11 +85,6 @@ export default function FamilyTableNew({
         familyData={details.familyTasks.data}
         accountDetails={accountDetails}
       />
-    //   <FamilyWaitlist
-    //     familyData={details.familyWaitList.data}
-    //     accountDetails={accountDetails}
-    //     loader={details.familyWaitList.loading}
-    //   />
     ),
     Waiting: (
       <FamilyWaitlist
@@ -132,25 +127,23 @@ export default function FamilyTableNew({
           apiCall.ManageFamilyNewWaitlist(),
         ]);
 
-        console.log("Task me",familyTasksData)
-
         let tasksData = familyTasksData?.data?.result_list;
         let familyData = restOfFamilyData?.data?.result_list;
 
         //   const familyData = familyRes.data;
         //   const tasksData = tasksRes.data;
 
-        let familyWaitingData = familyData.filter(
+        let familyWaitingData = familyData?.filter(
           (item) => item.status_text === "Waiting"
         );
-        let familyPendingData = familyData.filter(
+        let familyPendingData = familyData?.filter(
           (item) => item.status_text !== "Waiting"
         );
 
         console.log({
           Waitings: familyWaitingData,
           Pending: familyPendingData,
-          Tasks: tasksData
+          Tasks: tasksData,
         });
 
         // Function to check for errors in data
@@ -215,8 +208,6 @@ export default function FamilyTableNew({
     };
   }, []);
 
-  console.log("God please>> ", details.familyWaitList);
-
   return (
     <div
       className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow h-full ${
@@ -282,7 +273,7 @@ export default function FamilyTableNew({
           setFamilyTask={setFamilyTask}
           setActiveTask={setActiveTask}
           activeTask={activeTask}
-        //   familyDetailsData={details.familyDetails.data}
+          //   familyDetailsData={details.familyDetails.data}
           setUpdatePage={setUpdatePage}
         />
       )}
diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
index c39e3fc..60c1062 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
@@ -33,6 +33,7 @@ export default function FamilyNewTasks({
   const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
 
   console.log(familyData)
+  console.log(typeof familyData?.length)
   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 ${
diff --git a/src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx b/src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx
index 8d928e4..59f190b 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx
@@ -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 (
                       <tr
@@ -105,7 +105,6 @@ const FamilyNewWaitlist = ({
                         <td className="text-right py-4 px-2">
                           <button
                             onClick={() => openPopUp(value)}
-                            disabled
                             className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                           >
                             View
diff --git a/src/components/FamilyPopup/SuggestTask.jsx b/src/components/FamilyPopup/SuggestTask.jsx
index 958a78f..065ab41 100644
--- a/src/components/FamilyPopup/SuggestTask.jsx
+++ b/src/components/FamilyPopup/SuggestTask.jsx
@@ -64,9 +64,10 @@ 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-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">
-            {pathname === '/acc-family/activities' && "activities"}
             {pathname === "/manage-family"
               ? `${state?.firstname}'s Suggested Task`
+              : pathname === "/acc-family/activities"
+              ? "Suggested Task"
               : "Suggest to Parent"}
           </h1>
           <button
@@ -98,7 +99,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
         <Formik
           initialValues={initialValues}
           onSubmit={
-            pathname !== "/manage-family"
+            pathname !== "/manage-family" ||
+            pathname !== "/acc-family/activities"
               ? handleSuggestedTask
               : handleParentSuggestion
           }
@@ -123,16 +125,16 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                     <div className="field w-full mb-[15px]">
                       <InputCom
                         fieldClass={
-                          pathname ===
-                          "/manage-family"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
                             ? "px-2"
                             : "px-6"
                         }
                         label="Title"
                         labelClass="tracking-wide"
                         inputBg={
-                          pathname ===
-                          "/manage-family"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
                             ? "bg-white"
                             : "bg-slate-100"
                         }
@@ -169,8 +171,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                         id="description"
                         rows="5"
                         className={`input-field pt-2 placeholder:text-base text-dark-gray dark:text-white w-full ${
-                          pathname ===
-                          "/manage-family"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
                             ? "px-2 h-[110px]"
                             : "bg-slate-100 px-3 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] h-[130px]"
                         }`}
@@ -183,8 +185,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                     </div>
 
                     {/* Radio buttons for family */}
-                    {pathname ===
-                    "/manage-family" ? (
+                    {pathname === "/manage-family" ||
+                    pathname === "/acc-family/activities" ? (
                       <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
                         <div id="my-radio-group" className="sr-only">
                           Parent suggested next step
@@ -250,8 +252,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                       disabled={props.isSubmitting}
                       className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full transition duration-150 ease-in-out flex items-center"
                     >
-                      {pathname !==
-                      "/manage-family" ? (
+                      {pathname !== "/manage-family" ||
+                      pathname === "/acc-family/activities" ? (
                         <>
                           {submitTask.loading
                             ? "Submitting Task"

From 14566de0377c1273938bcc6e4b10c5b679453ffe Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Fri, 8 Mar 2024 04:32:19 +0100
Subject: [PATCH 3/3] .

---
 .../FamilyAcc/Tabs/FamilyNewPending.jsx       | 20 +++++++++++--------
 .../FamilyAcc/Tabs/FamilyNewTasks.jsx         |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx
index a09ed1f..9328ff6 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx
@@ -1,5 +1,4 @@
 import { useMemo, useState } from "react";
-import localImgLoad from "../../../lib/localImgLoad";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import { PaginatedList, handlePagingFunc } from "../../Pagination";
 import PendingJobsPopout from "../../jobPopout/PendingJobsPopout";
@@ -14,10 +13,10 @@ export default function FamilyPending({
 
   let filteredFamilyData = useMemo(
     () =>
-      familyData?.result_list?.filter(
+      familyData?.filter(
         (data) => data?.family_uid === accountDetails?.family_uid
       ),
-    [accountDetails?.family_uid, familyData?.result_list]
+    [accountDetails?.family_uid, familyData]
   );
 
   const [currentPage, setCurrentPage] = useState(0);
@@ -25,7 +24,7 @@ export default function FamilyPending({
   const indexOfFirstItem = Number(currentPage);
   const indexOfLastItem =
     Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
-  const currentPendingTasks = filteredFamilyData?.slice(
+  const currentPendingTasks = familyData?.slice(
     indexOfFirstItem,
     indexOfLastItem
   );
@@ -34,13 +33,14 @@ export default function FamilyPending({
     handlePagingFunc(e, setCurrentPage);
   };
 
+  console.log(familyData);
   return (
     <div
       className={`update-table w-full p-3 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow lg:min-h-[538px] ${
         className || ""
       }`}
     >
-      {filteredFamilyData && (
+      {familyData && (
         <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">
             <tbody>
@@ -54,7 +54,11 @@ export default function FamilyPending({
                         value?.currency_code,
                         value?.currency
                       );
-                      let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                      let image = `${
+                        familyData.session_image_server
+                      }${localStorage.getItem("session_token")}/job/${
+                        value.job_uid
+                      }`;
                       return (
                         <tr
                           key={index}
@@ -136,8 +140,8 @@ export default function FamilyPending({
           <PaginatedList
             onClick={handlePagination}
             prev={currentPage == 0}
-            next={currentPage + itemsPerPage >= filteredFamilyData.length}
-            data={filteredFamilyData}
+            next={currentPage + itemsPerPage >= familyData.length}
+            data={familyData}
             start={indexOfFirstItem}
             stop={indexOfLastItem}
           />
diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
index 60c1062..e3ee045 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
@@ -33,7 +33,7 @@ export default function FamilyNewTasks({
   const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
 
   console.log(familyData)
-  console.log(typeof familyData?.length)
+  console.log(typeof familyData)
   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 ${