admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

user could not create subtask completed equal to approve task and fixd error imported subTask component

Browse Source
This commit is contained in:
pramod.mahajan 2025-09-29 17:29:11 +05:30
parent 02600308e8
commit 02dcd8611f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Activities/ReportTaskComments.jsx
View File

@ -110,6 +110,8 @@ const ReportTaskComments = ({
approvedTask: defaultCompletedTask || 0, approvedTask: defaultCompletedTask || 0,
}); });
}, [defaultCompletedTask]); }, [defaultCompletedTask]);
const completed_Task = watch("approvedTask")
return ( return (
<div className="p-2 p-sm-1"> <div className="p-2 p-sm-1">
<div className="modal-body p-sm-4 p-0"> <div className="modal-body p-sm-4 p-0">
@ -339,13 +341,13 @@ const ReportTaskComments = ({
<div <div
className={` ${ className={` ${
actionAllow && !commentsData.approvedBy actionAllow && !commentsData.approvedBy
? " d-flex justify-content-between" ? " d-flex justify-content-between align-items-center"
: "text-end" : "text-end"
} mt-2`} } mt-2`}
> >
<div <div
className={`form-check ${ className={`form-check ${
!(actionAllow && !commentsData.approvedBy) && "d-none" !(actionAllow && !commentsData.approvedBy && defaultCompletedTask > completed_Task ) && "d-none"
} `} } `}
> >
<input <input
@ -383,7 +385,7 @@ const ReportTaskComments = ({
: "Comment"} : "Comment"}
</button> </button>
</span> </span>
</div> </div>
</form> </form>
<ul <ul

1
src/pages/DailyProgressReport/DailyProgrssReport.jsx
View File

@ -7,6 +7,7 @@ import ReportTaskComments from "../../components/Activities/ReportTaskComments";
import ReportTask from "../../components/Activities/ReportTask"; import ReportTask from "../../components/Activities/ReportTask";
import TaskReportFilterPanel from "../../components/DailyProgressRport/TaskReportFilterPanel"; import TaskReportFilterPanel from "../../components/DailyProgressRport/TaskReportFilterPanel";
import { useFab } from "../../Context/FabContext"; import { useFab } from "../../Context/FabContext";
import SubTask from "../../components/Activities/SubTask";
const DailyProgrssContext = createContext(); const DailyProgrssContext = createContext();
export const useDailyProgrssContext = () => { export const useDailyProgrssContext = () => {