Merge branch 'Ashutosh_Bug#181_Order_By_AssignmentDate' into Issue_May_2W

public/assets/css/default.css

@@ -175,3 +175,7 @@
 .text-darkgreen {
   color: #16a085;
 }
+
+.table-row-header {
+  background-color: #efefef;
+}

src/components/Activities/ReportTask.jsx

@@ -43,7 +43,7 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
       };
 
       let response = await TasksRepository.reportTask(reportData);
-      showToast("succesfully", "success");
+      showToast("Task reported successfully.", "success");
       refetch();
       closeModal();
     } catch (error) {

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;
+  
+}

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";
@@ -55,11 +55,20 @@ 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 +84,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
@@ -117,7 +141,7 @@ const DailyTask = () => {
               <div className="col-6 text-start">
                 <DateRangePicker
                   onRangeChange={setDateRange}
-                  DateDifference="1"
+                  DateDifference="6"
                 />
               </div>
               <div className="col-sm-3 col-6 text-end mb-1">
@@ -157,7 +181,6 @@ const DailyTask = () => {
                   </tr>
                 </thead>
                 <tbody className="table-border-bottom-0">
-
                   {task_loading && (
                     <tr>
                       <td colSpan={7} className="text-center">
@@ -165,41 +188,43 @@ const DailyTask = () => {
                       </td>
                     </tr>
                   )}
-                  {project_lodaing &&  <tr>
+                  {dates.map((date, i) => {
-                      <td colSpan={7} className="text-center">
+                    return (
-                        Loading...
+                      <React.Fragment key={i}>
-                      </td>
+                        <tr className="table-row-header">
-                    </tr>}
+                          <td colSpan={7} className="text-start">
-                  {TaskLists?.length === 0 && !task_loading && !project_lodaing &&(
+                            <strong>{date}</strong>
-                    <tr>
-                      <td colSpan={7} className="text-center">
-                        No Task Found
                           </td>
                         </tr>
-                  )}
+                        {TaskLists.filter((task) =>
-
+                          task.assignmentDate.includes(date)
-                  {TaskLists.map((task, index) => {
+                        ).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 ||
+                                    {task.workItem.activityMaster
-                                "No Activity Name"}
+                                      .activityName || "No Activity Name"}
                                   </div>
                                   <div>
                                     {" "}
                                     <label className=" col-form-label text-sm">
                                       {" "}
                                       {
-                                  task?.workItem?.workArea?.floor?.building
+                                        task?.workItem?.workArea?.floor
-                                    ?.name
+                                          ?.building?.name
                                       }{" "}
                                       <i
                                         className="bx bx-chevron-right text-sm"
                                         style={{ fontSize: ".75rem" }}
                                       ></i>{" "}
-                                {task?.workItem?.workArea?.floor?.floorName}{" "}
+                                      {
+                                        task?.workItem?.workArea?.floor
+                                          ?.floorName
+                                      }{" "}
                                       <i
                                         className="bx bx-chevron-right text-sm"
                                         style={{ fontSize: ".75rem" }}
@@ -218,8 +243,47 @@ const DailyTask = () => {
                                 <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">
+                                  <div
-                              {task.teamMembers.slice(0, 3).map((member) => (
+                                    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"
@@ -240,7 +304,9 @@ const DailyTask = () => {
                                         className="avatar avatar-xs"
                                         data-bs-toggle="tooltip"
                                         data-bs-placement="bottom"
-                                  title={`${task.teamMembers.length - 3} more`}
+                                        title={`${
+                                          task.teamMembers.length - 3
+                                        } more`}
                                       >
                                         <span className="avatar-initial rounded-circle bg-label-secondary pull-up">
                                           +{task.teamMembers.length - 3}
@@ -279,6 +345,9 @@ const DailyTask = () => {
                             </React.Fragment>
                           );
                         })}
+                      </React.Fragment>
+                    );
+                  })}
                 </tbody>
               </table>
             </div>