Organization_Management : Organization Hierarchy #443

Merged
pramod.mahajan merged 180 commits from Organization_Management into main 2025-09-30 09:07:31 +00:00
2 changed files with 6 additions and 3 deletions
Showing only changes of commit 02dcd8611f - Show all commits

View File

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

View File

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