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

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

Browse Source
This commit is contained in:
Pramod Mahajan 2025-05-09 17:45:50 +05:30
commit 067f7306d4
8 changed files with 224 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/assets/css/default.css
View File

@ -185,7 +185,7 @@
height: 2.2rem;
}
.table > thead > tr :first-child {
/* .table > thead > tr :first-child {
text-align: left;
padding-left: 50px !important;
}
padding-left: 50px;
} */

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

@ -22,8 +22,8 @@ const Regularization = ({ handleRequest }) => {
const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
return nameA.localeCompare(nameB);
};
const filteredData = [...regularizesList]?.sort(sortByName);
const filteredData = regularizesList.sort(sortByName);
const { currentPage, totalPages, currentItems, paginate } = usePagination(
filteredData,

73
src/components/Project/Infrastructure/WorkItem.jsx
View File

@ -6,8 +6,8 @@ import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
import { MANAGE_PROJECT_INFRA, MANAGE_TASK } from "../../../utils/constants";
import ConfirmModal from "../../common/ConfirmModal";
import ProjectRepository from '../../../repositories/ProjectRepository'
import {useProjectDetails} from '../../../hooks/useProjects'
import ProjectRepository from "../../../repositories/ProjectRepository";
import { useProjectDetails } from "../../../hooks/useProjects";
import showToast from "../../../services/toastService";
import { cacheData, getCachedData } from "../../../slices/apiDataManager";
import { useDispatch } from "react-redux";
@ -22,11 +22,13 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
const [showModal2, setShowModal2] = useState(false);
const ManageTasks = useHasUserPermission(MANAGE_TASK);
const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
const [ loadingDelete, setLoadingDelete ] = useState( false )
const [loadingDelete, setLoadingDelete] = useState(false);
const project = getCachedData("projectInfo");
const dispatch = useDispatch()
const dispatch = useDispatch();
const {projects_Details} = useProjectDetails(projectId || project?.projectId)
const { projects_Details } = useProjectDetails(
projectId || project?.projectId
);
const openModal = () => setIsModalOpen(true);
const closeModal = () => setIsModalOpen(false);
@ -57,14 +59,11 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
}, []);
const showModal1 = () => setShowModal(true);
const closeModal1 = () => setShowModal(false);
const showModalDelete = () => setShowModal2(true);
const closeModalDelete = () => setShowModal2(false);
const handleSubmit = async () => {
setLoadingDelete(true);
try
@ -107,19 +106,17 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
});
dispatch(refreshData(true));
closeModalDelete()
setLoadingDelete(false)
showToast("Activity Deleted Successfully","success")
} catch ( error )
{
setLoadingDelete( false )
closeModalDelete()
closeModalDelete();
setLoadingDelete(false);
showToast("Activity Deleted Successfully", "success");
} catch (error) {
setLoadingDelete(false);
closeModalDelete();
const message =
error.response?.data?.message ||
error.message ||
"An unexpected error occurred";
showToast(message, "error");
}
};
return (
@ -136,7 +133,8 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
</div>
)}
{showModal && <div
{showModal && (
<div
className={`modal fade ${showModal ? "show" : ""}`}
tabIndex="-1"
role="dialog"
@ -150,18 +148,30 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
floor={forFloor}
onClose={closeModal1}
/>
</div>}
</div>
)}
{showModal2 && <div
{showModal2 && (
<div
className={`modal fade ${showModal2 ? "show" : ""}`}
tabIndex="-1"
role="dialog"
style={{ display: showModal2 ? "block" : "none" }}
aria-hidden='false'
style={{
display: showModal2 ? "block" : "none",
backgroundColor: showModal2 ? "rgba(0,0,0,0.5)" : "transparent",
}}
aria-hidden="false"
>
<ConfirmModal type={"delete"} header={"Delete Activity"} message={"Are you sure you want delete?"} onSubmit={ handleSubmit} onClose={closeModalDelete} loading={loadingDelete}/>
</div> }
<ConfirmModal
type={"delete"}
header={"Delete Activity"}
message={"Are you sure you want delete?"}
onSubmit={handleSubmit}
onClose={closeModalDelete}
loading={loadingDelete}
/>
</div>
)}
<tr>
<td className="text-start table-cell-small">
@ -176,8 +186,11 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
{/* for mobile view */}
<td className="text-center d-sm-none d-sm-table-cell">
{hasWorkItem
? NewWorkItem?.workItem?.completedWork ?? workItem?.completedWork ?? "NA"
: "NA"}/{" "}
? NewWorkItem?.workItem?.completedWork ??
workItem?.completedWork ??
"NA"
: "NA"}
/{" "}
{hasWorkItem
? NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork
: "NA"}
@ -185,12 +198,16 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
{/* for greather than mobile view ************* */}
<td className="text-center d-none d-md-table-cell">
{hasWorkItem
? NewWorkItem?.workItem?.plannedWork ?? workItem?.plannedWork ?? "NA"
? NewWorkItem?.workItem?.plannedWork ??
workItem?.plannedWork ??
"NA"
: "NA"}
</td>
<td className="text-center d-none d-md-table-cell">
{hasWorkItem
? NewWorkItem?.workItem?.completedWork ?? workItem?.completedWork ?? "NA"
? NewWorkItem?.workItem?.completedWork ??
workItem?.completedWork ??
"NA"
: "NA"}
</td>
<td className="text-center" style={{ width: "15%" }}>

