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

Merge pull request 'Vaibhav_Resolved_Issues' (#2) from Vaibhav_Resolved_Issues into Feature_Task_Management

Browse Source 
Reviewed-on: #2
This commit is contained in:
Gitea Admin 2025-04-08 07:53:03 +00:00
commit 14ca1eb54c
4 changed files with 160 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/Project/Infrastructure/TaskModel.jsx
View File

@ -26,7 +26,7 @@ const TaskModel = ({
activities, activities,
onSubmit, onSubmit,
clearTrigger, clearTrigger,
onClearComplete, onClearComplete,onClose
}) => { }) => {
const [formData, setFormData] = useState(defaultModel); const [formData, setFormData] = useState(defaultModel);
const [selectedBuilding, setSelectedBuilding] = useState(null); const [selectedBuilding, setSelectedBuilding] = useState(null);
@ -124,12 +124,7 @@ const TaskModel = ({
<div className="modal-content"> <div className="modal-content">
<div className="modal-body"> <div className="modal-body">
<div className="row"> <div className="row">
<button <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
type="button"
className="btn-close"
data-bs-dismiss="modal"
aria-label="Close"
></button>
<div className="text-center mb-1"> <div className="text-center mb-1">
<h5 className="mb-1">Manage Task</h5> <h5 className="mb-1">Manage Task</h5>
</div> </div>
@ -290,10 +285,9 @@ const TaskModel = ({
{formData.id !== "0" && formData.id !== "" ? "Edit Task" : "Add Task"} {formData.id !== "0" && formData.id !== "" ? "Edit Task" : "Add Task"}
</button> </button>
<button <button
type="reset" type="button"
className="btn btn-label-secondary" className="btn btn-label-secondary"
data-bs-dismiss="modal" onClick={onClose}
aria-label="Close"
> >
Cancel Cancel
</button> </button>

4
src/components/Project/Infrastructure/WorkAreaModel.jsx
View File

@ -19,7 +19,7 @@ const defaultModel = {
floorId: "0", floorId: "0",
}; };
const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete }) => { const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClose }) => {
const [selectedBuilding, setSelectedBuilding] = useState(null); const [selectedBuilding, setSelectedBuilding] = useState(null);
const [ selectedFloor, setSelectedFloor ] = useState( null ); const [ selectedFloor, setSelectedFloor ] = useState( null );
const [selectdWorkArea,setWorkArea] = useState() const [selectdWorkArea,setWorkArea] = useState()
@ -111,7 +111,7 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete }) =>
<div className="modal-content"> <div className="modal-content">
<div className="modal-body"> <div className="modal-body">
<div className="row"> <div className="row">
<button type="button" className="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
<div className="text-center mb-1"> <div className="text-center mb-1">
<h5 className="mb-1">Manage Work Area</h5> <h5 className="mb-1">Manage Work Area</h5>
</div> </div>

244
src/components/Project/ProjectInfra.jsx
View File

