WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed underlying bugs

Browse Source
This commit was merged in pull request #277.
This commit is contained in:
Chukwumdiebube Ojinta
2023-07-08 23:27:10 +01:00
parent eb01e35c75
commit 3eb6960cc7
2 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
+50 -47
View File
@@ -94,6 +94,7 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
for (let field in requiredFields) { for (let field in requiredFields) {
if (requiredFields[field] == "") { if (requiredFields[field] == "") {
// let currencyErrMsg = field == "country" && "currency"
setRequestStatus({ setRequestStatus({
loading: false, loading: false,
status: false, status: false,
@@ -154,8 +155,6 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
}); });
}; };
console.log("state >>--<<", familyDetails);
useEffect(() => { useEffect(() => {
const reqData = { const reqData = {
limit: 30, limit: 30,
@@ -365,58 +364,62 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
</div> </div>
{/* BTN */} {/* BTN */}
<div className="p-2 border-t-2 flex justify-end items-center gap-3"> <div className="py-2 px-4 border-t-2 flex justify-between items-center">
{/* error or success display */} {/* error or success display */}
{requestStatus.message != "" && <div className="w-auto h-auto flex items-center">
(!requestStatus.status ? ( {requestStatus.message != "" &&
<div (!requestStatus.status ? (
className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
>
{requestStatus.message}
</div>
) : (
requestStatus.status && (
<div <div
className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`} className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
> >
{requestStatus.message} {requestStatus.message}
</div> </div>
) ) : (
))} requestStatus.status && (
<div
className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
>
{requestStatus.message}
</div>
)
))}
</div>
{/* End of error or success display */} {/* End of error or success display */}
<button <div className="w-auto h-auto flex items-center gap-3">
disabled={requestStatus.loading} <button
onClick={action} disabled={requestStatus.loading}
type="button" onClick={action}
className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer" type="button"
> className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
<span className="text-gradient">Close</span> >
</button> <span className="text-gradient">Close</span>
<div className=""> </button>
{requestStatus.loading ? ( <div className="">
<LoadingSpinner color="sky-blue" size="8" /> {requestStatus.loading ? (
) : taskType == "select" ? ( <LoadingSpinner color="sky-blue" size="8" />
<button ) : taskType == "select" ? (
type="button" <button
disabled={requestStatus.loading} type="button"
onClick={assignFamilyTask} disabled={requestStatus.loading}
className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer" onClick={assignFamilyTask}
> className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
Assign >
</button> Assign
) : ( </button>
<button ) : (
type="button" <button
disabled={requestStatus.loading} type="button"
onClick={assignFamilyTask} disabled={requestStatus.loading}
className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer" onClick={assignFamilyTask}
> className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
{`Assign to ${ >
familyDetails?.firstname || details.firstName {`Assign to ${
}`} familyDetails?.firstname || details?.firstName
</button> }`}
)} </button>
)}
</div>
</div> </div>
</div> </div>
</> </>
src/components/FamilyPopup/SuggestTask.jsx
+10 -7
View File
@@ -16,7 +16,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
}); });
const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task"); const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");
const switchNextStep = (value) => { const switchNextStep = ({ target: value }) => {
setSuggestedNextStep(value); setSuggestedNextStep(value);
}; };
@@ -52,7 +52,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
const handleParentSuggestion = (values) => { const handleParentSuggestion = (values) => {
if (suggestedNextStep == "Send Task") { if (suggestedNextStep == "Send Task") {
let firstName = state?.firstname; let firstName = state?.firstname;
let family_uid = state?.family_uid let family_uid = state?.family_uid;
continuePopupData({ ...details, firstName, family_uid }); continuePopupData({ ...details, firstName, family_uid });
} }
onClose(); onClose();
@@ -176,7 +176,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
</div> </div>
{/* Radio buttons for family */} {/* Radio buttons for family */}
{pathname === "/manage-family" && ( {pathname === "/manage-family" ? (
<div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative"> <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
<div id="my-radio-group" className="sr-only"> <div id="my-radio-group" className="sr-only">
Parent suggested next step Parent suggested next step
@@ -194,18 +194,21 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
<label <label
role="group" role="group"
key={idx} key={idx}
htmlFor="parent-suggested" htmlFor={`parent-suggested-${idx}`}
className={`transition duration-150 ease-in-out parent-suggest`}
> >
<input <input
type="radio" type="radio"
name="parent-suggested" name="parent-suggested"
value={title} value={title}
checked={title == suggestedNextStep} checked={suggestedNextStep === title}
onChange={switchNextStep} onChange={switchNextStep}
className={`transition duration-150 ease-in-out parent-suggest`} className={`transition duration-150 ease-in-out parent-suggest`}
/> />
<span <span
onClick={switchNextStep} onClick={() => setSuggestedNextStep(title)}
id={`parent-suggested-${idx}`}
name="parent-suggested"
className={`ml-1 ${ className={`ml-1 ${
title == "Not Now" title == "Not Now"
? "text-red-500" ? "text-red-500"
@@ -220,7 +223,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
))} ))}
</div> </div>
</div> </div>
)} ) : null}
</div> </div>
</div> </div>