diff --git a/src/components/Tenanat/Organization.jsx b/src/components/Tenanat/Organization.jsx
new file mode 100644
index 00000000..102595f9
--- /dev/null
+++ b/src/components/Tenanat/Organization.jsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { formatUTCToLocalTime } from '../../utils/dateUtils'
+
+const Organization = ({data}) => {
+ return (
+
+ {/*
+
{data?.name}
+ */}
+
+
+ )
+}
+
+export default Organization
+
+
diff --git a/src/components/Tenanat/OrganizationInfo.jsx b/src/components/Tenanat/OrganizationInfo.jsx
index 276b3e3a..e43e7f65 100644
--- a/src/components/Tenanat/OrganizationInfo.jsx
+++ b/src/components/Tenanat/OrganizationInfo.jsx
@@ -4,6 +4,8 @@ import Label from "../common/Label";
import DatePicker from "../common/DatePicker";
import { useCreateTenant, useIndustries } from "../../hooks/useTenant";
import { LogoUpload } from "./LogoUpload";
+import { orgSize, reference } from "../../utils/constants";
+import moment from "moment";
const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
const { data, isError, isLoading: industryLoading } = useIndustries();
@@ -40,26 +42,15 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
]);
if (valid) {
- const tenantPayload = getValues();
+ const data = getValues();
// onSubmitTenant(data);
// onNext();
-
+ const tenantPayload = {...data,onBoardingDate: moment.utc(data.onBoardingDate, "DD-MM-YYYY").toISOString() }
CreateTenant(tenantPayload);
}
};
- const Reference = [
- { val: "google", name: "Google" },
- { val: "frined", name: "Friend" },
- { val: "advertisement", name: "Advertisement" },
- { val: "root tenant", name: "Root Tenant" },
- ];
- const orgSize = [
- { val: "50", name: "1-50" },
- { val: "100", name: "51-100" },
- { val: "500", name: "101-500" },
- { val: "600", name: "500+" },
- ];
+
return (
@@ -74,9 +65,7 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
{...register("organizationName")}
/>
{errors.organizationName && (
-
- {errors.organizationName.message}
-
+
{errors.organizationName.message}
)}
@@ -126,43 +115,28 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
- {/* this will upcomming from main */}
- {/*
-{errors.onBoardingDate && (
- {errors.onBoardingDate.message}
-)} */}
-
-
{errors.onBoardingDate && (
-
+
{errors.onBoardingDate.message}
)}
+
+ {errors.onBoardingDate && (
+
{errors.onBoardingDate.message}
+ )}
- {/*
*/}
{errors.organizationSize && (
-
- {errors.organizationSize.message}
-
+
{errors.organizationSize.message}
)}
@@ -206,18 +178,12 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
- {/* */}
+
diff --git a/src/components/Tenanat/Profile.jsx b/src/components/Tenanat/Profile.jsx
index 45be1014..13a6547b 100644
--- a/src/components/Tenanat/Profile.jsx
+++ b/src/components/Tenanat/Profile.jsx
@@ -1,9 +1,156 @@
-import React from 'react'
+import React from "react";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
-const Profile = () => {
+const Profile = ({ data }) => {
+ // const {logoImage,name,domainName,contactName,contactNumber,officeNumber} = data;
return (
- profile
- )
-}
+
+
+
+
+
+

+
+
+
{data.name}
+
+
+ {data?.domainName}
+
+
+ {data?.tenantStatus?.name}
+
+
+
+
+
-export default Profile
\ No newline at end of file
+
+
+
+
+
+ Contact Person:
+ {data.contactName}
+
+
+
+
+ Email:
+ {data.email}
+
+
+
+ Contact Number:
+ {data.contactNumber}
+
+
+
+
+ Address:
+ {data.billingAddress}
+
+
+
+
+
+
+
+ Industry:
+ {data.industry.name}
+
+
+ {data.taxId && (
+
+
+ Tax Id:
+ {data.taxId}
+
+ )}
+
+
+ Organization Size:
+ {data.organizationSize}
+
+
+
+ On-Boarding Date:
+
+ {formatUTCToLocalTime(data.onBoardingDate)}
+
+
+
+
+
+
+ |
+ Status
+ |
+
+ Active
+ |
+
+ In-Progress
+ |
+
+ On Hold
+ |
+
+ In-Active
+ |
+
+ Completed
+ |
+
+
+ |
+ Projects
+ |
+
+ {data?.activeProjects}
+ |
+
+ {data?.inProgressProjects}
+ |
+
+ {data?.onHoldProjects}
+ |
+
+ {data?.inActiveProjects}
+ |
+
+ {data?.completedProjects}
+ |
+
+
+
+
+
+
+
+ Activite Employees:
+ {data.activeEmployees}
+
+
+
+
+ In-Active Employee:
+ {data.inActiveEmployees}
+
+
+
+ );
+};
+
+export default Profile;
diff --git a/src/components/Tenanat/TenantFilterPanel.jsx b/src/components/Tenanat/TenantFilterPanel.jsx
index 0cfaf2f5..7bf86fad 100644
--- a/src/components/Tenanat/TenantFilterPanel.jsx
+++ b/src/components/Tenanat/TenantFilterPanel.jsx
@@ -1,40 +1,86 @@
-import { zodResolver } from '@hookform/resolvers/zod'
-import React from 'react'
-import { FormProvider, useForm, useFormContext } from 'react-hook-form'
-import { defaultFilterValues, filterSchema } from './TenantSchema'
-import Label from '../common/Label'
-import SelectMultiple from '../common/SelectMultiple'
-import { useIndustries } from '../../hooks/useTenant'
+import { zodResolver } from "@hookform/resolvers/zod";
+import React, { useState } from "react";
+import { FormProvider, useForm, useFormContext } from "react-hook-form";
+import { defaultFilterValues, filterSchema } from "./TenantSchema";
+import Label from "../common/Label";
+import SelectMultiple from "../common/SelectMultiple";
+import { useIndustries } from "../../hooks/useTenant";
+import { reference } from "../../utils/constants";
+import { DateRangePicker1 } from "../common/DateRangePicker";
+import moment from "moment";
-const TenantFilterPanel = () => {
+const TenantFilterPanel = ({onApply}) => {
+ const [resetKey, setResetKey] = useState(0);
+ const method = useForm({
+ resolver: zodResolver(filterSchema),
+ defaultValues: defaultFilterValues,
+ });
+ const { control, register, handleSubmit, reset, watch } = method;
+ const { data, isError, isLoading } = useIndustries();
+ const closePanel = () => {
+ document.querySelector(".offcanvas.show .btn-close")?.click();
+ };
+ const onSubmit = (formData) => {
+ onApply({
+ ...formData,
+ startDate: moment.utc(formData.startDate, "DD-MM-YYYY").toISOString(),
+ endDate: moment.utc(formData.endDate, "DD-MM-YYYY").toISOString(),
+ })
+ };
+ const onClear = () => {
+ reset(filterSchema);
+ setResetKey((prev) => prev + 1);
-const method = useForm({
- resolver:zodResolver(filterSchema),
- defaultValues:defaultFilterValues
-})
-const {control, register, handleSubmit, reset, watch} = method;
-const {data,isError,isLoading} = useIndustries()
-console.log(data)
-const onSubmit =()=>{
-
-}
-if(isLoading) return Loading...
+ closePanel();
+ };
+ if (isLoading) return Loading...
;
return (
-
- )
-}
+ );
+};
-export default TenantFilterPanel
\ No newline at end of file
+export default TenantFilterPanel;
diff --git a/src/components/Tenanat/TenantForm.jsx b/src/components/Tenanat/TenantForm.jsx
index c2413533..616effe1 100644
--- a/src/components/Tenanat/TenantForm.jsx
+++ b/src/components/Tenanat/TenantForm.jsx
@@ -101,7 +101,7 @@ const TenantForm = () => {