diff --git a/src/index.css b/src/index.css
index 96f19f7b..21f8a532 100644
--- a/src/index.css
+++ b/src/index.css
@@ -130,3 +130,11 @@ button:focus-visible {
 .spin {
   animation: spin 1s linear infinite;
 }
+.popover-body {
+  padding: 0 !important;
+}
+.custom-popover{
+  max-height: 100px;
+  overflow: auto;
+  
+}
\ No newline at end of file
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index e220a6d0..9345ef4b 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import Breadcrumb from "../../components/common/Breadcrumb";
 import { dailyTask } from "../../data/masters";
@@ -38,6 +38,7 @@ const DailyTask = () => {
 
       setInitialized(true);
     }
+    
   }, [project_lodaing, projects, projectId, selectedProject, initialized]);
 
   const dispatch = useDispatch(selectedProject);
@@ -55,11 +56,22 @@ const DailyTask = () => {
   );
 
   const [TaskLists, setTaskLists] = useState([]);
+  const [dates, setDates] = useState([]);
+  const popoverRefs = useRef([]);
 
   useEffect(() => {
     setTaskLists(TaskList);
   }, [TaskList, selectedProject]);
 
+  useEffect(() => {
+    const AssignmentDates = [
+      ...new Set(TaskLists.map((task) => task.assignmentDate.split("T")[0])),
+    ].sort((a, b) => new Date(b) - new Date(a));
+    setDates(AssignmentDates);
+
+    
+  }, [TaskLists]);
+
   const [selectedTask, selectTask] = useState(null);
   const [comments, setComment] = useState(null);
 
@@ -75,6 +87,21 @@ const DailyTask = () => {
     selectTask(task);
     openModal();
   };
+
+  useEffect(() => {
+    popoverRefs.current.forEach((el) => {
+      console.log(el)
+      if (el) {
+        new bootstrap.Popover(el, {
+          trigger: "focus",
+          placement: "left",
+          html: true,
+          content: el.getAttribute("data-bs-content"), // use inline content from attribute
+        });
+      }
+    });
+  }, [dates]);
+
   return (
     <>
       <div
@@ -165,117 +192,155 @@ const DailyTask = () => {
                       </td>
                     </tr>
                   )}
