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

Merge branch 'Issues_July_4W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_4W

Browse Source
This commit is contained in:
Kartik Sharma 2025-07-26 12:05:42 +05:30
commit 5956e64492
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,13 +203,11 @@ const AttendanceLog = ({
[projectId, dateRange, data, dispatch]
);
useEffect(() => {
useEffect(() => {
eventBus.on("attendance_log", handler);
return () => eventBus.off("attendance_log", handler);
}, [handler]);
const employeeHandler = useCallback(
const employeeHandler = useCallback(
(msg) => {
const { startDate, endDate } = dateRange;
@ -224,7 +222,6 @@ const AttendanceLog = ({
[projectId, dateRange, dispatch]
);
useEffect(() => {
useEffect(() => {
eventBus.on("employee", employeeHandler);
return () => eventBus.off("employee", employeeHandler);

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

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

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

@ -51,9 +51,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
// State for search term
const [searchTerm, setSearchTerm] = useState("");
// State for search term
const [searchTerm, setSearchTerm] = useState("");
useEffect(() => {
if (typeof bootstrap !== "undefined") {
if (infoRef.current) {
@ -226,7 +223,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
onClose();
};
return (
<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>
@ -589,15 +585,11 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
id="defaultFormControlInput"
aria-describedby="defaultFormControlHelp"
/>
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
<u> {
assignData?.workItem?.activityMaster
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
<u> {
assignData?.workItem?.activityMaster
?.unitOfMeasurement
}</u>
}</u>
</span>
<div
style={{