add cosmati changes

This commit is contained in:
Vikas Nale 2025-06-09 17:24:31 +05:30
parent e2f3814934
commit 19f58345d9

View File

@ -14,7 +14,9 @@ import FilterIcon from "../../components/common/FilterIcon"; // Import the Filte
const DailyTask = () => {
const [searchParams] = useSearchParams();
const projectIdFromUrl = searchParams.get("project");
const selectedProject = useSelector((store) => store.localVariables.projectId);
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const {
projects,
loading: project_loading,
@ -26,7 +28,7 @@ const DailyTask = () => {
// State for filters (moved to FilterIcon, but we need to receive them here)
const [filters, setFilters] = useState({
selectedBuilding: '',
selectedBuilding: "",
selectedFloors: [],
selectedActivities: [],
});
@ -42,7 +44,14 @@ const DailyTask = () => {
}
setInitialized(true);
}
}, [project_loading, projects, projectIdFromUrl, selectedProject, initialized, dispatch]);
}, [
project_loading,
projects,
projectIdFromUrl,
selectedProject,
initialized,
dispatch,
]);
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
@ -68,20 +77,26 @@ const DailyTask = () => {
let filteredTasks = TaskList;
if (filters.selectedBuilding) {
filteredTasks = filteredTasks.filter(task =>
task?.workItem?.workArea?.floor?.building?.name === filters.selectedBuilding
filteredTasks = filteredTasks.filter(
(task) =>
task?.workItem?.workArea?.floor?.building?.name ===
filters.selectedBuilding
);
}
if (filters.selectedFloors.length > 0) {
filteredTasks = filteredTasks.filter(task =>
filters.selectedFloors.includes(task?.workItem?.workArea?.floor?.floorName)
filteredTasks = filteredTasks.filter((task) =>
filters.selectedFloors.includes(
task?.workItem?.workArea?.floor?.floorName
)
);
}
if (filters.selectedActivities.length > 0) {
filteredTasks = filteredTasks.filter(task =>
filters.selectedActivities.includes(task?.workItem?.activityMaster?.activityName)
filteredTasks = filteredTasks.filter((task) =>
filters.selectedActivities.includes(
task?.workItem?.activityMaster?.activityName
)
);
}
setTaskLists(filteredTasks);
@ -90,7 +105,12 @@ const DailyTask = () => {
// ensure TaskLists is also empty to avoid displaying stale data.
setTaskLists([]);
}
}, [TaskList, filters.selectedBuilding, filters.selectedFloors, filters.selectedActivities]);
}, [
TaskList,
filters.selectedBuilding,
filters.selectedFloors,
filters.selectedActivities,
]);
useEffect(() => {
const AssignmentDates = [
@ -119,7 +139,11 @@ const DailyTask = () => {
useEffect(() => {
// Ensure Bootstrap's Popover is initialized correctly
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
const existingPopover = window.bootstrap.Popover.getInstance(el);
if (existingPopover) {
@ -137,7 +161,11 @@ const DailyTask = () => {
// Cleanup function for popovers when component unmounts or dependencies change
return () => {
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);
if (existingPopover) {
existingPopover.dispose();
@ -155,7 +183,11 @@ const DailyTask = () => {
// --- IMPORTANT: Clear old data immediately to show loading state ---
setTaskLists([]); // This makes the table empty, allowing the spinner to show
// Reset filters when project changes (communicate to FilterIcon to clear)
setFilters({ selectedBuilding: '', selectedFloors: [], selectedActivities: [] });
setFilters({
selectedBuilding: "",
selectedFloors: [],
selectedActivities: [],
});
};
return (
@ -173,7 +205,8 @@ const DailyTask = () => {
closeModal={closeModal}
refetch={refetch}
/>
{isModalOpen && <div className="modal-backdrop fade show"></div>} {/* Add backdrop */}
{isModalOpen && <div className="modal-backdrop fade show"></div>}{" "}
{/* Add backdrop */}
</div>
{/* Report Task Comments Modal */}
@ -188,7 +221,8 @@ const DailyTask = () => {
commentsData={comments}
closeModal={closeCommentModal}
/>
{isModalOpenComment && <div className="modal-backdrop fade show"></div>} {/* Add backdrop */}
{isModalOpenComment && <div className="modal-backdrop fade show"></div>}{" "}
{/* Add backdrop */}
</div>
<div className="container-xxl flex-grow-1 container-p-y">
@ -258,26 +292,41 @@ const DailyTask = () => {
</thead>
<tbody className="table-border-bottom-0">
{/* --- Spinner when tasks are loading --- */}
{task_loading && (
{(task_loading || project_loading) && (
<tr>
<td colSpan={6} className="text-center"> {/* ColSpan set to 6 based on your table headers */}
<div className="spinner-border text-primary" role="status">
<td colSpan={6} className="text-center">
{" "}
{/* 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>
</td>
</tr>
)}
{/* --- "No Reports Found" message only if not loading and no tasks --- */}
{!task_loading && TaskLists.length === 0 && (
{!task_loading &&
!project_loading &&
TaskLists.length === 0 && (
<tr>
<td colSpan={6} className="text-center"> {/* ColSpan set to 6 */}
<td colSpan={6} className="text-center">
<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 --- */}
{!task_loading && TaskLists.length > 0 && dates.map((date, i) => {
{!task_loading &&
TaskLists.length > 0 &&
dates.map((date, i) => {
const tasksForDate = TaskLists.filter((task) =>
task.assignmentDate.includes(date)
);
@ -287,8 +336,12 @@ const DailyTask = () => {
return (
<React.Fragment key={i}>
<tr className="table-row-header">
<td colSpan={6} className="text-start"> {/* ColSpan set to 6 */}
<strong>{moment(date).format("DD-MM-YYYY")}</strong>
<td colSpan={6} className="text-start">
{" "}
{/* ColSpan set to 6 */}
<strong>
{moment(date).format("DD-MM-YYYY")}
</strong>
</td>
</tr>
{tasksForDate.map((task, index) => {
@ -332,7 +385,11 @@ const DailyTask = () => {
task.workItem.completedWork}
</td>
<td>{task.completedTask}</td>
<td>{moment(task.assignmentDate).format("DD-MM-YYYY")}</td>
<td>
{moment(task.assignmentDate).format(
"DD-MM-YYYY"
)}
</td>
<td className="text-center">
<div
key={refIndex}
@ -353,12 +410,17 @@ const DailyTask = () => {
<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) || ""
${
member?.firstName?.charAt(
0
) || ""
}${
member?.lastName?.charAt(0) || ""
}
</span>
</div>
<span>${member.firstName} ${member.lastName
<span>${member.firstName} ${
member.lastName
}</span>
</div>
`
@ -389,7 +451,8 @@ const DailyTask = () => {
className="avatar avatar-xs"
data-bs-toggle="tooltip"
data-bs-placement="bottom"
title={`${task.teamMembers.length - 3
title={`${
task.teamMembers.length - 3
} more`}
>
<span className="avatar-initial rounded-circle bg-label-secondary pull-up">
@ -403,7 +466,10 @@ const DailyTask = () => {
<div className="d-flex justify-content-center">
<button
type="button"
className={`btn btn-xs btn-primary ${task.reportedDate != null ? "d-none" : ""
className={`btn btn-xs btn-primary ${
task.reportedDate != null
? "d-none"
: ""
}`}
onClick={() => {
selectTask(task);