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

Merge branch 'Kartik_Bug#301' into Issue_May_4W

Browse Source 
# Conflicts:
#	src/components/Project/Infrastructure/FloorModel.jsx
This commit is contained in:
Vikas Nale 2025-05-24 20:48:37 +05:30
commit 7a1a55f52f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Project/Infrastructure/FloorModel.jsx
View File

@ -4,7 +4,6 @@ import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import showToast from "../../../services/toastService"; import showToast from "../../../services/toastService";
// ✅ Updated Zod validation schema
const floorSchema = z.object({ const floorSchema = z.object({
buildingId: z buildingId: z
.string() .string()

7
src/components/Project/MapUsers.jsx
View File

@ -129,6 +129,11 @@ const MapUsers = ({
)} )}
</div> </div>
</div> </div>
<div className="d-flex justify-content-start align-items-center px-4 mt-6">
<h5 className="mb-0 mt-1">
<i className=" text-warning me-3"></i> Select Employee
</h5>
</div>
<div className="modal-body p-sm-4 p-0"> <div className="modal-body p-sm-4 p-0">
<table <table
className="datatables-users table border-top dataTable no-footer dtr-column " className="datatables-users table border-top dataTable no-footer dtr-column "
@ -136,7 +141,7 @@ const MapUsers = ({
aria-describedby="DataTables_Table_0_info" aria-describedby="DataTables_Table_0_info"
style={{ width: "100%" }} style={{ width: "100%" }}
> >
<thead></thead>
<tbody> <tbody>
{employeeLoading && allocationEmployeesData.length === 0 && ( {employeeLoading && allocationEmployeesData.length === 0 && (
<p>Loading...</p> <p>Loading...</p>