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

Weidget_Dashboard_Services :- Adding weidget in Dash board for jobs and showing weidget in Service profile. #528

Open
kartik.sharma wants to merge 17 commits from Weidget_Dashboard_Services into Purchase_Invoice_Management
pull from: Weidget_Dashboard_Services
merge into: admin:Purchase_Invoice_Management
Conversation 0 Commits 17 Files Changed 18 +295 -322
18 changed files with 295 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/assets/css/core-extend.css
View File

@ -470,3 +470,34 @@ font-weight: normal;
.fs-md-xlarge { font-size: 170% !important; } .fs-md-xlarge { font-size: 170% !important; }
.fs-md-xxlarge { font-size: calc(1.725rem + 5.7vw) !important; } .fs-md-xxlarge { font-size: calc(1.725rem + 5.7vw) !important; }
} }
/* ====================== Thin Scrollbar (Global) ====================== */
.job-scroll-wrapper {
max-height: 350px;
overflow-y: auto;
padding-right: 8px;
/* Firefox thin scrollbar */
scrollbar-width: thin;
scrollbar-color: #c8c8c8 transparent;
}
/* Chrome, Edge, Safari */
.job-scroll-wrapper::-webkit-scrollbar {
width: 4px;
}
.job-scroll-wrapper::-webkit-scrollbar-track {
background: transparent;
}
.job-scroll-wrapper::-webkit-scrollbar-thumb {
background-color: #c8c8c8;
border-radius: 20px;
}
.job-scroll-wrapper::-webkit-scrollbar-thumb:hover {
background-color: #a0a0a0;
}

2
src/components/Dashboard/Dashboard.jsx
View File