-                  {project_lodaing &&  <tr>
-                      <td colSpan={7} className="text-center">
-                        Loading...
-                      </td>
-                    </tr>}
-                  {TaskLists?.length === 0 && !task_loading && !project_lodaing &&(
-                    <tr>
-                      <td colSpan={7} className="text-center">
-                        No Task Found
-                      </td>
-                    </tr>
-                  )}
-
-                  {TaskLists.map((task, index) => {
+                  {dates.map((date, i) => {
                     return (
-                      <React.Fragment key={index}>
+                      <React.Fragment key={i}>
                         <tr>
-                          <td className="flex-wrap text-start">
-                            <div>
-                              {task.workItem.activityMaster.activityName ||
-                                "No Activity Name"}
-                            </div>
-                            <div>
-                              {" "}
-                              <label className=" col-form-label text-sm">
-                                {" "}
-                                {
-                                  task?.workItem?.workArea?.floor?.building
-                                    ?.name
-                                }{" "}
-                                <i
-                                  className="bx bx-chevron-right text-sm"
-                                  style={{ fontSize: ".75rem" }}
-                                ></i>{" "}
-                                {task?.workItem?.workArea?.floor?.floorName}{" "}
-                                <i
-                                  className="bx bx-chevron-right text-sm"
-                                  style={{ fontSize: ".75rem" }}
-                                >
-                                  {" "}
-                                </i>
-                                {task?.workItem?.workArea?.areaName}
-                              </label>
-                            </div>
-                          </td>
-                          <td>
-                            {task.plannedTask || "NA"} /
-                            {task.workItem.plannedWork -
-                              task.workItem.completedWork}
-                          </td>
-                          <td>{task.completedTask}</td>
-                          <td>{formatDate(task.assignmentDate)}</td>
-                          <td className="text-center">
-                            <div className="d-flex align-items-center avatar-group justify-content-center">
-                              {task.teamMembers.slice(0, 3).map((member) => (
-                                <div
-                                  key={member.id}
-                                  data-bs-toggle="tooltip"
-                                  data-bs-html="true"
-                                  data-popup="tooltip-custom"
-                                  data-bs-placement="top"
-                                  title={`${member.firstName} ${member.lastName}`}
-                                  className="avatar avatar-xs"
-                                >
-                                  {/* <img src="..." alt="Avatar" className="rounded-circle pull-up" /> */}
-                                  <span className="avatar-initial rounded-circle bg-label-primary">
-                                    {member?.firstName.slice(0, 1)}
-                                  </span>
-                                </div>
-                              ))}
-                              {task.teamMembers.length > 3 && (
-                                <div
-                                  className="avatar avatar-xs"
-                                  data-bs-toggle="tooltip"
-                                  data-bs-placement="bottom"
-                                  title={`${task.teamMembers.length - 3} more`}
-                                >
-                                  <span className="avatar-initial rounded-circle bg-label-secondary pull-up">
-                                    +{task.teamMembers.length - 3}
-                                  </span>
-                                </div>
-                              )}
-                            </div>
-                          </td>
-                          <td className="text-center">
-                            <div className="d-flex justify-content-center">
-                              <button
-                                type="button"
-                                className={`btn btn-xs btn-primary ${
-                                  task.completedTask > 0 ? "d-none" : ""
-                                }`}
-                                onClick={() => {
-                                  selectTask(task);
-                                  openModal();
-                                }}
-                              >
-                                Report
-                              </button>
-                              <button
-                                type="button"
-                                className="btn btn-xs btn-primary ms-2"
-                                onClick={() => {
-                                  setComment(task);
-                                  openComment();
-                                }}
-                              >
-                                Comment
-                              </button>
-                            </div>
+                          <td colSpan={7} className="text-start">
+                            <strong>{date}</strong>
                           </td>
                         </tr>
+                        {TaskLists.filter((task) =>
+                          task.assignmentDate.includes(date)
+                        ).map((task, index) => {
+                          const refIndex = index * 10 + i;
+                          console.log(refIndex)
+                          return (
+                            <React.Fragment key={index}>
+                              <tr>
+                                <td className="flex-wrap text-start">
+                                  <div>
+                                    {task.workItem.activityMaster
+                                      .activityName || "No Activity Name"}
+                                  </div>
+                                  <div>
+                                    {" "}
+                                    <label className=" col-form-label text-sm">
+                                      {" "}
+                                      {
+                                        task?.workItem?.workArea?.floor
+                                          ?.building?.name
+                                      }{" "}
+                                      <i
+                                        className="bx bx-chevron-right text-sm"
+                                        style={{ fontSize: ".75rem" }}
+                                      ></i>{" "}
+                                      {
+                                        task?.workItem?.workArea?.floor
+                                          ?.floorName
+                                      }{" "}
+                                      <i
+                                        className="bx bx-chevron-right text-sm"
+                                        style={{ fontSize: ".75rem" }}
+                                      >
+                                        {" "}
+                                      </i>
+                                      {task?.workItem?.workArea?.areaName}
+                                    </label>
+                                  </div>
+                                </td>
+                                <td>
+                                  {task.plannedTask || "NA"} /
+                                  {task.workItem.plannedWork -
+                                    task.workItem.completedWork}
+                                </td>
+                                <td>{task.completedTask}</td>
+                                <td>{formatDate(task.assignmentDate)}</td>
+                                <td className="text-center">
+                                  <div
+                                    key={refIndex}
+                                    ref={(el) =>
+                                      (popoverRefs.current[refIndex] = el)
+                                    }
+                                    tabIndex="0"
+                                    className="d-flex align-items-center avatar-group justify-content-center"
+                                    data-bs-toggle="popover"
+                                    data-bs-trigger="focus"
+                                    data-bs-placement="left"
+                                    data-bs-html="true"
+                                    data-bs-content={`
+                                      <div class="border border-secondary rounded custom-popover p-2 px-3">
+                                        ${task.teamMembers
+                                          .map(
+                                            (member) => `
+                                            <div class="d-flex align-items-center gap-2 mb-2">
+                                              <div class="avatar avatar-xs">
+                                                <span class="avatar-initial rounded-circle bg-label-primary">
+                                                  ${member?.firstName?.charAt(0) || ""}${member?.lastName?.charAt(0) || ""}
+                                                </span>
+                                              </div>
+                                              <span>${member.firstName} ${member.lastName}</span>
+                                            </div>
+                                          `
+                                          )
+                                          .join('')}
+                                      </div>
+                                    `}
+                                  >
+                                    {task.teamMembers
+                                      .slice(0, 3)
+                                      .map((member) => (
+                                        <div
+                                          key={member.id}
+                                          data-bs-toggle="tooltip"
+                                          data-bs-html="true"
+                                          data-popup="tooltip-custom"
+                                          data-bs-placement="top"
+                                          title={`${member.firstName} ${member.lastName}`}
+                                          className="avatar avatar-xs"
+                                        >
+                                          {/* <img src="..." alt="Avatar" className="rounded-circle pull-up" /> */}
+                                          <span className="avatar-initial rounded-circle bg-label-primary">
+                                            {member?.firstName.slice(0, 1)}
+                                          </span>
+                                        </div>
+                                      ))}
+                                    {task.teamMembers.length > 3 && (
+                                      <div
+                                        className="avatar avatar-xs"
+                                        data-bs-toggle="tooltip"
+                                        data-bs-placement="bottom"
+                                        title={`${
+                                          task.teamMembers.length - 3
+                                        } more`}
+                                      >
+                                        <span className="avatar-initial rounded-circle bg-label-secondary pull-up">
+                                          +{task.teamMembers.length - 3}
+                                        </span>
+                                      </div>
+                                    )}
+                                  </div>
+                                </td>
+                                <td className="text-center">
+                                  <div className="d-flex justify-content-center">
+                                    <button
+                                      type="button"
+                                      className={`btn btn-xs btn-primary ${
+                                        task.completedTask > 0 ? "d-none" : ""
+                                      }`}
+                                      onClick={() => {
+                                        selectTask(task);
+                                        openModal();
+                                      }}
+                                    >
+                                      Report
+                                    </button>
+                                    <button
+                                      type="button"
+                                      className="btn btn-xs btn-primary ms-2"
+                                      onClick={() => {
+                                        setComment(task);
+                                        openComment();
+                                      }}
+                                    >
+                                      Comment
+                                    </button>
+                                  </div>
+                                </td>
+                              </tr>
+                            </React.Fragment>
+                          );
+                        })}
                       </React.Fragment>
                     );
                   })}