diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index d9ed65e9..7cb5c52c 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import AssignRoleModel from "../AssignRole";
+import AssignRoleModel from "../AssignTask";
 import { useParams } from "react-router-dom";
 import EditActivityModal from "./EditActivityModal";
 import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
@@ -19,6 +19,7 @@ import {
 } from "../../../slices/apiDataManager";
 import { useDispatch } from "react-redux";
 import { refreshData } from "../../../slices/localVariablesSlice";
+import GlobalModel from "../../common/GlobalModel";
 
 const WorkItem = ({
   workItem,
@@ -98,15 +99,9 @@ const WorkItem = ({
   return (
     <>
       {isModalOpen && (
-        <div
-          className={`modal fade ${isModalOpen ? "show" : ""}`}
-          tabIndex="-1"
-          role="dialog"
-          style={{ display: isModalOpen ? "block" : "none" }}
-          aria-hidden={!isModalOpen}
-        >
-          <AssignRoleModel assignData={assigndata} onClose={closeModal} setAssigned={refreshWorkItem} />
-        </div>
+        <GlobalModel isOpen={isModalOpen} size="lg" closeModal={closeModal}>
+           <AssignRoleModel assignData={assigndata} onClose={closeModal} setAssigned={refreshWorkItem} />
+        </GlobalModel>
       )}
 
       {showModal && (
diff --git a/src/components/Project/ProjectModal.jsx b/src/components/Project/ProjectModal.jsx
index 0a740bd3..89f49694 100644
--- a/src/components/Project/ProjectModal.jsx
+++ b/src/components/Project/ProjectModal.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import AssignRole from './AssignRole'
+import AssignRole from './AssignTask'
 
 const ProjectModal = ({modalConfig,closeModal}) => {
    
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 04c2c1e2..d2b67362 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -11,6 +11,8 @@ import { useSearchParams } from "react-router-dom";
 import moment from "moment";
 import FilterIcon from "../../components/common/FilterIcon"; // Import the FilterIcon component
 import GlobalModel from "../../components/common/GlobalModel";
+import AssignTask from "../../components/Project/AssignTask";
+import SubTask from "../../components/Activities/SubTask";
 
 const DailyTask = () => {
   const [searchParams] = useSearchParams();
@@ -124,7 +126,8 @@ const DailyTask = () => {
 
   const openComment = () => setIsModalOpenComment(true);
   const closeCommentModal = () => setIsModalOpenComment(false);
-
+  const [ IsSubTaskNeeded, setIsSubTaskNeeded ] = useState( false )
+  const[SubTaskData,setSubTaskData] = useState()
   const handletask = (task) => {
     selectTask(task);
     openModal();
@@ -154,6 +157,24 @@ const DailyTask = () => {
     });
   };
 
+  const handleCloseAction = (IsSubTask) =>
+  {
+    if ( IsSubTask )
+    {
+      setIsSubTaskNeeded( true )
+      setIsModalOpenComment(false)
+   
+    } else
+    {
+      refetch( selectedProject, dateRange.startDate, dateRange.endDate );
+      setIsModalOpenComment(false)
+    }
+  }
+  const hanleCloseSubTask = () =>
+  {
+    setIsSubTaskNeeded( false )
+    setComment(null)
+  }
   return (
     <>
       <div
@@ -176,11 +197,18 @@ const DailyTask = () => {
            <ReportTaskComments
             commentsData={comments.task}
             actionAllow={comments.isActionAllow}
-          closeModal={closeCommentModal}
+            handleCloseAction={handleCloseAction}
+            closeModal={closeCommentModal}
         />
         </GlobalModel>
       )}
 
+      {IsSubTaskNeeded && (
+        <GlobalModel isOpen={IsSubTaskNeeded} size="lg" closeModal={hanleCloseSubTask}>
+            <SubTask assignData={comments.task} onClose={hanleCloseSubTask} />
+        </GlobalModel>
+      )}
+
       <div className="container-xxl flex-grow-1 container-p-y">
         <Breadcrumb
           data={[
@@ -206,30 +234,6 @@ const DailyTask = () => {
                   currentSelectedActivities={filters.selectedActivities}
                 />
               </div>
-              {/* <div className="col-md-4 col-12 text-center mb-2 mb-md-0">
-                <select
-                  name="project_select"
-                  aria-controls="DataTables_Table_0"
-                  className="form-select form-select-sm"
-                  value={selectedProject || ""}
-                  onChange={handleProjectChange}
-                  aria-label="Select Project"
-                  disabled={project_loading}
-                >
-                  {project_loading && (
-                    <option value="" disabled>
-                      Loading Projects...
-                    </option>
-                  )}
-                  {!project_loading &&
-                    projects &&
-                    projects?.map((project) => (
-                      <option value={project.id} key={project.id}>
-                        {project.name}
-                      </option>
-                    ))}
-                </select>
-              </div> */}
             </div>
             <div className="table-responsive text-nowrap mt-3">
               <table className="table">