@ -35,9 +35,7 @@ const Dashboard = () => {
const canRegularize = useHasUserPermission(REGULARIZE_ATTENDANCE); const canRegularize = useHasUserPermission(REGULARIZE_ATTENDANCE);
const canTeamAttendance = useHasUserPermission(TEAM_ATTENDANCE); const canTeamAttendance = useHasUserPermission(TEAM_ATTENDANCE);
const canSelfAttendance = useHasUserPermission(SELF_ATTENDANCE); const canSelfAttendance = useHasUserPermission(SELF_ATTENDANCE);
const { data,isLoading,isError } = useGetCollectionOverview(); const { data,isLoading,isError } = useGetCollectionOverview();
console.log("data-->", data);
return ( return (
<div className="container-fluid mt-5"> <div className="container-fluid mt-5">
<div className="row gy-4"> <div className="row gy-4">

7
src/components/Dashboard/ExpenseAnalysis.jsx
View File

@ -50,6 +50,11 @@ const ExpenseAnalysis = () => {
chart: { type: "donut" }, chart: { type: "donut" },
labels, labels,
legend: { show: false }, legend: { show: false },
tooltip: {
y: {
formatter: (value) => formatCurrency(value),
},
},
dataLabels: { enabled: true, formatter: (val) => `${val.toFixed(0)}%` }, dataLabels: { enabled: true, formatter: (val) => `${val.toFixed(0)}%` },
colors: flatColors, colors: flatColors,
plotOptions: { plotOptions: {
@ -127,7 +132,7 @@ const ExpenseAnalysis = () => {
options={donutOptions} options={donutOptions}
series={series} series={series}
type="donut" type="donut"
width="70%" width="75%"
height={320} height={320}
/> />
</div> </div>

342
src/components/Dashboard/ServiceJobs.jsx
View File

@ -1,234 +1,156 @@
import React from "react"; import React from "react";
import { useParams } from "react-router-dom";
import { useJobsProgression } from "../../hooks/useDashboard_Data";
import { SpinnerLoader } from "../common/Loader";
import { formatUTCToLocalTime } from "../../utils/dateUtils";
import { useServiceProject } from "../../hooks/useServiceProject";
const ServiceJobs = () => { const ServiceJobs = () => {
const { projectId } = useParams();
const { data, isLoading, isError } = useJobsProgression(projectId);
const jobs = data || {};
const { data: projectData, isLoading: projectLoading } = useServiceProject(projectId);
const tabMapping = [
{ id: "tab-new", label: "My Jobs", key: "allJobs" },
{ id: "tab-preparing", label: "Assigned", key: "assignedJobs" },
{ id: "tab-shipping", label: "In Progress", key: "inProgressJobs" },
];
return ( return (
<div className="col-xxl-4 col-lg-6"> <div className="">
<div className="card h-100"> <div className="card page-min-h">
<div className="card-header d-flex justify-content-between"> <div className="card-header d-flex justify-content-between">
<div className="card-title mb-0 text-start"> <div className="card-title mb-0 text-start">
<h5 className="mb-1">Service Jobs</h5> <h5 className="mb-1 fw-bold">Service Jobs</h5>
<p className="card-subtitle">All Projects</p> <p className="card-subtitle">
{projectLoading ? "Loading..." : projectData?.name || "All Projects"}
</p>
</div> </div>
</div> </div>
<div className="card-body p-0"> <div className="card-body p-0">
<div className="nav-align-top"> <div className="nav-align-top">
{/* Tabs */} {/* ---------------- Tabs ---------------- */}
<ul className="nav nav-tabs nav-fill rounded-0 timeline-indicator-advanced" role="tablist"> <ul className="nav nav-tabs nav-fill rounded-0 timeline-indicator-advanced" role="tablist">
<li className="nav-item"> {tabMapping.map((t, index) => (
<button className="nav-link active" data-bs-toggle="tab" data-bs-target="#tab-new"> <li className="nav-item" key={t.id}>
My Jobs <button
</button> className={`nav-link ${index === 0 ? "active" : ""}`}
</li> data-bs-toggle="tab"
<li className="nav-item"> data-bs-target={`#${t.id}`}
<button className="nav-link" data-bs-toggle="tab" data-bs-target="#tab-preparing"> >
Assigned {t.label}
</button> </button>
</li> </li>
<li className="nav-item"> ))}
<button className="nav-link" data-bs-toggle="tab" data-bs-target="#tab-shipping">
In Progress
</button>
</li>
</ul> </ul>
{/* Tab Content */} {/* ---------------- Tab Content ---------------- */}
<div className="tab-content border-0 mx-1 text-start"> <div className="tab-content border-0 mx-1 text-start">
{/* ---------------------- NEW TAB ---------------------- */} {isLoading && (
<div className="tab-pane fade show active" id="tab-new"> <div className="text-center" style={{ height: "250px", display: "flex", justifyContent: "center", alignItems: "center" }}>
{/* Entry 1 */} <SpinnerLoader />
<ul className="timeline mb-0"> </div>
<li className="timeline-item ps-6 border-left-dashed"> )}
<span className="timeline-indicator-advanced timeline-indicator-success border-0 shadow-none">
<i className="bx bx-check-circle"></i>
</span> {isError && (
<div className="timeline-event ps-1"> <p
<div className="timeline-header"> className="text-center"
<small className="text-success text-uppercase">Sender</small> style={{
</div> height: "250px",
<h6 className="my-50">Myrtle Ullrich</h6> display: "flex",
<p className="text-body mb-0">101 Boulder, California(CA), 95959</p> justifyContent: "center",
alignItems: "center",
margin: 0,
}}
>
No data found
</p>
)}
{!isLoading &&
!isError &&
tabMapping.map((t, index) => {
const list = jobs[t.key] || [];
return (
<div
key={t.id}
className={`tab-pane fade ${index === 0 ? "show active" : ""}`}
id={t.id}
>
{list.length === 0 ? (
<p
className="text-center"
style={{
height: "250px",
display: "flex",
justifyContent: "center",
alignItems: "center",
margin: 0,
}}
>
No jobs found
</p>
) : (
<div className="job-scroll-wrapper">
{list.map((job, i) => (
<React.Fragment key={i}>
<ul className="timeline mb-0">
{/* Assigned By */}
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-success border-0 shadow-none">
<i className="bx bx-check-circle"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-success text-uppercase">
Assigned By
</small>
</div>
<h6 className="my-50">{job.assignedBy}</h6>
<p className="text-body mb-0">
{formatUTCToLocalTime(job.assignedAt)}
</p>
</div>
</li>
{/* Project */}
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Project</small>
</div>
<h6 className="my-50">{job.project}</h6>
<p className="text-body mb-0">{job.title}</p>
</div>
</li>
</ul>
{/* Divider */}
{i < list.length - 1 && (
<div className="border-1 border-light border-top border-dashed my-4"></div>
)}
</React.Fragment>
))}
</div>
)}
</div> </div>
</li> );
<li className="timeline-item ps-6 border-transparent"> })}
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">Barry Schowalter</h6>
<p className="text-body mb-0">939 Orange, California(CA), 92118</p>
</div>
</li>
</ul>
<div className="border-1 border-light border-top border-dashed my-4"></div>
{/* Entry 2 */}
<ul className="timeline mb-0">
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-success border-0 shadow-none">
<i className="bx bx-check-circle"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-success text-uppercase">Sender</small>
</div>
<h6 className="my-50">Veronica Herman</h6>
<p className="text-body mb-0">162 Windsor, California(CA), 95492</p>
</div>
</li>
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">Helen Jacobs</h6>
<p className="text-body mb-0">487 Sunset, California(CA), 94043</p>
</div>
</li>
</ul>
</div>
{/* ---------------------- PREPARING TAB ---------------------- */}
<div className="tab-pane fade" id="tab-preparing">
{/* Entry 1 */}
<ul className="timeline mb-0">
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-warning border-0 shadow-none">
<i className="bx bx-time-five"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-warning text-uppercase">Sender</small>
</div>
<h6 className="my-50">Oliver Grant</h6>
<p className="text-body mb-0">220 Pine St, California(CA), 95765</p>
</div>
</li>
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">Samantha Lee</h6>
<p className="text-body mb-0">744 Bay Area, California(CA), 94016</p>
</div>
</li>
</ul>
<div className="border-1 border-light border-top border-dashed my-4"></div>
{/* Entry 2 */}
<ul className="timeline mb-0">
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-warning border-0 shadow-none">
<i className="bx bx-time-five"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-warning text-uppercase">Sender</small>
</div>
<h6 className="my-50">Marcus Howard</h6>
<p className="text-body mb-0">58 Avenue, California(CA), 95376</p>
</div>
</li>
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">Daniel Foster</h6>
<p className="text-body mb-0">312 Marina, California(CA), 94109</p>
</div>
</li>
</ul>
</div>
{/* ---------------------- SHIPPING TAB ---------------------- */}
<div className="tab-pane fade" id="tab-shipping">
{/* Entry 1 */}
<ul className="timeline mb-0">
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-info border-0 shadow-none">
<i className="bx bx-package"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-info text-uppercase">Sender</small>
</div>
<h6 className="my-50">James Carter</h6>
<p className="text-body mb-0">441 Market St, California(CA), 94111</p>
</div>
</li>
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">Linda Moore</h6>
<p className="text-body mb-0">990 Willow Road, California(CA), 94025</p>
</div>
</li>
</ul>
<div className="border-1 border-light border-top border-dashed my-4"></div>
{/* Entry 2 */}
<ul className="timeline mb-0">
<li className="timeline-item ps-6 border-left-dashed">
<span className="timeline-indicator-advanced timeline-indicator-info border-0 shadow-none">
<i className="bx bx-package"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-info text-uppercase">Sender</small>
</div>
<h6 className="my-50">Sarah Bennett</h6>
<p className="text-body mb-0">882 Canyon Rd, California(CA), 94704</p>
</div>
</li>
<li className="timeline-item ps-6 border-transparent">
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
<i className="bx bx-map"></i>
</span>
<div className="timeline-event ps-1">
<div className="timeline-header">
<small className="text-primary text-uppercase">Receiver</small>
</div>
<h6 className="my-50">George Simmons</h6>
<p className="text-body mb-0">19 Palm St, California(CA), 93001</p>
</div>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
); );

1
src/components/Documents/DocumentFilterPanel.jsx
View File

@ -141,6 +141,7 @@ const DocumentFilterPanel = forwardRef(
defaultRange={false} defaultRange={false}
resetSignal={resetKey} resetSignal={resetKey}
maxDate={new Date()} maxDate={new Date()}
className="w-100 mt-2"
/> />
</div> </div>

4
src/components/Documents/Documents.jsx
View File

@ -141,8 +141,8 @@ const Documents = ({ Document_Entity, Entity }) => {
return ( return (
<DocumentContext.Provider value={contextValues}> <DocumentContext.Provider value={contextValues}>
<div className="mt-2"> <div className="">
<div className="card page-min-h d-flex p-5"> <div className="card page-min-h table-responsive d-flex p-5">
<DocumentFilterChips filters={filters} filterData={filterData} removeFilterChip={removeFilterChip} /> <DocumentFilterChips filters={filters} filterData={filterData} removeFilterChip={removeFilterChip} />
<div className="row align-items-center"> <div className="row align-items-center">
{/* Search */} {/* Search */}

2
src/components/Documents/DocumentsList.jsx
View File

@ -178,7 +178,7 @@ const DocumentsList = ({
/> />
)} )}
<div className="table-responsive"> <div className="">
<table className="table border-top dataTable text-nowrap"> <table className="table border-top dataTable text-nowrap">
<thead> <thead>
<tr className="shadow-sm"> <tr className="shadow-sm">

4
src/components/Employee/EmpAttendance.jsx
View File

@ -71,7 +71,7 @@ const EmpAttendance = () => {
<AttendLogs Id={attendanceId} /> <AttendLogs Id={attendanceId} />
</GlobalModel> </GlobalModel>
)} )}
<div className="card px-4 mt-3 py-2 " style={{ minHeight: "500px" }}> <div className="table-responsive card px-4 mt-3 py-2 " style={{ minHeight: "500px" }}>
<div <div
className="dataTables_length text-start py-2 d-flex justify-content-between " className="dataTables_length text-start py-2 d-flex justify-content-between "
id="DataTables_Table_0_length" id="DataTables_Table_0_length"
@ -84,7 +84,7 @@ const EmpAttendance = () => {
</> </>
</div> </div>
</div> </div>
<div className="table-responsive text-nowrap"> <div className="text-nowrap">
{!loading && data.length === 0 && ( {!loading && data.length === 0 && (
<div className="text-center py-5">No employee logs</div> <div className="text-center py-5">No employee logs</div>
)} )}

26
src/components/Organization/ManagOrg.jsx
View File

@ -96,12 +96,12 @@ const ManagOrg = () => {
return ( return (
<FormProvider {...method}> <FormProvider {...method}>
<form className="form" onSubmit={handleSubmit(onSubmit)}> <form className="form" onSubmit={handleSubmit(onSubmit)}>
<div className="mb-1 text-start"> <div className="mb-3 text-start mt-3">
<Label htmlFor="name" required> <Label htmlFor="name" required>
Organization Name Organization Name
</Label> </Label>
<input <input
className="form-control form-control-sm" className="form-control"
{...register("name")} {...register("name")}
/> />
{errors.name && ( {errors.name && (
@ -109,12 +109,12 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<Label htmlFor="contactPerson" required> <Label htmlFor="contactPerson" required>
Contact Person Contact Person
</Label> </Label>
<input <input
className="form-control form-control-sm" className="form-control"
{...register("contactPerson")} {...register("contactPerson")}
/> />
{errors.contactPerson && ( {errors.contactPerson && (
@ -122,12 +122,12 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<Label htmlFor="contactNumber" required> <Label htmlFor="contactNumber" required>
Contact Number Contact Number
</Label> </Label>
<input <input
className="form-control form-control-sm" className="form-control"
{...register("contactNumber")} {...register("contactNumber")}
/> />
{errors.contactNumber && ( {errors.contactNumber && (
@ -135,12 +135,12 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<Label htmlFor="gstNumber"> <Label htmlFor="gstNumber">
GST Number GST Number
</Label> </Label>
<input <input
className="form-control form-control-sm" className="form-control"
{...register("gstNumber")} {...register("gstNumber")}
/> />
{errors.gstNumber && ( {errors.gstNumber && (
@ -148,12 +148,12 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<Label htmlFor="email" required> <Label htmlFor="email" required>
Email Address Email Address
</Label> </Label>
<input <input
className="form-control form-control-sm" className="form-control"
{...register("email")} {...register("email")}
/> />
{errors.email && ( {errors.email && (
@ -161,7 +161,7 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<SelectMultiple <SelectMultiple
name="serviceIds" name="serviceIds"
label="Select Service" label="Select Service"
@ -175,12 +175,12 @@ const ManagOrg = () => {
)} )}
</div> </div>
<div className="mb-1 text-start"> <div className="mb-3 text-start">
<Label htmlFor="address" required> <Label htmlFor="address" required>
Address Address
</Label> </Label>
<textarea <textarea
className="form-control form-control-sm" className="form-control"
{...register("address")} {...register("address")}
rows={2} rows={2}
/> />

165
src/components/Organization/OrganizationsList.jsx
View File

@ -5,17 +5,17 @@ import Avatar from "../common/Avatar";
import { useDebounce } from "../../utils/appUtils"; import { useDebounce } from "../../utils/appUtils";
import Pagination from "../common/Pagination"; import Pagination from "../common/Pagination";
const OrganizationsList = ({searchText}) => { const OrganizationsList = ({ searchText }) => {
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const searchString = useDebounce(searchText,500) const searchString = useDebounce(searchText, 500)
const { const {
data = [], data = [],
isLoading, isLoading,
isFetching, isFetching,
isError, isError,
error, error,
} = useOrganizationsList(ITEMS_PER_PAGE, 1, true,null,searchString); } = useOrganizationsList(ITEMS_PER_PAGE, 1, true, null, searchString);
const {onClose, startStep, flowType, onOpen,orgData } = useOrganizationModal(); const { onClose, startStep, flowType, onOpen, orgData } = useOrganizationModal();
const organizationsColumns = [ const organizationsColumns = [
{ {
@ -39,21 +39,21 @@ const OrganizationsList = ({searchText}) => {
label: "Contact Person", label: "Contact Person",
getValue: (org) => ( getValue: (org) => (
( (
<div className="d-flex align-items-center ps-1"> <div className="d-flex align-items-center ps-1">
<Avatar <Avatar
size="xs" size="xs"
classAvatar="m-0" classAvatar="m-0"
firstName={(org?.name || "").trim().split(" ")[0] || ""} firstName={(org?.name || "").trim().split(" ")[0] || ""}
lastName={(org?.name || "").trim().split(" ")[1] || ""} lastName={(org?.name || "").trim().split(" ")[1] || ""}
/> />
<span <span
className="text-truncate d-inline-block " className="text-truncate d-inline-block "
style={{ maxWidth: "150px" }} style={{ maxWidth: "150px" }}
> >
{org?.name || "N/A"} {org?.name || "N/A"}
</span> </span>
</div> </div>
) )
), ),
align: "text-start", align: "text-start",
}, },
@ -67,7 +67,7 @@ const OrganizationsList = ({searchText}) => {
key: "email", key: "email",
label: "Email", label: "Email",
getValue: (org) => ( getValue: (org) => (
<span <span
className="text-truncate d-inline-block" className="text-truncate d-inline-block"
style={{ maxWidth: "200px" }} style={{ maxWidth: "200px" }}
> >
@ -84,7 +84,7 @@ const OrganizationsList = ({searchText}) => {
}, },
]; ];
const paginate = (page) => { const paginate = (page) => {
if (page >= 1 && page <= (data?.totalPages ?? 1)) { if (page >= 1 && page <= (data?.totalPages ?? 1)) {
setCurrentPage(page); setCurrentPage(page);
} }
@ -93,73 +93,72 @@ const OrganizationsList = ({searchText}) => {
if (isError) return <div>{error?.message || "Something went wrong"}</div>; if (isError) return <div>{error?.message || "Something went wrong"}</div>;
return ( return (
<div <div
className="card-datatable table-responsive overflow-auto" id="horizontal-example"
id="horizontal-example" >
> <div className="dataTables_wrapper no-footer px-2 ">
<div className="dataTables_wrapper no-footer px-2 "> <table className="table border-top dataTable text-nowrap">
<table className="table border-top dataTable text-nowrap"> <thead>
<thead> <tr className="table_header_border">
<tr className="table_header_border"> {organizationsColumns.map((col) => (
{organizationsColumns.map((col) => ( <th
<th key={col.key}
key={col.key} className="sorting d-table-cell"
className="sorting d-table-cell" aria-sort="descending"
aria-sort="descending" >
> <div className={`${col.align}`}>{col.label}</div>
<div className={`${col.align}`}>{col.label}</div>
</th>
))}
<th className="sticky-action-column bg-white text-center">
Action
</th> </th>
</tr> ))}
</thead> <th className="sticky-action-column bg-white text-center">
<tbody> Action
{data?.data?.length > 0 ? ( </th>
data?.data?.map((org) => ( </tr>
<tr key={org.id}> </thead>
{organizationsColumns.map((col) => ( <tbody>
<td {data?.data?.length > 0 ? (
key={col.key} data?.data?.map((org) => (
style={{ height: "50px" }} <tr key={org.id}>
className={`d-table-cell ${col.align ?? ""}`} {organizationsColumns.map((col) => (
> <td
{col.customRender key={col.key}
? col.customRender(org) style={{ height: "50px" }}
: col.getValue(org)} className={`d-table-cell ${col.align ?? ""}`}
</td> >
))} {col.customRender
<td className="sticky-action-column "> ? col.customRender(org)
<div className="d-flex justify-content-center gap-2"> : col.getValue(org)}
<i className="bx bx-show text-primary cursor-pointer" onClick={()=>onOpen({startStep:5,orgData:org.id,flowType:"view"})}></i>
<i className="bx bx-edit text-secondary cursor-pointer" onClick={()=>onOpen({startStep:4,orgData:org,flowType:"edit"})}></i>
<i className="bx bx-trash text-danger cursor-not-allowed"></i>
</div>
</td> </td>
</tr> ))}
)) <td className="sticky-action-column ">
) : ( <div className="d-flex justify-content-center gap-2">
<tr> <i className="bx bx-show text-primary cursor-pointer" onClick={() => onOpen({ startStep: 5, orgData: org.id, flowType: "view" })}></i>
<td <i className="bx bx-edit text-secondary cursor-pointer" onClick={() => onOpen({ startStep: 4, orgData: org, flowType: "edit" })}></i>
colSpan={organizationsColumns.length + 1} <i className="bx bx-trash text-danger cursor-not-allowed"></i>
className="text-center" </div>
>
<p className="fw-semibold">{isLoading ? "Loading....":"Not Found Organization"}</p>
</td> </td>
</tr> </tr>
)} ))
</tbody> ) : (
</table> <tr>
{data?.data?.length > 0 && ( <td
<Pagination colSpan={organizationsColumns.length + 1}
currentPage={currentPage} className="text-center"
totalPages={data.totalPages} >
onPageChange={paginate} <p className="fw-semibold">{isLoading ? "Loading...." : "Not Found Organization"}</p>
/> </td>
</tr>
)} )}
</div> </tbody>
</table>
{data?.data?.length > 0 && (
<Pagination
currentPage={currentPage}
totalPages={data.totalPages}
onPageChange={paginate}
/>
)}
</div> </div>
</div>
); );
}; };

4
src/components/Project/ProjectOrganizations.jsx
View File

@ -7,7 +7,7 @@ const ProjectOrganizations = () => {
const { onOpen, startStep, flowType } = useOrganizationModal(); const { onOpen, startStep, flowType } = useOrganizationModal();
const selectedProject = useSelectedProject(); const selectedProject = useSelectedProject();
return ( return (
<div className="card pb-10" > <div className="card pb-10 " >
<div className="card-header"> <div className="card-header">
<div className="d-flex justify-content-end px-2"> <div className="d-flex justify-content-end px-2">
<button <button
@ -21,7 +21,7 @@ const ProjectOrganizations = () => {
</div> </div>
</div> </div>
<div className="row modal-min-h"> <div className="modal-min-h table-responsive">
<ProjectAssignedOrgs /> <ProjectAssignedOrgs />
</div> </div>
</div> </div>

6
src/components/ServiceProject/ServiceProjectProfile.jsx
View File

@ -7,6 +7,7 @@ import GlobalModel from "../common/GlobalModel";
import { SpinnerLoader } from "../common/Loader"; import { SpinnerLoader } from "../common/Loader";
import ServiceBranch from "./ServiceProjectBranch/ServiceBranch"; import ServiceBranch from "./ServiceProjectBranch/ServiceBranch";
import ServiceProfile from "./ServiceProfile"; import ServiceProfile from "./ServiceProfile";
import ServiceJobs from "../Dashboard/ServiceJobs";
const ServiceProjectProfile = () => { const ServiceProjectProfile = () => {
const { projectId } = useParams(); const { projectId } = useParams();
@ -34,12 +35,15 @@ const ServiceProjectProfile = () => {
<div className="row py-2"> <div className="row py-2">
<div className="col-md-6 col-lg-5 order-2 mb-6"> <div className="col-md-6 col-lg-5 order-2 mb-6">
<ServiceProfile data={data} setIsOpenModal={setIsOpenModal}/> <ServiceProfile data={data} setIsOpenModal={setIsOpenModal} />
</div> </div>
<div className="col-md-6 col-lg-7 order-2 mb-6"> <div className="col-md-6 col-lg-7 order-2 mb-6">
<ServiceBranch /> <ServiceBranch />
</div> </div>
<div className="col-md-6 col-lg-5 order-2 mb-6">
<ServiceJobs/>
</div>
</div> </div>
</> </>
); );

3
src/components/Tenant/OrganizationInfo.jsx
View File

@ -56,8 +56,7 @@ const OrganizationInfo = ({ onNext, onPrev, onSubmitTenant }) => {
// onSubmitTenant(data); // onSubmitTenant(data);
// onNext(); // onNext();
const tenantPayload = { ...data, onBoardingDate: moment.utc(data.onBoardingDate, "DD-MM-YYYY").toISOString() } const tenantPayload = { ...data, onBoardingDate: moment.utc(data.onBoardingDate, "DD-MM-YYYY").toISOString() }
// CreateTenant(tenantPayload); CreateTenant(tenantPayload);
console.log(tenantPayload)
} }
}; };

1
src/components/Tenant/TenantFilterPanel.jsx
View File

@ -65,6 +65,7 @@ const TenantFilterPanel = ({ onApply }) => {
endField="endDate" endField="endDate"
resetSignal={resetKey} resetSignal={resetKey}
defaultRange={false} defaultRange={false}
className="w-100"
/> />
</div> </div>
<div className="text-strat mb-2"> <div className="text-strat mb-2">

9
src/hooks/useDashboard_Data.jsx
View File

@ -178,6 +178,15 @@ export const useExpenseStatus = (projectId) => {
}, },
}); });
}; };
export const useJobsProgression = (projectId) => {
return useQuery({
queryKey: ["serviceProjectJobs", projectId],
queryFn: async () => {
const resp = await GlobalRepository.getJobsProgression(projectId);
return resp.data;
},
});
};
export const useExpenseDataByProject = (projectId, categoryId, months) => { export const useExpenseDataByProject = (projectId, categoryId, months) => {
return useQuery({ return useQuery({

2
src/pages/Activities/AttendancePage.jsx
View File

@ -202,7 +202,7 @@ const AttendancePage = () => {
</div> </div>
{/* Search + Organization filter */} {/* Search + Organization filter */}
<div className="col-12 col-md-auto mb-2 mt-md-0 ms-md-auto nav"> <div className="col-12 col-md-auto mb-2 mt-3 mt-md-0 ms-md-auto nav">
<div className="row g-2"> <div className="row g-2">
<div className="col-12 col-sm-6"> <div className="col-12 col-sm-6">
<select <select

6
src/pages/Organization/OrganizationPage.jsx
View File

@ -47,8 +47,10 @@ const OrganizationPage = () => {
</div> </div>
</div> </div>
</div> </div>
<div className="card page-min-h px-sm-4"> <div className="card table-responsive page-min-h">
<OrganizationsList searchText={searchText} /> <div className="card-body">
<OrganizationsList searchText={searchText} />
</div>
</div> </div>
</div> </div>
); );

2
src/repositories/GlobalRepository.jsx
View File

@ -64,6 +64,8 @@ const GlobalRepository = {
getExpenseStatus: (projectId) => api.get(`/api/Dashboard/expense/pendings${projectId ? `?projectId=${projectId}` : ""}`), getExpenseStatus: (projectId) => api.get(`/api/Dashboard/expense/pendings${projectId ? `?projectId=${projectId}` : ""}`),
getJobsProgression: (projectId) => api.get(`/api/Dashboard/job/progression${projectId ? `?projectId=${projectId}` : ""}`),
getExpenseDataByProject: (projectId, categoryId, months) => { getExpenseDataByProject: (projectId, categoryId, months) => {
let url = `api/Dashboard/expense/monthly` let url = `api/Dashboard/expense/monthly`
const queryParams = []; const queryParams = [];