From 0ac1141579042a24507aca22fe180915f5ccdaea Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Fri, 21 Nov 2025 12:58:47 +0530
Subject: [PATCH] changed filed for project and employee now not need project
 for select employee

---
 src/components/Expenses/ManageExpense.jsx | 66 ++++++++++++++---------
 src/hooks/useEmployees.js                 |  2 +-
 src/repositories/EmployeeRepository.jsx   |  5 +-
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx
index 724899c7..40b4bebf 100644
--- a/src/components/Expenses/ManageExpense.jsx
+++ b/src/components/Expenses/ManageExpense.jsx
@@ -32,8 +32,11 @@ import Label from "../common/Label";
 import EmployeeSearchInput from "../common/EmployeeSearchInput";
 import Filelist from "./Filelist";
 import { DEFAULT_CURRENCY } from "../../utils/constants";
-import SelectEmployeeServerSide, { SelectProjectField } from "../common/Forms/SelectFieldServerSide";
+import SelectEmployeeServerSide, {
+  SelectProjectField,
+} from "../common/Forms/SelectFieldServerSide";
 import { useAllocationServiceProjectTeam } from "../../hooks/useServiceProject";
+import { AppFormController } from "../../hooks/appHooks/useAppForm";
 
 const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   const {
@@ -153,15 +156,14 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
     }
   };
 
-  const { mutate: AllocationTeam, isPending1 } = useAllocationServiceProjectTeam(
-    () => {
+  const { mutate: AllocationTeam, isPending1 } =
+    useAllocationServiceProjectTeam(() => {
       setSelectedEmployees([]);
       setSeletingEmp({
         employee: null,
         isOpen: false,
       });
-    }
-  );
+    });
   useEffect(() => {
     if (expenseToEdit && data) {
       reset({
@@ -180,17 +182,17 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
         currencyId: data.currency.id || DEFAULT_CURRENCY,
         billAttachments: data.documents
           ? data.documents.map((doc) => ({
-            fileName: doc.fileName,
-            base64Data: null,
-            contentType: doc.contentType,
-            documentId: doc.documentId,
-            fileSize: 0,
-            description: "",
-            preSignedUrl: doc.preSignedUrl,
-            isActive: doc.isActive ?? true,
-          }))
+              fileName: doc.fileName,
+              base64Data: null,
+              contentType: doc.contentType,
+              documentId: doc.documentId,
+              fileSize: 0,
+              description: "",
+              preSignedUrl: doc.preSignedUrl,
+              isActive: doc.isActive ?? true,
+            }))
           : [],
-      });     
+      });
     }
   }, [data, reset]);
   const { mutate: ExpenseUpdate, isPending } = useUpdateExpense(() =>
@@ -264,7 +266,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               required
               placeholder="Select Project"
               value={watch("projectId")}
-
               onChange={(val) =>
                 setValue("projectId", val, {
                   shouldDirty: true,
@@ -337,16 +338,30 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             )}
           </div>
           <div className="col-12 col-md-6 text-start">
-            <Label className="form-label" required>
+            {/* <Label className="form-label" required>
               Paid By{" "}
-            </Label>
-            <EmployeeSearchInput
+            </Label> */}
+            {/* <EmployeeSearchInput
               control={control}
               name="paidById"
               projectId={null}
               forAll={true}
+            /> */}
+
+            <AppFormController
+              name="paidById"
+              
+              control={control}
+              render={({ field }) => (
+                <SelectEmployeeServerSide
+                label="Paid By" required
+                  value={field.value}
+                  onChange={field.onChange}
+                  isFullObject={false} // because using ID
+                />
+              )}
             />
-          </div>         
+          </div>
         </div>
 
         <div className="row my-2 text-start">
@@ -453,7 +468,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               <small className="danger-text">{errors.gstNumber.message}</small>
             )}
           </div>
-
         </div>
         <div className="row">
           <div className="col-md-6 text-start ">
@@ -484,7 +498,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
           </div>
           {expenseCategory?.noOfPersonsRequired && (
             <div className="col-md-6  text-start">
-              <Label className="form-label" required>No. of Persons</Label>
+              <Label className="form-label" required>
+                No. of Persons
+              </Label>
               <input
                 type="number"
                 id="noOfPersons"
@@ -570,7 +586,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
                     (fileError?.fileSize?.message ||
                       fileError?.contentType?.message ||
                       fileError?.base64Data?.message,
-                      fileError?.documentId?.message)
+                    fileError?.documentId?.message)
                   }
                 </div>
               ))}
@@ -595,8 +611,8 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             {isPending || createPending
               ? "Please Wait..."
               : expenseToEdit
-                ? "Update"
-                : "Save as Draft"}
+              ? "Update"
+              : "Save as Draft"}
           </button>
         </div>
       </form>
diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index cb87c39b..ae0e5f45 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -231,7 +231,7 @@ export const useEmployeesName = (projectId, search, allEmployee) => {
     queryFn: async () =>
       await EmployeeRepository.getEmployeeName(projectId, search, allEmployee),
 
-    staleTime: 5 * 60 * 1000, // Optional: cache for 5 minutes
+    staleTime: 5 * 60 * 1000,
   });
 };
 
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index da51038c..256186b7 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -11,12 +11,13 @@ const EmployeeRepository = {
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
   getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
   deleteEmployee: (id, active) => api.delete(`/api/employee/${id}?active=${active}`),
-  getEmployeeName: (projectId, search, allEmployee) => {
+  getEmployeeName: (projectId, search, allEmployee,employeeId) => {
     const params = new URLSearchParams();
 
     if (projectId) params.append("projectId", projectId);
     if (search) params.append("searchString", search);
-    if (allEmployee) params.append("allEmployee", allEmployee)
+    if (allEmployee) params.append("allEmployee", allEmployee);
+    if (employeeId) params.append("employeeId", employeeId);
 
     const query = params.toString();
     return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);