From 4ddb8415ccfe29d0cdccb97070b1d523ad2d704a Mon Sep 17 00:00:00 2001 From: "pramod.mahajan" Date: Tue, 30 Sep 2025 17:27:20 +0530 Subject: [PATCH] added gobal create project,change paid by at expense create --- src/ModalProvider.jsx | 4 + src/components/Directory/AssignedBucket.jsx | 5 +- src/components/Employee/EmployeeSchema.jsx | 4 +- src/components/Employee/ManageEmployee.jsx | 36 ++--- src/components/Expenses/ManageExpense.jsx | 52 ++++--- src/components/Layout/Header.jsx | 145 +++--------------- src/components/Project/ManageProjectInfo.jsx | 61 ++++++-- src/components/Project/ProjectSchema.jsx | 8 +- src/components/Tenant/OrganizationInfo.jsx | 2 - src/components/common/EmployeeSearchInput.jsx | 67 ++++---- src/hooks/useDirectory.js | 2 +- src/hooks/useProjects.js | 14 +- src/slices/localVariablesSlice.jsx | 16 ++ 13 files changed, 204 insertions(+), 212 deletions(-) diff --git a/src/ModalProvider.jsx b/src/ModalProvider.jsx index b9a2dea9..be7cd06a 100644 --- a/src/ModalProvider.jsx +++ b/src/ModalProvider.jsx @@ -3,15 +3,19 @@ import { useOrganizationModal } from "./hooks/useOrganization"; import OrganizationModal from "./components/Organization/OrganizationModal"; import { useAuthModal } from "./hooks/useAuth"; import SwitchTenant from "./pages/authentication/SwitchTenant"; +import { useProjectModal } from "./hooks/useProjects"; +import { ProjectModal } from "./components/Project/ManageProjectInfo"; const ModalProvider = () => { const { isOpen, onClose } = useOrganizationModal(); const { isOpen: isAuthOpen } = useAuthModal(); + const {isOpen:isOpenProject} = useProjectModal() return ( <> {isOpen && } {isAuthOpen && } + {isOpenProject && } ); }; diff --git a/src/components/Directory/AssignedBucket.jsx b/src/components/Directory/AssignedBucket.jsx index b0db2ef0..7d1a8799 100644 --- a/src/components/Directory/AssignedBucket.jsx +++ b/src/components/Directory/AssignedBucket.jsx @@ -19,8 +19,11 @@ const AssignedBucket = ({ selectedBucket, handleClose }) => { } }, [selectedBucket, employeesList]); - const { mutate: AssignEmployee, isPending } = useAssignEmpToBucket(() => + const { mutate: AssignEmployee, isPending } = useAssignEmpToBucket(() =>{ + setSelectedEmployees([]) handleClose() + } + ); const handleSubmit = async (e) => { diff --git a/src/components/Employee/EmployeeSchema.jsx b/src/components/Employee/EmployeeSchema.jsx index ba540ef4..34912f4c 100644 --- a/src/components/Employee/EmployeeSchema.jsx +++ b/src/components/Employee/EmployeeSchema.jsx @@ -90,7 +90,7 @@ export const employeeSchema = .min(1, { message: "Phone Number is required" }) .regex(mobileNumberRegex, { message: "Invalid phone number " }), jobRoleId: z.string().min(1, { message: "Role is required" }), - organizationId:z.string().min(1,{message:"Organization is required"}), + // organizationId:z.string().min(1,{message:"Organization is required"}), // hide temp. for version 1 hasApplicationAccess:z.boolean().default(false), }).refine((data) => { if (data.hasApplicationAccess) { @@ -119,6 +119,6 @@ export const defatEmployeeObj = { permanentAddress: "", phoneNumber: "", jobRoleId: null, - organizationId:"", + // organizationId:"", hasApplicationAccess:false } \ No newline at end of file diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index b3aad4b4..d5e91dca 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -15,18 +15,18 @@ import { import Label from "../common/Label"; import DatePicker from "../common/DatePicker"; import { defatEmployeeObj, employeeSchema } from "./EmployeeSchema"; -import { useOrganizationsList } from "../../hooks/useOrganization"; +// import { useOrganizationsList } from "../../hooks/useOrganization"; import { ITEMS_PER_PAGE } from "../../utils/constants"; const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => { const dispatch = useDispatch(); const { mutate: updateEmployee, isPending } = useUpdateEmployee(); - const { - data: organzationList, - isLoading, - isError, - error: EempError, - } = useOrganizationsList(ITEMS_PER_PAGE, 1, true); + // const { + // data: organzationList, + // isLoading, + // isError, + // error: EempError, + // } = useOrganizationsList(ITEMS_PER_PAGE, 1, true); const { employee, error, @@ -113,7 +113,7 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => { permanentAddress: currentEmployee.permanentAddress || "", phoneNumber: currentEmployee.phoneNumber || "", jobRoleId: currentEmployee.jobRoleId?.toString() || "", - organizationId: currentEmployee.organizationId || "", + // organizationId: currentEmployee.organizationId || "", // Hide temp. for version 1 hasApplicationAccess: currentEmployee.hasApplicationAccess || false, } : {} @@ -413,9 +413,10 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => { - {/* -------------- */} +
-
+ {/* -------------- Temp hide for Version---------------*/} + {/*
@@ -446,9 +447,10 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => { {errors.organizationId.message}
)} -
+
*/} + {/* --------------------------------------------------- */} -
+
-
-
+
-
diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx index 309cfd8b..fa19d2c5 100644 --- a/src/components/Expenses/ManageExpense.jsx +++ b/src/components/Expenses/ManageExpense.jsx @@ -28,6 +28,7 @@ import moment from "moment"; import DatePicker from "../common/DatePicker"; import ErrorPage from "../../pages/ErrorPage"; import Label from "../common/Label"; +import EmployeeSearchInput from "../common/EmployeeSearchInput"; const ManageExpense = ({ closeModal, expenseToEdit = null }) => { const { @@ -57,7 +58,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { }); const selectedproject = watch("projectId"); - + const { projectNames, loading: projectLoading, @@ -142,8 +143,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { }; useEffect(() => { - if (expenseToEdit && data ) { - + if (expenseToEdit && data) { reset({ projectId: data.project.id || "", expensesTypeId: data.expensesType.id || "", @@ -156,7 +156,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { supplerName: data.supplerName || "", amount: data.amount || "", noOfPersons: data.noOfPersons || "", - gstNumber:data.gstNumber || "", + gstNumber: data.gstNumber || "", billAttachments: data.documents ? data.documents.map((doc) => ({ fileName: doc.fileName, @@ -183,8 +183,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { const onSubmit = (fromdata) => { let payload = { ...fromdata, - transactionDate: localToUtc(fromdata.transactionDate) - + transactionDate: localToUtc(fromdata.transactionDate), }; if (expenseToEdit) { const editPayload = { ...payload, id: data.id }; @@ -206,7 +205,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => { if (StatusLoadding || projectLoading || ExpenseLoading || isLoading) return ; - return (
@@ -215,7 +213,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
- + { {...register("gstNumber")} /> {errors.gstNumber && ( - - {errors.gstNumber.message} - + {errors.gstNumber.message} )}
@@ -448,7 +459,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
- +