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

Merge branch 'DirectorY_Manage_Changes' of https://git.marcoaiot.com/admin/marco.pms.web into Weidget_Dashboard_Services

Browse Source
This commit is contained in:
Kartik Sharma 2025-12-10 09:24:43 +05:30
commit 240d904993
7 changed files with 533 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

38
src/components/Directory/ManageContact.jsx
View File

@ -21,6 +21,7 @@ import InputSuggestions from "../common/InputSuggestion";
import Label from "../common/Label"; import Label from "../common/Label";
import { AppFormController } from "../../hooks/appHooks/useAppForm"; import { AppFormController } from "../../hooks/appHooks/useAppForm";
import SelectField from "../common/Forms/SelectField"; import SelectField from "../common/Forms/SelectField";
import { BUCKET_BG_CLASSES } from "../../utils/constants";
const ManageContact = ({ contactId, closeModal }) => { const ManageContact = ({ contactId, closeModal }) => {
// fetch master data // fetch master data
@ -180,6 +181,7 @@ const ManageContact = ({ contactId, closeModal }) => {
}; };
const isPending = updating || creating; const isPending = updating || creating;
return ( return (
<FormProvider {...methods}> <FormProvider {...methods}>
<form className="p-2 p-sm-0" onSubmit={handleSubmit(onSubmit)}> <form className="p-2 p-sm-0" onSubmit={handleSubmit(onSubmit)}>
@ -456,15 +458,25 @@ const ManageContact = ({ contactId, closeModal }) => {
{/* Buckets */} {/* Buckets */}
<div className="row"> <div className="row">
<div className="col-md-12 mt-3 text-start"> <div className="col-md-12 mt-3 text-start">
<label className="form-label mb-2">Select Bucket</label> <Label className="form-label mb-2" required>Select Bucket</Label>
<ul className="d-flex flex-wrap px-1 list-unstyled mb-0">
<div
className="d-flex flex-wrap gap-3 p-1"
style={{
maxHeight: "200px",
overflowY: "auto",
}}
>
{bucketsLoaging && <p>Loading...</p>} {bucketsLoaging && <p>Loading...</p>}
{buckets?.map((item) => (
<li {buckets?.map((item, index) => (
<div
key={item.id} key={item.id}
className="list-inline-item flex-shrink-0 me-6 mb-1" className={`card p-2 shadow-sm flex-shrink-0 ${BUCKET_BG_CLASSES [index % BUCKET_BG_CLASSES.length]}`}
onClick={() => handleCheckboxChange(item.id)}
> >
<div className="form-check">
<div className="form-check m-0">
<input <input
type="checkbox" type="checkbox"
className="form-check-input" className="form-check-input"
@ -472,22 +484,24 @@ const ManageContact = ({ contactId, closeModal }) => {
checked={watchBucketIds.includes(item.id)} checked={watchBucketIds.includes(item.id)}
onChange={() => handleCheckboxChange(item.id)} onChange={() => handleCheckboxChange(item.id)}
/> />
<label <label className="form-check-label ms-0" htmlFor={`item-${item.id}`}>
className="form-check-label"
htmlFor={`item-${item.id}`}
>
{item.name} {item.name}
</label> </label>
</div> </div>
</li> </div>
))} ))}
</ul>
</div>
</div>
<div className="text-start mt-3 mb-3">
{errors.bucketIds && ( {errors.bucketIds && (
<small className="danger-text">{errors.bucketIds.message}</small> <small className="danger-text">{errors.bucketIds.message}</small>
)} )}
</div> </div>
</div> </div>
{/* Address + Description */} {/* Address + Description */}
<div className="col-12 text-start"> <div className="col-12 text-start">
<label className="form-label">Address</label> <label className="form-label">Address</label>

124
src/components/Layout/Header.jsx
View File

@ -26,15 +26,15 @@ const Header = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { data, loading } = useMaster();
const navigate = useNavigate(); const navigate = useNavigate();
const {onOpen} = useAuthModal() const { onOpen } = useAuthModal()
const { onOpen:changePass } = useModal("ChangePassword"); const { onOpen: changePass } = useModal("ChangePassword");
const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT); const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
const { mutate : logout,isPending:logouting} = useLogout() const { mutate: logout, isPending: logouting } = useLogout()
const isDashboardPath = const isDashboardPath =
/^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname); /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
const isProjectPath = /^\/projects$/.test(location.pathname); const isProjectPath = /^\/projects$/.test(location.pathname);
const isCollectionPath = const isCollectionPath =
/^\/collection$/.test(location.pathname) || /^\/$/.test(location.pathname); /^\/collection$/.test(location.pathname) || /^\/$/.test(location.pathname);
const showProjectDropdown = (pathname) => { const showProjectDropdown = (pathname) => {
@ -51,10 +51,10 @@ const Header = () => {
const isAdvancePayment = /^\/advance-payment$/.test(pathname); const isAdvancePayment = /^\/advance-payment$/.test(pathname);
const isServiceProjectPage = /^\/service-projects\/[0-9a-fA-F-]{36}$/.test(pathname); const isServiceProjectPage = /^\/service-projects\/[0-9a-fA-F-]{36}$/.test(pathname);
const isAdvancePayment1 = const isAdvancePayment1 =
/^\/advance-payment(\/[0-9a-fA-F-]{36})?$/.test(pathname); /^\/advance-payment(\/[0-9a-fA-F-]{36})?$/.test(pathname);
return !(isDirectoryPath || isProfilePage || isExpensePage || isPaymentRequest || isRecurringExpense || isAdvancePayment ||isServiceProjectPage || isAdvancePayment1); return !(isDirectoryPath || isProfilePage || isExpensePage || isPaymentRequest || isRecurringExpense || isAdvancePayment || isServiceProjectPage || isAdvancePayment1);
}; };
const allowedProjectStatusIds = [ const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba", "603e994b-a27f-4e5d-a251-f3d69b0498ba",
@ -79,8 +79,8 @@ const Header = () => {
const projectsForDropdown = isDashboardPath const projectsForDropdown = isDashboardPath
? projectNames ? projectNames
: projectNames?.filter((project) => : projectNames?.filter((project) =>
allowedProjectStatusIds.includes(project.projectStatusId) allowedProjectStatusIds.includes(project.projectStatusId)
); );
let currentProjectDisplayName; let currentProjectDisplayName;
if (projectLoading) { if (projectLoading) {
@ -196,63 +196,63 @@ const Header = () => {
> >
<div className="d-flex align-items-center"> <div className="d-flex align-items-center">
{showProjectDropdown(location.pathname) && ( {showProjectDropdown(location.pathname) && (
<div className="align-items-center"> <div className="align-items-center">
<i className="rounded-circle bx bx-building-house bx-sm-lg bx-md me-2"></i> <i className="rounded-circle bx bx-building-house bx-sm-lg bx-md me-2"></i>
<div className="btn-group"> <div className="btn-group">
{shouldShowDropdown ? ( {shouldShowDropdown ? (
<button <button
className={`btn btn-sm-sm btn-xl dropdown-toggle px-1`} className={`btn btn-sm-sm btn-xl dropdown-toggle px-1`}
type="button" type="button"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" aria-expanded="false"
>
{currentProjectDisplayName}
</button>
) : (
<span className="btn btn-sm-sm btn-xl px-1">
{currentProjectDisplayName}
</span>
)}
{shouldShowDropdown &&
projectsForDropdown &&
projectsForDropdown.length > 0 && (
<ul
className="dropdown-menu"
style={{ overflow: "auto", maxHeight: "300px" }}
> >
{(isDashboardPath|| isCollectionPath) &&( {currentProjectDisplayName}
<li> </button>
<button ) : (
className="dropdown-item" <span className="btn btn-sm-sm btn-xl px-1">
onClick={() => handleProjectChange(null)} {currentProjectDisplayName}
> </span>
All Projects )}
</button>
</li> {shouldShowDropdown &&
)} projectsForDropdown &&
{[...projectsForDropdown] projectsForDropdown.length > 0 && (
.sort((a, b) => a?.name?.localeCompare(b.name)) <ul
.map((project) => ( className="dropdown-menu custom-scrollbar"
<li key={project?.id}> style={{ overflow: "auto", maxHeight: "300px" }}
>
{(isDashboardPath || isCollectionPath) && (
<li>
<button <button
className="dropdown-item" className="dropdown-item"
onClick={() => handleProjectChange(project?.id)} onClick={() => handleProjectChange(null)}
> >
{project?.name} All Projects
{project?.shortName && (
<span className="text-primary fw-semibold ms-1">
({project?.shortName})
</span>
)}
</button> </button>
</li> </li>
))} )}
</ul> {[...projectsForDropdown]
)} .sort((a, b) => a?.name?.localeCompare(b.name))
.map((project) => (
<li key={project?.id}>
<button
className="dropdown-item"
onClick={() => handleProjectChange(project?.id)}
>
{project?.name}
{project?.shortName && (
<span className="text-primary fw-semibold ms-1">
({project?.shortName})
</span>
)}
</button>
</li>
))}
</ul>
)}
</div>
</div> </div>
</div> )}
)}
</div> </div>
<ul className="navbar-nav flex-row align-items-center ms-md-auto"> <ul className="navbar-nav flex-row align-items-center ms-md-auto">
@ -402,7 +402,7 @@ const Header = () => {
<li> <li>
<div className="dropdown-divider"></div> <div className="dropdown-divider"></div>
</li> </li>
<li onClick={()=>onOpen()}> <li onClick={() => onOpen()}>
{" "} {" "}
<a <a
className="dropdown-item cusor-pointer" className="dropdown-item cusor-pointer"
@ -448,10 +448,10 @@ const Header = () => {
<a <a
aria-label="click to log out" aria-label="click to log out"
className="dropdown-item cusor-pointer" className="dropdown-item cusor-pointer"
onClick={()=>logout()} onClick={() => logout()}
> >
{logouting ? "Please Wait":<> <i className="bx bx-log-out me-2"></i> {logouting ? "Please Wait" : <> <i className="bx bx-log-out me-2"></i>
<span className="align-middle">SignOut</span></>} <span className="align-middle">SignOut</span></>}
</a> </a>
</li> </li>
</ul> </ul>

2
src/components/Project/ProjectCard.jsx
View File

@ -105,7 +105,7 @@ const ProjectCard = ({ project, isCore = true }) => {
> >
{project?.shortName ? project?.shortName : project?.name} {project?.shortName ? project?.shortName : project?.name}
</h5> </h5>
<div className="client-info text-body"> <div className="client-info text-body text-start">
<span>{project?.shortName ? project?.name : ""}</span> <span>{project?.shortName ? project?.name : ""}</span>
</div> </div>
</div> </div>

2
src/components/ServiceProject/ManageServiceProject.jsx
View File

@ -147,7 +147,7 @@ const ManageServiceProject = ({ serviceProjectId, onClose }) => {
</div> </div>
<i <i
className="bx bx-plus-circle bx-xs cursor-pointer text-primary " className="bx bx-plus-circle bx-xs cursor-pointer text-primary mb-3"
onClick={() => { onClick={() => {
onClose(); onClose();
openOrgModal({ startStep: 2 }); openOrgModal({ startStep: 2 });

2
src/pages/DailyProgressReport/DailyProgrssReport.jsx
View File

@ -97,7 +97,7 @@ const DailyProgrssReport = () => {
]} ]}
/> />
<div className="card card-fullscreen p-5"> <div className="card page-min-h p-5">
{data?.length > 0 && ( {data?.length > 0 && (
<div className="col-sm-4 col-md-3 col-12 text-start"> <div className="col-sm-4 col-md-3 col-12 text-start">
<AppFormController <AppFormController

13
src/utils/constants.jsx
View File

@ -258,3 +258,16 @@ export const JOBS_STATUS_IDS = [
label: "On Hold", label: "On Hold",
}, },
]; ];
export const BUCKET_BG_CLASSES = [
"bg-label-primary bg-opacity-10",
"bg-label-secondary bg-opacity-10",
"bg-label-success bg-opacity-10",
"bg-label-info bg-opacity-10",
"bg-label-warning bg-opacity-10",
"bg-label-danger bg-opacity-10",
"bg-label-dark bg-opacity-10",
"bg-label-primary bg-opacity-25",
"bg-label-success bg-opacity-25",
"bg-label-info bg-opacity-25",
];