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

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

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-20 17:09:09 +05:30
commit 753d8c4a2c
4 changed files with 178 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/components/ServiceProject/JobList.jsx
View File

@ -4,17 +4,20 @@ import {
getJobStatusBadge,
getNextBadgeColor,
} from "../../utils/appUtils";
import { useServiceProjectJobs } from "../../hooks/useServiceProject";
import { ITEMS_PER_PAGE } from "../../utils/constants";
import { useServiceProjectJobs, useUpdateServiceProjectJob } from "../../hooks/useServiceProject";
import { ITEMS_PER_PAGE, JOBS_STATUS_IDS } from "../../utils/constants";
import EmployeeAvatarGroup from "../common/EmployeeAvatarGroup";
import { formatUTCToLocalTime } from "../../utils/dateUtils";
import { SpinnerLoader } from "../common/Loader";
import { useParams } from "react-router-dom";
import ProjectPage from "../../pages/project/ProjectPage";
import { useServiceProjectJobContext } from "./Jobs";
import ConfirmModal from "../common/ConfirmModal";
const JobList = () => {
const { setSelectedJob, setManageJob } = useServiceProjectJobContext();
const { mutate: UpdateJob } = useUpdateServiceProjectJob(() => {
});
const { projectId } = useParams();
const { data, isLoading, isError, error } = useServiceProjectJobs(
ITEMS_PER_PAGE,
@ -22,6 +25,29 @@ const JobList = () => {
true,
projectId
);
const [isArchiveModalOpen, setIsArchiveModalOpen] = useState(false);
const [archiveJobId, setArchiveJobId] = useState(null);
const handleArchive = () => {
const payload = [
{
op: "replace",
path: "/isArchive",
value: true,
},
];
UpdateJob({
id: archiveJobId,
payload,
isArchiveAction: true,
});
setIsArchiveModalOpen(false);
setArchiveJobId(null);
};
const jobGrid = [
{
@ -86,7 +112,29 @@ const JobList = () => {
},
];
const canArchive = (statusId) => {
const closedId = JOBS_STATUS_IDS.find((s) => s.label === "Closed")?.id;
const workDoneId = JOBS_STATUS_IDS.find((s) => s.label === "Work Done")?.id;
return statusId === closedId || statusId === workDoneId;
};
return (
<>
{isArchiveModalOpen && (
<ConfirmModal
isOpen={isArchiveModalOpen}
type="success"
header="Archive Job"
message="Are you sure you want to archive this job?"
onSubmit={handleArchive}
onClose={() => setIsArchiveModalOpen(false)}
loading={false}
/>
)}
<div className="dataTables_wrapper dt-bootstrap5 no-footer table-responsive">
<table
className="datatables-users table border-top dataTable no-footer dtr-column text-nowrap table-responsive"
@ -97,8 +145,7 @@ const JobList = () => {
{jobGrid.map((col) => (
<th
key={col.key}
className={`${col.align || "text-center"} ${
col.className || ""
className={`${col.align || "text-center"} ${col.className || ""
}`}
scope="col"
>
@ -143,7 +190,6 @@ const JobList = () => {
>
<i className="bx bx-detail bx-sm"></i> View
</button>
<>
<button
className="dropdown-item py-1"
@ -154,6 +200,19 @@ const JobList = () => {
<i className="bx bx-edit bx-sm"></i> Edit
</button>
</>
{canArchive(row?.status?.id) && (
<button
className="dropdown-item py-1"
onClick={() => {
setArchiveJobId(row.id);
setIsArchiveModalOpen(true);
}}
>
<i className="bx bx-archive bx-sm"></i> Archive
</button>
)}
</div>
</div>
</td>
@ -172,6 +231,7 @@ const JobList = () => {
</tbody>
</table>
</div>
</>
);
};

2
src/components/common/ConfirmModal.jsx
View File

@ -17,7 +17,7 @@ const ConfirmModal = ({
case "delete":
return <i className="bx bx-x-circle text-danger" style={{ fontSize: "60px" }}></i>;
case "success":
return <i className="bx bx-check-circle text-success" style={{ fontSize: "60px" }}></i>;
return <i className="bx bx-archive-in text-warning" style={{ fontSize: "60px" }}></i>;
case "warning":
return <i className="bx bx-error-circle text-warning" style={{ fontSize: "60px" }}></i>;
default:

19
src/hooks/useServiceProject.jsx
View File

@ -257,19 +257,27 @@ export const useCreateServiceProjectJob = (onSuccessCallback) => {
export const useUpdateServiceProjectJob = (onSuccessCallback) => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async ({ id, payload }) => {
// Call the repository patch
mutationFn: async ({ id, payload, isArchiveAction = false }) => {
const resp = await ServiceProjectRepository.UpdateJob(id, payload);
return resp;
return { resp, isArchiveAction };
},
onSuccess: () => {
onSuccess: ({ isArchiveAction }) => {
queryClient.invalidateQueries({ queryKey: ["serviceProjectJobs"] });
queryClient.invalidateQueries({ queryKey: ["service-job"] });
if (onSuccessCallback) onSuccessCallback();
if (isArchiveAction) {
showToast("Job archived successfully", "success");
} else {
showToast("Job Updated successfully", "success");
}
},
onError: (error) => {
showToast(
error?.response?.data?.message ||
@ -281,6 +289,7 @@ export const useUpdateServiceProjectJob = (onSuccessCallback) => {
});
};
//#endregion
//#region Branch
@ -384,7 +393,7 @@ export const useDeleteBranch = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async ({ id, isActive}) =>
mutationFn: async ({ id, isActive }) =>
await ServiceProjectRepository.DeleteBranch(id, isActive),
onSuccess: () => {

31
src/utils/constants.jsx
View File

@ -211,3 +211,34 @@ export const PAYEE_RECURRING_EXPENSE = [
export const STATUS_JOB_CLOSED = "3ddeefb5-ae3c-4e10-a922-35e0a452bb69"
//#endregion
export const JOBS_STATUS_IDS = [
{
id: "32d76a02-8f44-4aa0-9b66-c3716c45a918",
label: "New",
},
{
id: "cfa1886d-055f-4ded-84c6-42a2a8a14a66",
label: "Assigned",
},
{
id: "5a6873a5-fed7-4745-a52f-8f61bf3bd72d",
label: "In Progress",
},
{
id: "aab71020-2fb8-44d9-9430-c9a7e9bf33b0",
label: "Work Done",
},
{
id: "ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7",
label: "Review Done",
},
{
id: "3ddeefb5-ae3c-4e10-a922-35e0a452bb69",
label: "Closed",
},
{
id: "75a0c8b8-9c6a-41af-80bf-b35bab722eb2",
label: "On Hold",
},
];