add cosmati changes
This commit is contained in:
parent
e2f3814934
commit
19f58345d9
@ -14,7 +14,9 @@ import FilterIcon from "../../components/common/FilterIcon"; // Import the Filte
|
|||||||
const DailyTask = () => {
|
const DailyTask = () => {
|
||||||
const [searchParams] = useSearchParams();
|
const [searchParams] = useSearchParams();
|
||||||
const projectIdFromUrl = searchParams.get("project");
|
const projectIdFromUrl = searchParams.get("project");
|
||||||
const selectedProject = useSelector((store) => store.localVariables.projectId);
|
const selectedProject = useSelector(
|
||||||
|
(store) => store.localVariables.projectId
|
||||||
|
);
|
||||||
const {
|
const {
|
||||||
projects,
|
projects,
|
||||||
loading: project_loading,
|
loading: project_loading,
|
||||||
@ -26,7 +28,7 @@ const DailyTask = () => {
|
|||||||
|
|
||||||
// State for filters (moved to FilterIcon, but we need to receive them here)
|
// State for filters (moved to FilterIcon, but we need to receive them here)
|
||||||
const [filters, setFilters] = useState({
|
const [filters, setFilters] = useState({
|
||||||
selectedBuilding: '',
|
selectedBuilding: "",
|
||||||
selectedFloors: [],
|
selectedFloors: [],
|
||||||
selectedActivities: [],
|
selectedActivities: [],
|
||||||
});
|
});
|
||||||
@ -42,7 +44,14 @@ const DailyTask = () => {
|
|||||||
}
|
}
|
||||||
setInitialized(true);
|
setInitialized(true);
|
||||||
}
|
}
|
||||||
}, [project_loading, projects, projectIdFromUrl, selectedProject, initialized, dispatch]);
|
}, [
|
||||||
|
project_loading,
|
||||||
|
projects,
|
||||||
|
projectIdFromUrl,
|
||||||
|
selectedProject,
|
||||||
|
initialized,
|
||||||
|
dispatch,
|
||||||
|
]);
|
||||||
|
|
||||||
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
||||||
|
|
||||||
@ -68,29 +77,40 @@ const DailyTask = () => {
|
|||||||
let filteredTasks = TaskList;
|
let filteredTasks = TaskList;
|
||||||
|
|
||||||
if (filters.selectedBuilding) {
|
if (filters.selectedBuilding) {
|
||||||
filteredTasks = filteredTasks.filter(task =>
|
filteredTasks = filteredTasks.filter(
|
||||||
task?.workItem?.workArea?.floor?.building?.name === filters.selectedBuilding
|
(task) =>
|
||||||
|
task?.workItem?.workArea?.floor?.building?.name ===
|
||||||
|
filters.selectedBuilding
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filters.selectedFloors.length > 0) {
|
if (filters.selectedFloors.length > 0) {
|
||||||
filteredTasks = filteredTasks.filter(task =>
|
filteredTasks = filteredTasks.filter((task) =>
|
||||||
filters.selectedFloors.includes(task?.workItem?.workArea?.floor?.floorName)
|
filters.selectedFloors.includes(
|
||||||
|
task?.workItem?.workArea?.floor?.floorName
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (filters.selectedActivities.length > 0) {
|
if (filters.selectedActivities.length > 0) {
|
||||||
filteredTasks = filteredTasks.filter(task =>
|
filteredTasks = filteredTasks.filter((task) =>
|
||||||
filters.selectedActivities.includes(task?.workItem?.activityMaster?.activityName)
|
filters.selectedActivities.includes(
|
||||||
|
task?.workItem?.activityMaster?.activityName
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
setTaskLists(filteredTasks);
|
setTaskLists(filteredTasks);
|
||||||
} else {
|
} else {
|
||||||
// If TaskList is null (e.g., during initial load or project change before data arrives),
|
// If TaskList is null (e.g., during initial load or project change before data arrives),
|
||||||
// ensure TaskLists is also empty to avoid displaying stale data.
|
// ensure TaskLists is also empty to avoid displaying stale data.
|
||||||
setTaskLists([]);
|
setTaskLists([]);
|
||||||
}
|
}
|
||||||
}, [TaskList, filters.selectedBuilding, filters.selectedFloors, filters.selectedActivities]);
|
}, [
|
||||||
|
TaskList,
|
||||||
|
filters.selectedBuilding,
|
||||||
|
filters.selectedFloors,
|
||||||
|
filters.selectedActivities,
|
||||||
|
]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const AssignmentDates = [
|
const AssignmentDates = [
|
||||||
@ -119,7 +139,11 @@ const DailyTask = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Ensure Bootstrap's Popover is initialized correctly
|
// Ensure Bootstrap's Popover is initialized correctly
|
||||||
popoverRefs.current.forEach((el) => {
|
popoverRefs.current.forEach((el) => {
|
||||||
if (el && window.bootstrap && typeof window.bootstrap.Popover === 'function') {
|
if (
|
||||||
|
el &&
|
||||||
|
window.bootstrap &&
|
||||||
|
typeof window.bootstrap.Popover === "function"
|
||||||
|
) {
|
||||||
// Dispose existing popovers to prevent duplicates if component re-renders
|
// Dispose existing popovers to prevent duplicates if component re-renders
|
||||||
const existingPopover = window.bootstrap.Popover.getInstance(el);
|
const existingPopover = window.bootstrap.Popover.getInstance(el);
|
||||||
if (existingPopover) {
|
if (existingPopover) {
|
||||||
@ -137,7 +161,11 @@ const DailyTask = () => {
|
|||||||
// Cleanup function for popovers when component unmounts or dependencies change
|
// Cleanup function for popovers when component unmounts or dependencies change
|
||||||
return () => {
|
return () => {
|
||||||
popoverRefs.current.forEach((el) => {
|
popoverRefs.current.forEach((el) => {
|
||||||
if (el && window.bootstrap && typeof window.bootstrap.Popover === 'function') {
|
if (
|
||||||
|
el &&
|
||||||
|
window.bootstrap &&
|
||||||
|
typeof window.bootstrap.Popover === "function"
|
||||||
|
) {
|
||||||
const existingPopover = window.bootstrap.Popover.getInstance(el);
|
const existingPopover = window.bootstrap.Popover.getInstance(el);
|
||||||
if (existingPopover) {
|
if (existingPopover) {
|
||||||
existingPopover.dispose();
|
existingPopover.dispose();
|
||||||
@ -155,14 +183,18 @@ const DailyTask = () => {
|
|||||||
// --- IMPORTANT: Clear old data immediately to show loading state ---
|
// --- IMPORTANT: Clear old data immediately to show loading state ---
|
||||||
setTaskLists([]); // This makes the table empty, allowing the spinner to show
|
setTaskLists([]); // This makes the table empty, allowing the spinner to show
|
||||||
// Reset filters when project changes (communicate to FilterIcon to clear)
|
// Reset filters when project changes (communicate to FilterIcon to clear)
|
||||||
setFilters({ selectedBuilding: '', selectedFloors: [], selectedActivities: [] });
|
setFilters({
|
||||||
|
selectedBuilding: "",
|
||||||
|
selectedFloors: [],
|
||||||
|
selectedActivities: [],
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Report Task Modal */}
|
{/* Report Task Modal */}
|
||||||
<div
|
<div
|
||||||
className={`modal fade ${isModalOpen ? "show d-block" : ""}`}
|
className={`modal fade ${isModalOpen ? "show d-block" : ""}`}
|
||||||
tabIndex="-1"
|
tabIndex="-1"
|
||||||
role="dialog"
|
role="dialog"
|
||||||
style={{ display: isModalOpen ? "block" : "none" }}
|
style={{ display: isModalOpen ? "block" : "none" }}
|
||||||
@ -173,7 +205,8 @@ const DailyTask = () => {
|
|||||||
closeModal={closeModal}
|
closeModal={closeModal}
|
||||||
refetch={refetch}
|
refetch={refetch}
|
||||||
/>
|
/>
|
||||||
{isModalOpen && <div className="modal-backdrop fade show"></div>} {/* Add backdrop */}
|
{isModalOpen && <div className="modal-backdrop fade show"></div>}{" "}
|
||||||
|
{/* Add backdrop */}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Report Task Comments Modal */}
|
{/* Report Task Comments Modal */}
|
||||||
@ -188,7 +221,8 @@ const DailyTask = () => {
|
|||||||
commentsData={comments}
|
commentsData={comments}
|
||||||
closeModal={closeCommentModal}
|
closeModal={closeCommentModal}
|
||||||
/>
|
/>
|
||||||
{isModalOpenComment && <div className="modal-backdrop fade show"></div>} {/* Add backdrop */}
|
{isModalOpenComment && <div className="modal-backdrop fade show"></div>}{" "}
|
||||||
|
{/* Add backdrop */}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="container-xxl flex-grow-1 container-p-y">
|
<div className="container-xxl flex-grow-1 container-p-y">
|
||||||
@ -198,7 +232,7 @@ const DailyTask = () => {
|
|||||||
{ label: "Daily Progress Report", link: null },
|
{ label: "Daily Progress Report", link: null },
|
||||||
]}
|
]}
|
||||||
></Breadcrumb>
|
></Breadcrumb>
|
||||||
<div className="card card-action mb-6">
|
<div className="card card-action mb-6 ">
|
||||||
<div className="card-body p-1 p-sm-2">
|
<div className="card-body p-1 p-sm-2">
|
||||||
<div className="row d-flex justify-content-between align-items-center">
|
<div className="row d-flex justify-content-between align-items-center">
|
||||||
<div className="col-md-6 d-flex gap-3 align-items-center col-12 text-start mb-2 mb-md-0">
|
<div className="col-md-6 d-flex gap-3 align-items-center col-12 text-start mb-2 mb-md-0">
|
||||||
@ -258,94 +292,117 @@ const DailyTask = () => {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody className="table-border-bottom-0">
|
<tbody className="table-border-bottom-0">
|
||||||
{/* --- Spinner when tasks are loading --- */}
|
{/* --- Spinner when tasks are loading --- */}
|
||||||
{task_loading && (
|
{(task_loading || project_loading) && (
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={6} className="text-center"> {/* ColSpan set to 6 based on your table headers */}
|
<td colSpan={6} className="text-center">
|
||||||
<div className="spinner-border text-primary" role="status">
|
{" "}
|
||||||
<span className="visually-hidden">Loading...</span>
|
{/* ColSpan set to 6 based on your table headers */}
|
||||||
|
<div className="mt-10 mb-10 pt-5 pb-10">
|
||||||
|
<div
|
||||||
|
className="spinner-border text-primary"
|
||||||
|
role="status"
|
||||||
|
>
|
||||||
|
<span className="visually-hidden">Loading...</span>
|
||||||
|
</div>
|
||||||
|
<p className="mt-2">Loading Tasks...</p>
|
||||||
</div>
|
</div>
|
||||||
<p className="mt-2">Loading Tasks...</p>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
{/* --- "No Reports Found" message only if not loading and no tasks --- */}
|
{/* --- "No Reports Found" message only if not loading and no tasks --- */}
|
||||||
{!task_loading && TaskLists.length === 0 && (
|
{!task_loading &&
|
||||||
<tr>
|
!project_loading &&
|
||||||
<td colSpan={6} className="text-center"> {/* ColSpan set to 6 */}
|
TaskLists.length === 0 && (
|
||||||
<p>No Reports Found</p>
|
<tr>
|
||||||
</td>
|
<td colSpan={6} className="text-center">
|
||||||
</tr>
|
<div className="mt-10 mb-10 pt-10 pb-10">
|
||||||
)}
|
{" "}
|
||||||
|
{/* ColSpan set to 6 */}
|
||||||
|
<p>No Reports Found</p>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
{/* --- Render tasks when not loading and tasks exist --- */}
|
{/* --- Render tasks when not loading and tasks exist --- */}
|
||||||
{!task_loading && TaskLists.length > 0 && dates.map((date, i) => {
|
{!task_loading &&
|
||||||
const tasksForDate = TaskLists.filter((task) =>
|
TaskLists.length > 0 &&
|
||||||
task.assignmentDate.includes(date)
|
dates.map((date, i) => {
|
||||||
);
|
const tasksForDate = TaskLists.filter((task) =>
|
||||||
// Only render the date header if there are tasks for that date after filtering
|
task.assignmentDate.includes(date)
|
||||||
if (tasksForDate.length === 0) return null;
|
);
|
||||||
|
// Only render the date header if there are tasks for that date after filtering
|
||||||
|
if (tasksForDate.length === 0) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={i}>
|
<React.Fragment key={i}>
|
||||||
<tr className="table-row-header">
|
<tr className="table-row-header">
|
||||||
<td colSpan={6} className="text-start"> {/* ColSpan set to 6 */}
|
<td colSpan={6} className="text-start">
|
||||||
<strong>{moment(date).format("DD-MM-YYYY")}</strong>
|
{" "}
|
||||||
</td>
|
{/* ColSpan set to 6 */}
|
||||||
</tr>
|
<strong>
|
||||||
{tasksForDate.map((task, index) => {
|
{moment(date).format("DD-MM-YYYY")}
|
||||||
const refIndex = `${i}-${index}`;
|
</strong>
|
||||||
return (
|
</td>
|
||||||
<React.Fragment key={refIndex}>
|
</tr>
|
||||||
<tr>
|
{tasksForDate.map((task, index) => {
|
||||||
<td className="flex-wrap text-start">
|
const refIndex = `${i}-${index}`;
|
||||||
<div>
|
return (
|
||||||
{task.workItem.activityMaster
|
<React.Fragment key={refIndex}>
|
||||||
.activityName || "No Activity Name"}
|
<tr>
|
||||||
</div>
|
<td className="flex-wrap text-start">
|
||||||
<div>
|
<div>
|
||||||
<label className="col-form-label text-sm">
|
{task.workItem.activityMaster
|
||||||
{" "}
|
.activityName || "No Activity Name"}
|
||||||
{
|
</div>
|
||||||
task?.workItem?.workArea?.floor
|
<div>
|
||||||
?.building?.name
|
<label className="col-form-label text-sm">
|
||||||
}{" "}
|
|
||||||
<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}
|
task?.workItem?.workArea?.floor
|
||||||
</label>
|
?.building?.name
|
||||||
</div>
|
}{" "}
|
||||||
</td>
|
<i
|
||||||
<td>
|
className="bx bx-chevron-right text-sm"
|
||||||
{task.plannedTask || "NA"} /
|
style={{ fontSize: ".75rem" }}
|
||||||
{task.workItem.plannedWork -
|
></i>{" "}
|
||||||
task.workItem.completedWork}
|
{
|
||||||
</td>
|
task?.workItem?.workArea?.floor
|
||||||
<td>{task.completedTask}</td>
|
?.floorName
|
||||||
<td>{moment(task.assignmentDate).format("DD-MM-YYYY")}</td>
|
}{" "}
|
||||||
<td className="text-center">
|
<i
|
||||||
<div
|
className="bx bx-chevron-right text-sm"
|
||||||
key={refIndex}
|
style={{ fontSize: ".75rem" }}
|
||||||
ref={(el) =>
|
>
|
||||||
(popoverRefs.current[refIndex] = el)
|
{" "}
|
||||||
}
|
</i>
|
||||||
tabIndex="0"
|
{task?.workItem?.workArea?.areaName}
|
||||||
className="d-flex align-items-center avatar-group justify-content-center"
|
</label>
|
||||||
data-bs-toggle="popover"
|
</div>
|
||||||
data-bs-trigger="focus"
|
</td>
|
||||||
data-bs-placement="left"
|
<td>
|
||||||
data-bs-html="true"
|
{task.plannedTask || "NA"} /
|
||||||
data-bs-content={`
|
{task.workItem.plannedWork -
|
||||||
|
task.workItem.completedWork}
|
||||||
|
</td>
|
||||||
|
<td>{task.completedTask}</td>
|
||||||
|
<td>
|
||||||
|
{moment(task.assignmentDate).format(
|
||||||
|
"DD-MM-YYYY"
|
||||||
|
)}
|
||||||
|
</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">
|
<div class="border border-secondary rounded custom-popover p-2 px-3">
|
||||||
${task.teamMembers
|
${task.teamMembers
|
||||||
.map(
|
.map(
|
||||||
@ -353,84 +410,93 @@ const DailyTask = () => {
|
|||||||
<div class="d-flex align-items-center gap-2 mb-2">
|
<div class="d-flex align-items-center gap-2 mb-2">
|
||||||
<div class="avatar avatar-xs">
|
<div class="avatar avatar-xs">
|
||||||
<span class="avatar-initial rounded-circle bg-label-primary">
|
<span class="avatar-initial rounded-circle bg-label-primary">
|
||||||
${member?.firstName?.charAt(0) || ""
|
${
|
||||||
}${member?.lastName?.charAt(0) || ""
|
member?.firstName?.charAt(
|
||||||
}
|
0
|
||||||
|
) || ""
|
||||||
|
}${
|
||||||
|
member?.lastName?.charAt(0) || ""
|
||||||
|
}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<span>${member.firstName} ${member.lastName
|
<span>${member.firstName} ${
|
||||||
}</span>
|
member.lastName
|
||||||
|
}</span>
|
||||||
</div>
|
</div>
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
.join("")}
|
.join("")}
|
||||||
</div>
|
</div>
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
{task.teamMembers
|
{task.teamMembers
|
||||||
.slice(0, 3)
|
.slice(0, 3)
|
||||||
.map((member) => (
|
.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"
|
||||||
|
>
|
||||||
|
<span className="avatar-initial rounded-circle bg-label-primary">
|
||||||
|
{member?.firstName.slice(0, 1)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{task.teamMembers.length > 3 && (
|
||||||
<div
|
<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"
|
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-primary">
|
<span className="avatar-initial rounded-circle bg-label-secondary pull-up">
|
||||||
{member?.firstName.slice(0, 1)}
|
+{task.teamMembers.length - 3}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
)}
|
||||||
{task.teamMembers.length > 3 && (
|
</div>
|
||||||
<div
|
</td>
|
||||||
className="avatar avatar-xs"
|
<td className="text-center">
|
||||||
data-bs-toggle="tooltip"
|
<div className="d-flex justify-content-center">
|
||||||
data-bs-placement="bottom"
|
<button
|
||||||
title={`${task.teamMembers.length - 3
|
type="button"
|
||||||
} more`}
|
className={`btn btn-xs btn-primary ${
|
||||||
>
|
task.reportedDate != null
|
||||||
<span className="avatar-initial rounded-circle bg-label-secondary pull-up">
|
? "d-none"
|
||||||
+{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.reportedDate != null ? "d-none" : ""
|
|
||||||
}`}
|
}`}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
selectTask(task);
|
selectTask(task);
|
||||||
openModal();
|
openModal();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Report
|
Report
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="btn btn-xs btn-primary ms-2"
|
className="btn btn-xs btn-primary ms-2"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setComment(task);
|
setComment(task);
|
||||||
openComment();
|
openComment();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Comment
|
Comment
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user