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

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 -13
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e5f5807f6 - Show all commits

1
src/components/Activities/AttendcesLogs.jsx
View File

@ -226,7 +226,6 @@ const AttendanceLog = ({
[projectId, dateRange, dispatch] [projectId, dateRange, dispatch]
); );
// Removed duplicate useEffect, keeping only one
useEffect(() => { useEffect(() => {
eventBus.on("employee", employeeHandler); eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler); return () => eventBus.off("employee", employeeHandler);

4
src/components/Activities/Regularization.jsx
View File

@ -39,7 +39,6 @@ const Regularization = ({ handleRequest, searchQuery }) => {
); );
const employeeHandler = useCallback(
const employeeHandler = useCallback( const employeeHandler = useCallback(
(msg) => { (msg) => {
if (regularizes.some((item) => item.employeeId == msg.employeeId)) { if (regularizes.some((item) => item.employeeId == msg.employeeId)) {
@ -55,7 +54,6 @@ const Regularization = ({ handleRequest, searchQuery }) => {
return () => eventBus.off("regularization", handler); return () => eventBus.off("regularization", handler);
}, [handler]); }, [handler]);
useEffect(() => {
useEffect(() => { useEffect(() => {
eventBus.on("employee", employeeHandler); eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler); return () => eventBus.off("employee", employeeHandler);
@ -182,5 +180,3 @@ const Regularization = ({ handleRequest, searchQuery }) => {
}; };
export default Regularization; export default Regularization;

8
src/components/Project/AssignTask.jsx
View File

@ -51,9 +51,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
// State for search term // State for search term
const [searchTerm, setSearchTerm] = useState(""); const [searchTerm, setSearchTerm] = useState("");
// State for search term
const [searchTerm, setSearchTerm] = useState("");
useEffect(() => { useEffect(() => {
if (typeof bootstrap !== "undefined") { if (typeof bootstrap !== "undefined") {
if (infoRef.current) { if (infoRef.current) {
@ -230,7 +227,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
onClose(); onClose();
}; };
return ( return (
<div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap"> <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
<p className="align-items-center flex-wrap m-0 ">Assign Task</p> <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
@ -646,15 +642,11 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
id="defaultFormControlInput" id="defaultFormControlInput"
aria-describedby="defaultFormControlHelp" aria-describedby="defaultFormControlHelp"
/> />
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
<u> {
assignData?.workItem?.activityMaster
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}> <span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
<u> { <u> {
assignData?.workItem?.activityMaster assignData?.workItem?.activityMaster
?.unitOfMeasurement ?.unitOfMeasurement
}</u> }</u>
}</u>
</span> </span>
<div <div
style={{ style={{