admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Implement a spinner in the Daily Progress Report to indicate when data is being loaded.' (#194) from Kartik_Bug#487 into Issue_Jun_1W_2

Browse Source 
Reviewed-on: #194
This commit is contained in:
Vikas Nale 2025-06-09 11:54:49 +00:00
commit 1390c655b4
2 changed files with 281 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

453
src/pages/Activities/DailyTask.jsx
View File

@ -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: [],
}); });
@ -37,17 +39,25 @@ const DailyTask = () => {
if (projectIdFromUrl) { if (projectIdFromUrl) {
dispatch(setProjectId(projectIdFromUrl)); dispatch(setProjectId(projectIdFromUrl));
} else if (selectedProject === 1 || selectedProject === undefined) { } else if (selectedProject === 1 || selectedProject === undefined) {
// If no project from URL or default/undefined, pick the first project
dispatch(setProjectId(projects[0].id)); dispatch(setProjectId(projects[0].id));
} }
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: "" });
const { const {
TaskList, TaskList,
loading: task_loading, loading: task_loading, // This `loading` state indicates if task data is being fetched
error: task_error, error: task_error,
refetch, refetch,
} = useTaskList( } = useTaskList(
@ -56,34 +66,51 @@ const DailyTask = () => {
initialized ? dateRange.endDate : null initialized ? dateRange.endDate : null
); );
const [TaskLists, setTaskLists] = useState([]); const [TaskLists, setTaskLists] = useState([]); // This state holds the *filtered* tasks for display
const [dates, setDates] = useState([]); const [dates, setDates] = useState([]);
const popoverRefs = useRef([]); const popoverRefs = useRef([]);
// Effect to apply filters (now using filters from FilterIcon) // Effect to apply filters to TaskList (from useTaskList) and update TaskLists (filtered display)
useEffect(() => { useEffect(() => {
let filteredTasks = TaskList; // Only filter if TaskList is available (not null or undefined)
if (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) {
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
)
);
}
setTaskLists(filteredTasks);
} else {
// 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.
setTaskLists([]);
} }
}, [
if (filters.selectedFloors.length > 0) { TaskList,
filteredTasks = filteredTasks.filter(task => filters.selectedBuilding,
filters.selectedFloors.includes(task?.workItem?.workArea?.floor?.floorName) filters.selectedFloors,
); filters.selectedActivities,
} ]);
if (filters.selectedActivities.length > 0) {
filteredTasks = filteredTasks.filter(task =>
filters.selectedActivities.includes(task?.workItem?.activityMaster?.activityName)
);
}
setTaskLists(filteredTasks);
}, [TaskList, filters.selectedBuilding, filters.selectedFloors, filters.selectedActivities]); // Depend on filters state
useEffect(() => { useEffect(() => {
const AssignmentDates = [ const AssignmentDates = [
@ -112,7 +139,16 @@ 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
const existingPopover = window.bootstrap.Popover.getInstance(el);
if (existingPopover) {
existingPopover.dispose();
}
new window.bootstrap.Popover(el, { new window.bootstrap.Popover(el, {
trigger: "focus", trigger: "focus",
placement: "left", placement: "left",
@ -121,21 +157,44 @@ const DailyTask = () => {
}); });
} }
}); });
}, [dates, TaskLists]);
// Cleanup function for popovers when component unmounts or dependencies change
return () => {
popoverRefs.current.forEach((el) => {
if (
el &&
window.bootstrap &&
typeof window.bootstrap.Popover === "function"
) {
const existingPopover = window.bootstrap.Popover.getInstance(el);
if (existingPopover) {
existingPopover.dispose();
}
}
});
popoverRefs.current = []; // Clear the refs array
};
}, [dates, TaskLists]); // Re-initialize popovers when tasks or dates change
// Handler for project selection // Handler for project selection
const handleProjectChange = (e) => { const handleProjectChange = (e) => {
const newProjectId = e.target.value; const newProjectId = e.target.value;
dispatch(setProjectId(newProjectId)); dispatch(setProjectId(newProjectId));
// --- 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) // 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" : ""}`} 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" }}
@ -146,11 +205,13 @@ const DailyTask = () => {
closeModal={closeModal} closeModal={closeModal}
refetch={refetch} refetch={refetch}
/> />
{isModalOpen && <div className="modal-backdrop fade show"></div>}{" "}
{/* Add backdrop */}
</div> </div>
{/* Report Task Comments Modal */} {/* Report Task Comments Modal */}
<div <div
className={`modal fade ${isModalOpenComment ? "show" : ""}`} className={`modal fade ${isModalOpenComment ? "show d-block" : ""}`}
tabIndex="-1" tabIndex="-1"
role="dialog" role="dialog"
style={{ display: isModalOpenComment ? "block" : "none" }} style={{ display: isModalOpenComment ? "block" : "none" }}
@ -160,6 +221,8 @@ const DailyTask = () => {
commentsData={comments} commentsData={comments}
closeModal={closeCommentModal} closeModal={closeCommentModal}
/> />
{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">
@ -169,10 +232,9 @@ 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="justify-content-between align-items-center"></div>
<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">
<DateRangePicker <DateRangePicker
onRangeChange={setDateRange} onRangeChange={setDateRange}
@ -187,6 +249,8 @@ const DailyTask = () => {
currentSelectedBuilding={filters.selectedBuilding} currentSelectedBuilding={filters.selectedBuilding}
currentSelectedFloors={filters.selectedFloors} currentSelectedFloors={filters.selectedFloors}
currentSelectedActivities={filters.selectedActivities} currentSelectedActivities={filters.selectedActivities}
// You can pass the project_loading state here if you want to disable filter during project load
// isProjectLoading={project_loading}
/> />
</div> </div>
<div className="col-md-4 col-12 text-center mb-2 mb-md-0"> <div className="col-md-4 col-12 text-center mb-2 mb-md-0">
@ -197,6 +261,7 @@ const DailyTask = () => {
value={selectedProject || ""} value={selectedProject || ""}
onChange={handleProjectChange} onChange={handleProjectChange}
aria-label="Select Project" aria-label="Select Project"
disabled={project_loading} // Disable dropdown while projects are loading
> >
{project_loading && ( {project_loading && (
<option value="" disabled> <option value="" disabled>
@ -226,89 +291,118 @@ const DailyTask = () => {
</tr> </tr>
</thead> </thead>
<tbody className="table-border-bottom-0"> <tbody className="table-border-bottom-0">
{task_loading && ( {/* --- Spinner when tasks are loading --- */}
{(task_loading || project_loading) && (
<tr> <tr>
<td colSpan={7} className="text-center"> <td colSpan={6} className="text-center">
<p>Loading..</p> {" "}
{/* 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> </td>
</tr> </tr>
)} )}
{!task_loading && TaskLists.length === 0 && ( {/* --- "No Reports Found" message only if not loading and no tasks --- */}
<tr> {!task_loading &&
<td colSpan={7} className="text-center"> !project_loading &&
<p>No Reports Found</p> TaskLists.length === 0 && (
</td> <tr>
</tr> <td colSpan={6} className="text-center">
)} <div className="mt-10 mb-10 pt-10 pb-10">
{dates.map((date, i) => { {" "}
const tasksForDate = TaskLists.filter((task) => {/* ColSpan set to 6 */}
task.assignmentDate.includes(date) <p>No Reports Found</p>
); </div>
if (tasksForDate.length === 0) return null; </td>
</tr>
)}
{/* --- Render tasks when not loading and tasks exist --- */}
{!task_loading &&
TaskLists.length > 0 &&
dates.map((date, i) => {
const tasksForDate = TaskLists.filter((task) =>
task.assignmentDate.includes(date)
);
// 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={7} className="text-start"> <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>
{" "} {task.workItem.activityMaster
<label className="col-form-label text-sm"> .activityName || "No Activity Name"}
{" "} </div>
{ <div>
task?.workItem?.workArea?.floor <label className="col-form-label text-sm">
?.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} 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(
@ -316,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>
@ -403,4 +506,4 @@ const DailyTask = () => {
</> </>
); );
}; };
export default DailyTask; export default DailyTask;

6
src/pages/authentication/ResetPasswordPage.jsx
View File

@ -67,7 +67,7 @@ const ResetPasswordPage = () => {
navigate("/auth/login", { replace: true }); navigate("/auth/login", { replace: true });
// setLoading(false); // setLoading(false);
} catch (error) { } catch (error) {
showToast("Token is expries or Invalid ", "error"); showToast("Link is expries or Invalid ", "error");
setTokenExpired(true); setTokenExpired(true);
setLoading(false); setLoading(false);
} }
@ -76,8 +76,8 @@ const ResetPasswordPage = () => {
if (tokenExpired) { if (tokenExpired) {
return ( return (
<AuthWrapper> <AuthWrapper>
<h4 className="mb-2 text-secondary">Session Expired 🔒</h4> <h4 className="mb-2 ">Invalid Link 🔒</h4>
<p className="mb-4">Your session has expired or token is invalid.</p> <p className="mb-4" style={{fontSize: "12px"}}>This link appears to be invalid or expired. Please use the 'Forgot Password' feature to set your new password.</p>
<div className="text-center mb-4"> <div className="text-center mb-4">
<Link to="/auth/forgot-password" className="btn btn-outline-primary"> <Link to="/auth/forgot-password" className="btn btn-outline-primary">
Go to Forgot Password Go to Forgot Password