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

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

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-13 10:07:48 +05:30
commit 910565e003
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/Employee/EmpReportingManager.jsx
View File

@ -3,7 +3,7 @@ import { useOrganizationHierarchy } from "../../hooks/useEmployees";
import GlobalModel from "../common/GlobalModel"; import GlobalModel from "../common/GlobalModel";
import ManageReporting from "./ManageReporting"; import ManageReporting from "./ManageReporting";
const EmpReportingManager = ({ employeeId }) => { const EmpReportingManager = ({ employeeId, employee }) => {
const { data, isLoading } = useOrganizationHierarchy(employeeId); const { data, isLoading } = useOrganizationHierarchy(employeeId);
const [showManageReportingModal, setShowManageReportingModal] = useState(false); const [showManageReportingModal, setShowManageReportingModal] = useState(false);
@ -22,9 +22,11 @@ const EmpReportingManager = ({ employeeId }) => {
<div className="col-12 mb-4"> <div className="col-12 mb-4">
<div className="card"> <div className="card">
<div className="card-body"> <div className="card-body">
<small className="card-text text-uppercase text-body-secondary small d-block text-start mb-3"> <h5 className="m-0 py-1 mb-3">
Reporting Manager Update Reporting Manager
</small>
</h5>
{/* Primary Reporting Manager */} {/* Primary Reporting Manager */}
<div className="d-flex align-items-start mb-3"> <div className="d-flex align-items-start mb-3">
@ -32,7 +34,7 @@ const EmpReportingManager = ({ employeeId }) => {
<i className="bx bx-user bx-xs me-2 mt-1"></i> <i className="bx bx-user bx-xs me-2 mt-1"></i>
<span>Primary Reporting Manager</span> <span>Primary Reporting Manager</span>
</span> </span>
<span style={{ marginLeft: "10px" }}>:</span> <span style={{ marginLeft: "75px" }}>:</span>
<span className="ms-5"> <span className="ms-5">
{primary?.reportTo?.firstName || <em>NA</em>}{" "} {primary?.reportTo?.firstName || <em>NA</em>}{" "}
{primary?.reportTo?.lastName || ""} {primary?.reportTo?.lastName || ""}
@ -74,8 +76,10 @@ const EmpReportingManager = ({ employeeId }) => {
> >
<ManageReporting <ManageReporting
employeeId={employeeId} employeeId={employeeId}
employee={primary?.employee || {}}
onClosed={() => setShowManageReportingModal(false)} onClosed={() => setShowManageReportingModal(false)}
/> />
</GlobalModel> </GlobalModel>
)} )}
</div> </div>

8
src/components/Employee/ManageReporting.jsx
View File

@ -6,7 +6,7 @@ import PmsEmployeeInputTag from "../common/PmsEmployeeInputTag";
import { useManageEmployeeHierarchy, useOrganizationHierarchy } from "../../hooks/useEmployees"; import { useManageEmployeeHierarchy, useOrganizationHierarchy } from "../../hooks/useEmployees";
import { ManageReportingSchema, defaultManageReporting } from "./EmployeeSchema"; import { ManageReportingSchema, defaultManageReporting } from "./EmployeeSchema";
const ManageReporting = ({ onClosed, employeeId }) => { const ManageReporting = ({ onClosed, employee, employeeId }) => {
const { const {
handleSubmit, handleSubmit,
control, control,
@ -91,7 +91,11 @@ const ManageReporting = ({ onClosed, employeeId }) => {
return ( return (
<div> <div>
<form onSubmit={handleSubmit(onSubmit)} className="p-sm-0 p-2"> <form onSubmit={handleSubmit(onSubmit)} className="p-sm-0 p-2">
<h5 className="m-0 py-1 mb-3">Update Reporting Manager</h5> <h5 className="m-0 py-1 mb-3">
Update Reporting Manager (
{`${employee.firstName || ""} ${employee.middleName || ""} ${employee.lastName || ""}`.trim()}
)
</h5>
{/* Primary */} {/* Primary */}
<div className="mb-4 text-start"> <div className="mb-4 text-start">

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

@ -70,6 +70,7 @@ const EmployeeList = () => {
const [filteredData, setFilteredData] = useState([]); const [filteredData, setFilteredData] = useState([]);
const [showModal, setShowModal] = useState(false); const [showModal, setShowModal] = useState(false);
const [selectedEmployeeId, setSelectedEmployeeId] = useState(null); const [selectedEmployeeId, setSelectedEmployeeId] = useState(null);
const [selectedEmployee, setSelectedEmployee] = useState(null);
const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false); const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [selectedEmpFordelete, setSelectedEmpFordelete] = useState(null); const [selectedEmpFordelete, setSelectedEmpFordelete] = useState(null);
const [showManageReportingModal, setShowManageReportingModal] = useState(false); const [showManageReportingModal, setShowManageReportingModal] = useState(false);
@ -154,8 +155,9 @@ const EmployeeList = () => {
setShowModal(true); setShowModal(true);
}; };
const handleManageReporting = (id) => { const handleManageReporting = (employee) => {
setSelectedEmployeeId(id); setSelectedEmployee(employee);
setSelectedEmployeeId(employee.id);
setShowManageReportingModal(true); setShowManageReportingModal(true);
}; };
@ -247,6 +249,7 @@ const EmployeeList = () => {
closeModal={() => setShowManageReportingModal(false)} closeModal={() => setShowManageReportingModal(false)}
> >
<ManageReporting <ManageReporting
employee={selectedEmployee}
employeeId={selectedEmployeeId} employeeId={selectedEmployeeId}
onClosed={() => setShowManageReportingModal(false)} onClosed={() => setShowManageReportingModal(false)}
/> />
@ -658,7 +661,7 @@ const EmployeeList = () => {
data-bs-toggle="modal" data-bs-toggle="modal"
data-bs-target="#managerole-modal" data-bs-target="#managerole-modal"
onClick={() => onClick={() =>
handleManageReporting(item.id) handleManageReporting(item)
} }
> >
<i className="bx bx-network-chart bx-sm"></i>{" "} <i className="bx bx-network-chart bx-sm"></i>{" "}