Fixed suggested task bug
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -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 ${
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user