Added fuctionality to Displayed Date-Wise Based on Selected Date Range
This commit is contained in:
parent
321b73e2c0
commit
c920ec88fd
@ -130,3 +130,11 @@ button:focus-visible {
|
|||||||
.spin {
|
.spin {
|
||||||
animation: spin 1s linear infinite;
|
animation: spin 1s linear infinite;
|
||||||
}
|
}
|
||||||
|
.popover-body {
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
.custom-popover{
|
||||||
|
max-height: 100px;
|
||||||
|
overflow: auto;
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState, useRef } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import Breadcrumb from "../../components/common/Breadcrumb";
|
import Breadcrumb from "../../components/common/Breadcrumb";
|
||||||
import { dailyTask } from "../../data/masters";
|
import { dailyTask } from "../../data/masters";
|
||||||
@ -38,6 +38,7 @@ const DailyTask = () => {
|
|||||||
|
|
||||||
setInitialized(true);
|
setInitialized(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}, [project_lodaing, projects, projectId, selectedProject, initialized]);
|
}, [project_lodaing, projects, projectId, selectedProject, initialized]);
|
||||||
|
|
||||||
const dispatch = useDispatch(selectedProject);
|
const dispatch = useDispatch(selectedProject);
|
||||||
@ -55,11 +56,22 @@ const DailyTask = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const [TaskLists, setTaskLists] = useState([]);
|
const [TaskLists, setTaskLists] = useState([]);
|
||||||
|
const [dates, setDates] = useState([]);
|
||||||
|
const popoverRefs = useRef([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setTaskLists(TaskList);
|
setTaskLists(TaskList);
|
||||||
}, [TaskList, selectedProject]);
|
}, [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 [selectedTask, selectTask] = useState(null);
|
||||||
const [comments, setComment] = useState(null);
|
const [comments, setComment] = useState(null);
|
||||||
|
|
||||||
@ -75,6 +87,21 @@ const DailyTask = () => {
|
|||||||
selectTask(task);
|
selectTask(task);
|
||||||
openModal();
|
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 (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
@ -165,41 +192,43 @@ const DailyTask = () => {
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
{project_lodaing && <tr>
|
{dates.map((date, i) => {
|
||||||
<td colSpan={7} className="text-center">
|
return (
|
||||||
Loading...
|
<React.Fragment key={i}>
|
||||||
</td>
|
|
||||||
</tr>}
|
|
||||||
{TaskLists?.length === 0 && !task_loading && !project_lodaing &&(
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={7} className="text-center">
|
<td colSpan={7} className="text-start">
|
||||||
No Task Found
|
<strong>{date}</strong>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
{TaskLists.filter((task) =>
|
||||||
|
task.assignmentDate.includes(date)
|
||||||
{TaskLists.map((task, index) => {
|
).map((task, index) => {
|
||||||
|
const refIndex = index * 10 + i;
|
||||||
|
console.log(refIndex)
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={index}>
|
<React.Fragment key={index}>
|
||||||
<tr>
|
<tr>
|
||||||
<td className="flex-wrap text-start">
|
<td className="flex-wrap text-start">
|
||||||
<div>
|
<div>
|
||||||
{task.workItem.activityMaster.activityName ||
|
{task.workItem.activityMaster
|
||||||
"No Activity Name"}
|
.activityName || "No Activity Name"}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{" "}
|
{" "}
|
||||||
<label className=" col-form-label text-sm">
|
<label className=" col-form-label text-sm">
|
||||||
{" "}
|
{" "}
|
||||||
{
|
{
|
||||||
task?.workItem?.workArea?.floor?.building
|
task?.workItem?.workArea?.floor
|
||||||
?.name
|
?.building?.name
|
||||||
}{" "}
|
}{" "}
|
||||||
<i
|
<i
|
||||||
className="bx bx-chevron-right text-sm"
|
className="bx bx-chevron-right text-sm"
|
||||||
style={{ fontSize: ".75rem" }}
|
style={{ fontSize: ".75rem" }}
|
||||||
></i>{" "}
|
></i>{" "}
|
||||||
{task?.workItem?.workArea?.floor?.floorName}{" "}
|
{
|
||||||
|
task?.workItem?.workArea?.floor
|
||||||
|
?.floorName
|
||||||
|
}{" "}
|
||||||
<i
|
<i
|
||||||
className="bx bx-chevron-right text-sm"
|
className="bx bx-chevron-right text-sm"
|
||||||
style={{ fontSize: ".75rem" }}
|
style={{ fontSize: ".75rem" }}
|
||||||
@ -218,8 +247,39 @@ const DailyTask = () => {
|
|||||||
<td>{task.completedTask}</td>
|
<td>{task.completedTask}</td>
|
||||||
<td>{formatDate(task.assignmentDate)}</td>
|
<td>{formatDate(task.assignmentDate)}</td>
|
||||||
<td className="text-center">
|
<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
|
<div
|
||||||
key={member.id}
|
key={member.id}
|
||||||
data-bs-toggle="tooltip"
|
data-bs-toggle="tooltip"
|
||||||
@ -240,7 +300,9 @@ const DailyTask = () => {
|
|||||||
className="avatar avatar-xs"
|
className="avatar avatar-xs"
|
||||||
data-bs-toggle="tooltip"
|
data-bs-toggle="tooltip"
|
||||||
data-bs-placement="bottom"
|
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">
|
<span className="avatar-initial rounded-circle bg-label-secondary pull-up">
|
||||||
+{task.teamMembers.length - 3}
|
+{task.teamMembers.length - 3}
|
||||||
@ -279,6 +341,9 @@ const DailyTask = () => {
|
|||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
</React.Fragment>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user