61
src/components/Project/Teams.jsx
View File

@ -12,6 +12,7 @@ import { changeMaster } from "../../slices/localVariablesSlice";
import useMaster from "../../hooks/masterHook/useMaster";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { ASSIGN_TO_PROJECT } from "../../utils/constants";
import ConfirmModal from "../common/ConfirmModal";
const Teams = ({ project }) => {
const dispatch = useDispatch();
@ -26,10 +27,12 @@ const Teams = ({ project }) => {
const [assignedLoading, setAssignedLoading] = useState(false);
const [ employeeLodaing, setEmployeeLoading ] = useState( false );
const [ activeEmployee, setActiveEmployee ] = useState( true )
const [deleteEmployee,setDeleteEmplyee] = useState(null)
const navigate = useNavigate();
const HasAssignUserPermission = useHasUserPermission( ASSIGN_TO_PROJECT );
const[IsDeleteModal,setIsDeleteModal] = useState(false)
const fetchEmployees = async () => {
try {
@ -40,6 +43,7 @@ const Teams = ({ project }) => {
.then((response) => {
setEmployees(response.data);
setFilteredEmployees( response.data.filter( ( emp ) => emp.isActive ) );
console.log(response)
setEmployeeLoading(false);
})
.catch((error) => {
@ -52,16 +56,25 @@ const Teams = ({ project }) => {
}
};
const submitAllocations = (items) => {
const submitAllocations = (items,added) => {
ProjectRepository.manageProjectAllocation(items)
.then((response) => {
showToast("Details updated successfully.", "success");
fetchEmployees();
if ( added )
{
showToast("Employee Assigned Successfully", "success");
}else{
showToast("Removed Employee Successfully", "success");
}
setRemovingEmployeeId(null);
setAssignedLoading( false );
setDeleteEmplyee( null )
closeDeleteModal()
})
.catch((error) => {
showToast(error.message, "error");
const message = error.response.data.message || error.message || "Error Occured during Api Call";
showToast( message, "error" );
closeDeleteModal()
});
};
@ -74,7 +87,8 @@ const Teams = ({ project }) => {
projectId: project.id,
status: false,
},
]);
] ,false);
};
const handleEmpAlicationFormSubmit = (allocaionObj) => {
@ -87,7 +101,8 @@ const Teams = ({ project }) => {
};
});
submitAllocations(items);
submitAllocations( items ,true);
};
const getRole = (jobRoleId) => {
@ -140,6 +155,13 @@ const Teams = ({ project }) => {
}
};
const deleteModalOpen = (item) =>
{
setDeleteEmplyee(item)
setIsDeleteModal(true)
}
const closeDeleteModal = ()=> setIsDeleteModal(false)
return (
<>
<div
@ -160,6 +182,31 @@ const Teams = ({ project }) => {
></MapUsers>
</div>
{IsDeleteModal && (
<div
className={`modal fade ${IsDeleteModal ? "show" : ""}`}
tabIndex="-1"
role="dialog"
style={{
display: IsDeleteModal ? "block" : "none",
backgroundColor: IsDeleteModal ? "rgba(0,0,0,0.5)" : "transparent",
}}
aria-hidden="false"
>
<ConfirmModal
type={"delete"}
header={"Removed Employee"}
message={"Are you sure you want delete?"}
onSubmit={removeAllocation}
onClose={closeDeleteModal}
loading={employeeLodaing}
paramData={deleteEmployee}
/>
</div>
)}
<div className="card card-action mb-6">
<div className="card-body">
<div className="row">
@ -259,7 +306,7 @@ const Teams = ({ project }) => {
type="button"
title="Remove from project"
className="btn p-0 dropdown-toggle hide-arrow"
onClick={() => removeAllocation(item)}
onClick={() => deleteModalOpen(item)}
>
{" "}
{removingEmployeeId === item.id ? (
@ -283,7 +330,7 @@ const Teams = ({ project }) => {
</tbody>
</table>
)}
{!employeeLodaing && employees.length == 0 && (
{(!employeeLodaing && employees.length == 0 )&& (
<span>No employees assigned to the project</span>
)}
</div>

4
src/components/common/ConfirmModal.jsx
View File

@ -1,6 +1,6 @@
import React, { useState } from 'react';
const ConfirmModal = ({ type, onSubmit, onClose, message, loading ,header}) => {
const ConfirmModal = ({ type, onSubmit, onClose, message, loading ,header, paramData}) => {
const TypeofIcon = (type) => {
switch (type) {
@ -48,7 +48,7 @@ const ConfirmModal = ({ type, onSubmit, onClose, message, loading ,header}) => {
<div className='d-flex justify-content-end mt-4'>
<button
className='btn btn-primary btn-sm'
onClick={onSubmit}
onClick={()=>onSubmit(paramData)}
disabled={loading}
>
{loading ? "Please Wait..." : "Yes"}

53
src/pages/employee/EmployeeList.jsx
View File

@ -21,6 +21,7 @@ import {
} from "../../utils/tableExportUtils";
import EmployeeRepository from "../../repositories/EmployeeRepository";
import ManageEmployee from "../../components/Employee/ManageEmployee";
import ConfirmModal from "../../components/common/ConfirmModal";
const EmployeeList = () => {
const { profile: loginUser } = useProfile();
@ -43,6 +44,9 @@ const EmployeeList = () => {
const [filteredData, setFilteredData] = useState([]);
const [showModal, setShowModal] = useState(false);
const [ selectedEmployeeId, setSelecedEmployeeId ] = useState();
const [ IsDeleteModalOpen, setIsDeleteModalOpen ] = useState( false )
const [ selectedEmpFordelete, setSelectedEmpFordelete ] = useState( null )
const[employeeLodaing,setemployeeLodaing] = useState(false)
const navigate = useNavigate();
@ -108,7 +112,7 @@ const EmployeeList = () => {
const handleClose = () => setShowModal(false);
const suspendEmployee = (id) => {
// console.log(id);
setemployeeLodaing(true)
EmployeeRepository.deleteEmployee(id)
.then((response) => {
showToast("Employee deleted successfully.", "success");
@ -118,6 +122,8 @@ const EmployeeList = () => {
clearCacheKey("employeeProfile");
setEmployeeList([]);
recallEmployeeData( showInactive );
setemployeeLodaing( false )
setIsDeleteModalOpen(false)
})
.catch((error) => {
const message =
@ -125,6 +131,8 @@ const EmployeeList = () => {
error.message ||
"An unexpected error occurred";
showToast( message, "error" );
setemployeeLodaing( false )
setIsDeleteModalOpen(false)
});
};
@ -170,6 +178,14 @@ const EmployeeList = () => {
setShowModal(true);
};
const handleOpenDelete = (employee) =>
{
console.log(employee)
setSelectedEmpFordelete( employee )
setIsDeleteModalOpen( true );
}
return (
<>
{isCreateModalOpen && (
@ -195,6 +211,31 @@ const EmployeeList = () => {
</div>
</div>
{IsDeleteModalOpen && (
<div
className={`modal fade ${IsDeleteModalOpen ? "show" : ""}`}
tabIndex="-1"
role="dialog"
style={{
display: IsDeleteModalOpen ? "block" : "none",
backgroundColor: IsDeleteModalOpen ? "rgba(0,0,0,0.5)" : "transparent",
}}
aria-hidden="false"
>
<ConfirmModal
type={"delete"}
header={"Suspend Employee"}
message={"Are you sure you want delete?"}
onSubmit={suspendEmployee}
onClose={()=>setIsDeleteModalOpen(false)}
loading={employeeLodaing}
paramData={selectedEmpFordelete}
/>
</div>
)}
<div className="container-xxl flex-grow-1 container-p-y">
<Breadcrumb
data={[
@ -375,7 +416,7 @@ const EmployeeList = () => {
aria-label="User: activate to sort column ascending"
aria-sort="descending"
>
Name
<div className="text-start ms-6">Name</div>
</th>
<th
className="sorting sorting_desc d-none d-sm-table-cell"
@ -386,7 +427,7 @@ const EmployeeList = () => {
aria-label="User: activate to sort column ascending"
aria-sort="descending"
>
Email
<div className="text-start ms-5">Email</div>
</th>
<th
className="sorting sorting_desc d-none d-sm-table-cell"
@ -397,7 +438,7 @@ const EmployeeList = () => {
aria-label="User: activate to sort column ascending"
aria-sort="descending"
>
Contact
<div className="text-start ms-5">Contact</div>
</th>
<th
className="sorting sorting_desc d-none d-sm-table-cell"
@ -408,7 +449,7 @@ const EmployeeList = () => {
aria-label="User: activate to sort column ascending"
aria-sort="descending"
>
Role
<div className="text-start ms-5">Role</div>
</th>
<th
@ -578,7 +619,7 @@ const EmployeeList = () => {
<>
<button
className="dropdown-item py-1"
onClick={() => suspendEmployee(item.id)}
onClick={()=>handleOpenDelete(item.id)}
>
<i className="bx bx-task-x bx-sm"></i>{" "}
Suspend

4
src/pages/master/MasterTable.jsx
View File

@ -72,8 +72,8 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
<thead>
<tr>
<th></th>
<th> {selectedMaster === "Activity" ? "Activity" : "Name"}</th>
<th> {selectedMaster === "Activity" ? "Unit" : "Description"}</th>
<th className="text-start"> {selectedMaster === "Activity" ? "Activity" : "Name"}</th>
<th className="text-start"> {selectedMaster === "Activity" ? "Unit" : "Description"}</th>
<th className={` ${!hasMasterPermission && "d-none"}`}>
Actions
</th>

2
src/pages/project/ProjectList.jsx
View File

@ -266,7 +266,7 @@ const ProjectList = () => {
<th className="text-start" colSpan={5}>
Project Name
</th>
<th className="mx-2">Project Manger</th>
<th className="mx-2 text-start">Project Manger</th>
<th className="mx-2">START DATE</th>
<th className="mx-2">DEADLINE</th>
<th className="mx-2">Task</th>