No Result Found
Report Task
Create Sub Task
Activity Progress Chart
Loading activity data...
No data available.
Daily Attendance Data
Manage Buckets
{employee ? "Update Employee" : "Create Employee"}
+ {" "} + {employee ? "Update Employee" : "Create Employee"} +
{orgData.name}
+ {errors.spridSearchText.message} +
Not Found
{data?.name}
Assign Task
@@ -252,7 +223,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { assignData?.workArea?.areaName, assignData?.workItem?.activityMaster?.activityName, ] - .filter(Boolean) // Filter out any undefined/null values + .filter(Boolean) .map((item, index, array) => ( {item} @@ -268,20 +239,64 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { - + + + + + setSelectedOrganization(e.target.value) + } + > + {isServiceLoading ? ( + Loading... + ) : ( + <> + --Select Organization-- + {organizationList?.map((org,index) => ( + + {org.name} + + ))} + + )} + + + + setSelectedService(e.target.value)} + > + {isOrgLoading ? ( + Loading... + ) : ( + <> + --Select Service-- + {serviceList?.data?.map((service,index) => ( + + {service.name} + + ))} + + )} + + + - Select Team - {/* Dropdown */} setOpen(!open)} > @@ -290,7 +305,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { {/* Badge */} {selectedRolesCount > 0 && ( { id="checkboxAllRoles" value="all" checked={selectedRoles.includes("all")} - onChange={(e) => handleRoleChange(e, e.target.value)} + onChange={(e) => + handleRoleChange(e, e.target.value) + } /> { type="checkbox" id={`checkboxRole-${role.id}`} value={role.id} - checked={selectedRoles.includes(String(role.id))} - onChange={(e) => handleRoleChange(e, e.target.value)} + checked={selectedRoles.includes( + String(role.id) + )} + onChange={(e) => + handleRoleChange(e, e.target.value) + } /> { {/* Search Box */} - + + + @@ -381,19 +403,19 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { > {selectedRoles?.length > 0 && ( - {employeeLoading ? ( + {isEmployeeLoading ? ( Loading employees... ) : filteredEmployees?.length > 0 ? ( - filteredEmployees.map((emp) => { + filteredEmployees.map((emp,index) => { const jobRole = jobRoleData?.find( (role) => role?.id === emp?.jobRoleId ); return ( @@ -441,7 +463,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { ) : ( - No employees found for the selected role. + No employees found for the selected filter. )} @@ -456,12 +478,14 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { {watch("selectedEmployees")?.length > 0 && ( - {watch("selectedEmployees")?.map((empId) => { - const emp = employees.find((emp) => emp.id === empId); + {watch("selectedEmployees")?.map((empId,ind) => { + const emp = employees?.data?.find( + (emp) => emp.id === empId + ); return ( emp && ( {emp.firstName} {emp.lastName} @@ -506,7 +530,12 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { {assignData?.workItem?.plannedWork - assignData?.workItem?.completedWork} {" "} - {assignData?.workItem?.activityMaster?.unitOfMeasurement} + + { + assignData?.workItem?.activityMaster + ?.unitOfMeasurement + } + @@ -537,8 +566,15 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { className="form-control form-control-sm" {...field} /> - - {assignData?.workItem?.activityMaster?.unitOfMeasurement} + + + { + assignData?.workItem?.activityMaster + ?.unitOfMeasurement + } + )} @@ -546,19 +582,17 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => { {errors.plannedTask && ( - {errors.plannedTask.message} + + {errors.plannedTask.message} + )} - - {/* Description - */} - - Description { {isSubmitting ? "Please Wait" : "Submit"} - diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx index c3d12648..e57b6a30 100644 --- a/src/components/Project/Infrastructure/EditActivityModal.jsx +++ b/src/components/Project/Infrastructure/EditActivityModal.jsx @@ -32,9 +32,8 @@ const EditActivityModal = ({ building, floor, onClose, -} ) => -{ - +}) => { + const { activities, loading: loadingActivities } = useActivitiesMaster(); const { categories, loading: loadingCategories } = useWorkCategoriesMaster(); const [selectedActivity, setSelectedActivity] = useState(null); @@ -57,13 +56,12 @@ const EditActivityModal = ({ comment: "", }, }); -const { mutate: UpdateTask, isPending } = useManageTask({ - onSuccessCallback: (response) => - { - showToast( response?.message, "success" ) - onClose() - } -} ); + const { mutate: UpdateTask, isPending } = useManageTask({ + onSuccessCallback: (response) => { + showToast(response?.message, "success") + onClose() + } + }); @@ -82,34 +80,33 @@ const { mutate: UpdateTask, isPending } = useManageTask({ [categories] ); -useEffect(() => { - if (!workItem) return; - console.log(workItem) - reset({ - activityID: String( - workItem?.workItem?.activityId || workItem?.activityMaster?.id - ), - workCategoryId: String( - workItem?.workItem?.workCategoryId || workItem?.workCategoryMaster?.id - ), - plannedWork: - workItem?.workItem?.plannedWork || workItem?.plannedWork || 0, - completedWork: - workItem?.workItem?.completedWork || workItem?.completedWork || 0, - comment: workItem?.workItem?.description || workItem?.description || "", - }); -}, [workItem?.id,selectedActivity]); + useEffect(() => { + if (!workItem) return; + console.log(workItem) + reset({ + activityID: String( + workItem?.workItem?.activityId || workItem?.activityMaster?.id + ), + workCategoryId: String( + workItem?.workItem?.workCategoryId || workItem?.workCategoryMaster?.id + ), + plannedWork: + workItem?.workItem?.plannedWork || workItem?.plannedWork || 0, + completedWork: + workItem?.workItem?.completedWork || workItem?.completedWork || 0, + comment: workItem?.workItem?.description || workItem?.description || "", + }); + }, [workItem?.id, selectedActivity]); useEffect(() => { const selected = activities?.find((a) => a.id === activityID); - setSelectedActivity( selected || null ); + setSelectedActivity(selected || null); }, [activityID, activities]); - const onSubmitForm = (data) => - { - const payload = { + const onSubmitForm = (data) => { + const payload = { ...data, id: workItem?.workItem?.id ?? workItem?.id, buildingID: building?.id, @@ -125,9 +122,9 @@ useEffect(() => { buildingId: building?.id, floorId: floor?.id, workAreaId: workArea?.id, - previousCompletedWork:completedTask + previousCompletedWork: completedTask }); - } + } return ( @@ -162,14 +159,26 @@ useEffect(() => { disabled /> + + Select Service + + + Select Activity - Select Activity + Select Activity {loadingActivities ? ( Loading... ) : ( @@ -264,7 +273,7 @@ useEffect(() => { disabled={isPending} > {isPending ? "Please Wait..." : "Edit Task"} - + ); diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx index fb484f6e..cb6b6cb0 100644 --- a/src/components/Project/Infrastructure/InfraTable.jsx +++ b/src/components/Project/Infrastructure/InfraTable.jsx @@ -11,7 +11,7 @@ import { getCachedData, } from "../../../slices/apiDataManager"; -const InfraTable = ({ buildings, projectId}) => { +const InfraTable = ({ buildings, projectId }) => { const [projectBuilding, setProjectBuilding] = useState([]); const [expandedBuildings, setExpandedBuildings] = useState([]); const [showFloorModal, setShowFloorModal] = useState(false); @@ -100,7 +100,7 @@ const InfraTable = ({ buildings, projectId}) => { No floors have been added yet. Start by adding floors to manage this building. - +
Loading employees...
- No employees found for the selected role. + No employees found for the selected filter.
{errors.activityID.message}
{errors.activityGroupId.message}
Now that the project is created, you can access this content.
Assign Employee
Select Employee
Start Date: - {projectInfo.startDate - ? moment(projectInfo.startDate).format("DD-MMM-YYYY") + {project.startDate + ? moment(project?.startDate).format("DD-MMM-YYYY") : "NA"}
Deadline: - {projectInfo.endDate - ? moment(projectInfo.endDate).format("DD-MMM-YYYY") + {project?.endDate + ? moment(project?.endDate).format("DD-MMM-YYYY") : "NA"}
{projectInfo.projectAddress}
{project?.projectAddress}
No projects found.
No Infra Avaiable
Loading...
Assign Employee To Project
No organizations found
Enter employee you want to find.
Something went wrong. Please try again later.
No available employees to assign.
Loading..
+ {!activeEmployee + ? "No active employees assigned to the project" + : "No inactive employees assigned to the project"} +
{checkListItems.length > 0 ? "Check List" : "Add Check List"}
+ {/*
{data ? "Update Document Category" : "Add Document Category"} -
{errors.description.message}
{errors.name.message}
Manage Service
{service.name}
{group.name}
+ Loading activities... +
+ No activities found +
Service not assigned
Switch Workplace
+ {tenant?.name} +
Industry:
+ {tenant?.industry?.name || "Not Available"} +
+ {tenant?.description} +
No tenant assigned to your account.
Welcome
+ Please select which dashboard you want to explore!!! +
- - {getProjectStatusName(projectInfo.projectStatusId)} - -
{error.message}