@ -49,8 +49,8 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
const openAssignModel=(assignData)=>{ const openAssignModel=(assignData)=>{
setCurrentBuilding(assignData) setCurrentBuilding(assignData)
setIsAssingRoleModal(true) setIsAssingRoleModal(true)
} }
@ -71,111 +71,111 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
let response = await ProjectRepository.manageProjectInfra( infraObject ); let response = await ProjectRepository.manageProjectInfra( infraObject );
const entity = response.data; const entity = response.data;
const updatedProject = { ...project }; const updatedProject = { ...project };
// Handle the building data // Handle the building data
if (entity.building) { if (entity.building) {
const { id, name, description } = entity.building; const { id, name, description } = entity.building;
const updatedBuildings = updatedProject.buildings.map((building) => const updatedBuildings = updatedProject.buildings.map((building) =>
building.id === id building.id === id
? { ...building, name, description } ? { ...building, name, description }
: building : building
); );
// Add building if it doesn't exist // Add building if it doesn't exist
if (!updatedProject.buildings.some((building) => building.id === id)) { if (!updatedProject.buildings.some((building) => building.id === id)) {
updatedBuildings.push({ updatedBuildings.push({
id: id, id: id,
name, name,
description, description,
floor: [], floor: [],
}); });
} }
updatedProject.buildings = updatedBuildings; updatedProject.buildings = updatedBuildings;
// Update the cache for buildings // Update the cache for buildings
cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} ); cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
setProject(updatedProject) setProject(updatedProject)
} }
// Handle the floor data // Handle the floor data
else if ( entity.floor ) else if ( entity.floor )
{ {
const { buildingId, id, floorName } = entity.floor; const { buildingId, id, floorName } = entity.floor;
const updatedBuildings = updatedProject.buildings.map((building) => const updatedBuildings = updatedProject.buildings.map((building) =>
building.id == buildingId building.id == buildingId
? { ? {
...building, ...building,
floors: building.floors.map( ( floor ) => floors: building.floors.map( ( floor ) =>
floor.id === id floor.id === id
? { ? {
...floor, ...floor,
floorName, // Update the floor name only floorName, // Update the floor name only
// Keep other properties as they are (including workArea) // Keep other properties as they are (including workArea)
} }
: floor : floor
) )
// Add the new floor if it doesn't already exist // Add the new floor if it doesn't already exist
.concat( .concat(
!building.floors.some((floor) => floor.id === id) !building.floors.some((floor) => floor.id === id)
? [{ id: id, floorName, workArea: null }] // New floor added with workArea set to null ? [{ id: id, floorName, workArea: null }] // New floor added with workArea set to null
: [] : []
), ),
} }
: building : building
); );
updatedProject.buildings = updatedBuildings; updatedProject.buildings = updatedBuildings;
// Cache the updated project // Cache the updated project
cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} ); cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
setProject(updatedProject) setProject(updatedProject)
} }
// Handle the work area data // Handle the work area data
else if ( entity.workArea ) else if ( entity.workArea )
{ {
let buildingId = infraObject[0].workArea.buildingId let buildingId = infraObject[0].workArea.buildingId
const { floorId, areaName, id } = entity.workArea; const { floorId, areaName, id } = entity.workArea;
// Check if the workArea exists, otherwise create a new one // Check if the workArea exists, otherwise create a new one
const updatedBuildings = updatedProject.buildings.map((building) => const updatedBuildings = updatedProject.buildings.map((building) =>
building.id == buildingId building.id == buildingId
? { ? {
...building, ...building,
floors: building.floors.map((floor) => floors: building.floors.map((floor) =>
floor.id == floorId floor.id == floorId
? { ? {
...floor, ...floor,
workAreas: floor.workAreas.some((workArea) => workArea.id === id) workAreas: floor.workAreas.some((workArea) => workArea.id === id)
? floor.workAreas.map((workArea) => ? floor.workAreas.map((workArea) =>
workArea.id === id workArea.id === id
? { ...workArea, areaName } ? { ...workArea, areaName }
: workArea : workArea
) )
: [ : [
...floor.workAreas, ...floor.workAreas,
{ id, areaName, workItems: null }, { id, areaName, workItems: null },
], ],
} }
: floor : floor
), ),
} }
: building : building
); );
updatedProject.buildings = updatedBuildings; updatedProject.buildings = updatedBuildings;
// Update the cache for work areas // Update the cache for work areas
cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} ); cacheData( "projectInfo", {projectId: updatedProject.id, data: updatedProject} );
setProject(updatedProject) setProject(updatedProject)
} }
// Handle the task (workItem) data // Handle the task (workItem) data
else { else {
console.error("Unsupported data type for submitData", entity); console.error("Unsupported data type for submitData", entity);
} }
} catch ( Err ) } catch ( Err )
{ {
showToast("Somthing wrong","error") showToast("Somthing wrong","error")
@ -262,25 +262,25 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
const updatedBuildings = updatedProject.buildings.map((building) => const updatedBuildings = updatedProject.buildings.map((building) =>
building.id == updatedModel.buildingID building.id == updatedModel.buildingID
? { ? {
...building, ...building,
floors: building.floors.map((floor) => floors: building.floors.map((floor) =>
floor.id == updatedModel.floorId floor.id == updatedModel.floorId
? { ? {
...floor, ...floor,
workAreas: floor.workAreas.map((workArea) => workAreas: floor.workAreas.map((workArea) =>
workArea.id === workItem?.workAreaId workArea.id === workItem?.workAreaId
? { ? {
...workArea, ...workArea,
workItems: workArea.workItems.some((existingItem) => existingItem.workItemId === workItem.workItemId) workItems: workArea.workItems.some((existingItem) => existingItem.workItemId === workItem.workItemId)
? workArea.workItems // If the workItemId already exists, keep the current workItems ? workArea.workItems // If the workItemId already exists, keep the current workItems
: [...workArea.workItems, workItem], : [...workArea.workItems, workItem],
} }
: workArea : workArea
), ),
} }
: floor : floor
), ),
} }
: building : building
); );
@ -347,21 +347,21 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
return ( return (
<> <>
<div <div
className={`modal fade ${showModal ? 'show' : ''}`} className={`modal fade ${showModal ? 'show' : ''}`}
tabIndex="-1" tabIndex="-1"
role="dialog" role="dialog"
style={{ display: showModal ? 'block' : 'none' }} style={{ display: showModal ? 'block' : 'none' }}
aria-hidden={!showModal} aria-hidden={!showModal}
> >
<BuildingModel <BuildingModel
project={data} project={data}
onClose={handleClose} onClose={handleClose}
onSubmit={handleBuildingModelFormSubmit} onSubmit={handleBuildingModelFormSubmit}
clearTrigger={clearFormTrigger} clearTrigger={clearFormTrigger}
onClearComplete={() => setClearFormTrigger(false)} onClearComplete={() => setClearFormTrigger(false)}
></BuildingModel> ></BuildingModel>
</div> </div>
{isFloorModalOpen && ( {isFloorModalOpen && (
<div <div
className="modal fade show" className="modal fade show"
@ -383,10 +383,12 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
{isWorkAreaModelOpen && ( {isWorkAreaModelOpen && (
<div <div
className={`modal fade `} className="modal fade show"
id="work-area-model" id="work-area-model"
tabIndex="-1" tabIndex="-1"
aria-hidden="true" role="dialog"
style={{ display: 'block' }}
aria-hidden="false"
> >
<WorkAreaModel <WorkAreaModel
project={data} project={data}
@ -395,16 +397,18 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
onSubmit={handleWorkAreaModelFormSubmit} onSubmit={handleWorkAreaModelFormSubmit}
clearTrigger={clearFormTrigger} clearTrigger={clearFormTrigger}
onClearComplete={() => setClearFormTrigger(false)} onClearComplete={() => setClearFormTrigger(false)}
></WorkAreaModel> />
</div> </div>
)} )}
{isTaskModelOpen && ( {isTaskModelOpen && (
<div <div
className={`modal fade `} className="modal fade show"
id="task-model" id="task-model"
tabIndex="-1" tabIndex="-1"
aria-hidden="true" role="dialog"
style={{ display: 'block' }}
aria-hidden="false"
> >
<TaskModel <TaskModel
project={data} project={data}
@ -413,7 +417,7 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
onSubmit={handleTaskModelFormSubmit} onSubmit={handleTaskModelFormSubmit}
clearTrigger={clearFormTrigger} clearTrigger={clearFormTrigger}
onClearComplete={() => setClearFormTrigger(false)} onClearComplete={() => setClearFormTrigger(false)}
></TaskModel> />
</div> </div>
)} )}
@ -439,20 +443,18 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
Manage Building Manage Building
</button> </button>
<button <button
type="button" type="button"
className="link-button m-1" className="link-button m-1"
onClick={() => openFloorModel()} onClick={() => openFloorModel()}
> >
<i className="bx bx-plus-circle me-2"></i> <i className="bx bx-plus-circle me-2"></i>
Manage Floors Manage Floors
</button> </button>
<button <button
type="button" type="button"
data-bs-toggle="modal"
className="link-button m-1" className="link-button m-1"
data-bs-target="#work-area-model"
onClick={() => openWorkAreaModel()} onClick={() => openWorkAreaModel()}
> >
<i className="bx bx-plus-circle me-2"></i> <i className="bx bx-plus-circle me-2"></i>
@ -460,9 +462,7 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
</button> </button>
<button <button
type="button" type="button"
data-bs-toggle="modal"
className="link-button m-1" className="link-button m-1"
data-bs-target="#task-model"
onClick={() => openTaskModel()} onClick={() => openTaskModel()}
> >
<i className="bx bx-plus-circle me-2"></i> <i className="bx bx-plus-circle me-2"></i>

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

@ -325,7 +325,7 @@ const EmployeeList = () =>
<p>Loading...</p> <p>Loading...</p>
</td> </td>
</tr>} </tr>}
{( !loading && employeeList?.length === 0 ) && <td colSpan={8}>Not Data Found </td>} {!loading && employeeList?.length === 0 && (<td colSpan={8} style={{ paddingTop: '20px', textAlign: 'center' }}>No Data Found</td> )}
{( !loading && employeeList && currentItems.length === 0 && employeeList.length !==0 ) && <td colSpan={8}><small className="muted">'{searchText}' employee not found</small> </td>} {( !loading && employeeList && currentItems.length === 0 && employeeList.length !==0 ) && <td colSpan={8}><small className="muted">'{searchText}' employee not found</small> </td>}
{(currentItems && !loading) && currentItems.sort((a, b) => b.id - a.id).map((item) => ( {(currentItems && !loading) && currentItems.sort((a, b) => b.id - a.id).map((item) => (