From 02dcd8611f72b28befb7aad98c9510ec7a4ad961 Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Mon, 29 Sep 2025 17:29:11 +0530
Subject: [PATCH] user could not create subtask completed equal to approve task
 and fixd error imported subTask component

---
 src/components/Activities/ReportTaskComments.jsx     | 8 +++++---
 src/pages/DailyProgressReport/DailyProgrssReport.jsx | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Activities/ReportTaskComments.jsx b/src/components/Activities/ReportTaskComments.jsx
index 60a81ff3..548cb73f 100644
--- a/src/components/Activities/ReportTaskComments.jsx
+++ b/src/components/Activities/ReportTaskComments.jsx
@@ -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
diff --git a/src/pages/DailyProgressReport/DailyProgrssReport.jsx b/src/pages/DailyProgressReport/DailyProgrssReport.jsx
index 96d9de6c..282ab27c 100644
--- a/src/pages/DailyProgressReport/DailyProgrssReport.jsx
+++ b/src/pages/DailyProgressReport/DailyProgrssReport.jsx
@@ -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 = () => {