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

display all time lien from darft

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-06 15:48:53 +05:30
parent 1278e32da9
commit 72e5cf0bbe
6 changed files with 95 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/components/AdvancePayment/AdvancePaymentList.jsx
View File

@ -1,8 +1,5 @@
import React, { useEffect, useMemo } from "react";
import {
useExpenseTransactions,
} from "../../hooks/useExpense";
import { useExpenseTransactions } from "../../hooks/useExpense";
import Error from "../common/Error";
import { formatUTCToLocalTime } from "../../utils/dateUtils";
import Loader, { SpinnerLoader } from "../common/Loader";
@ -13,12 +10,44 @@ import { employee } from "../../data/masters";
import { useAdvancePaymentContext } from "../../pages/AdvancePayment/AdvancePaymentPage";
import { formatFigure } from "../../utils/appUtils";
const AdvancePaymentList = ({ employeeId }) => {
const { setBalance} = useAdvancePaymentContext()
const { setBalance } = useAdvancePaymentContext();
const { data, isError, isLoading, error, isFetching } =
useExpenseTransactions(employeeId, { enabled: !!employeeId });
const records = Array.isArray(data) ? data : [];
let currentBalance = 0;
const rowsWithBalance = records.map((r) => {
const isCredit = r.amount > 0;
const credit = isCredit ? r.amount : 0;
const debit = !isCredit ? Math.abs(r.amount) : 0;
currentBalance += credit - debit;
return {
id: r.id,
description: r.title || "-",
projectName: r.project?.name || "-",
createdAt: r.createdAt,
credit,
debit,
financeUId: r.financeUId,
balance: currentBalance,
};
});
useEffect(() => {
if (!employeeId) {
setBalance(null);
return;
}
if (rowsWithBalance.length > 0) {
setBalance(rowsWithBalance[rowsWithBalance.length - 1].balance);
} else {
setBalance(0);
}
}, [employeeId, data, setBalance]);
if (!employeeId) {
return (
<div
@ -30,7 +59,6 @@ const AdvancePaymentList = ({ employeeId }) => {
);
}
// Handle loading state
if (isLoading || isFetching) {
return (
<div
@ -42,47 +70,21 @@ const AdvancePaymentList = ({ employeeId }) => {
);
}
// Handle error state
if (isError) {
return (
<div className="text-center py-3">
{error?.status === 404 ? (
"No advance payment transactions found."
) : (
<Error error={error} />
)}
<div className="text-center py-3">
{error?.status === 404
? "No advance payment transactions found."
: <Error error={error} />}
</div>
);
}
const records = Array.isArray(data) ? data : [];
let currentBalance = 0;
const rowsWithBalance = records.map((r) => {
const isCredit = r.amount > 0;
const credit = isCredit ? r.amount : 0;
const debit = !isCredit ? Math.abs(r.amount) : 0;
currentBalance += credit - debit;
setBalance(currentBalance);
return {
id: r.id,
description: r.title || "-",
projectName: r.project?.name || "-",
createdAt: r.createdAt,
credit,
debit,
financeUId:r.financeUId,
balance: currentBalance,
};
});
const columns = [
{
key: "date",
label: (
<>
Date <i className="bx bx-rupee text-danger"></i>
Date
</>
),
align: "text-start",
@ -127,17 +129,16 @@ const AdvancePaymentList = ({ employeeId }) => {
</div>
);
}
const DecideCreditOrDebit = ({ financeUId }) => {
if (!financeUId) return null;
const DecideCreditOrDebit = ({ financeUId }) => {
if (!financeUId) return null;
const prefix = financeUId?.substring(0, 2).toUpperCase();
const prefix = financeUId?.substring(0, 2).toUpperCase();
if (prefix === "PR") return <span className="text-success">+</span>;
if (prefix === "EX") return <span className="text-danger">-</span>;
return null;
};
if (prefix === "PR") return <span className="text-success">+</span>;
if (prefix === "EX") return <span className="text-danger">-</span>;
return null;
};
return (
<div className="table-responsive">
@ -173,7 +174,10 @@ const AdvancePaymentList = ({ employeeId }) => {
)
) : col.key === "balance" ? (
<div className="d-flex align-items-center justify-content-end">
<DecideCreditOrDebit financeUId={row?.financeUId}/><span className="mx-2">{formatFigure(row.currentBalance)}</span>
<DecideCreditOrDebit financeUId={row?.financeUId} />
<span className="mx-2">
{formatFigure(row.currentBalance)}
</span>
</div>
) : col.key === "date" ? (
<small className="text-muted px-1">

4
src/components/Expenses/ViewExpense.jsx
View File

@ -117,7 +117,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div>
<div className="row mb-1 ">
<div className="col-12 col-lg-7 col-xl-8 mb-3">
<div className="col-12 col-lg-7 col-xl-7 mb-3">
<div className="row">
<div className="col-12 d-flex justify-content-between text-start fw-semibold my-2">
<span>{data?.expenseUId}</span>
@ -525,7 +525,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div>
</div>
<div className="col-12 col-lg-5 col-xl-4">
<div className="col-12 col-lg-5 col-xl-5">
<div className="d-flex align-items-center text-secondary mb-4">
<i className="bx bx-time-five me-2"></i>{" "}
<p className=" m-0">TimeLine</p>

48
src/components/PaymentRequest/PaymentRequestSchema.js
View File

@ -27,31 +27,27 @@ export const PaymentRequestSchema = (expenseTypes, isItself) => {
.refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
message: "Amount must have at most 2 decimal places",
}),
billAttachments: z
.array(
z.object({
fileName: z.string().min(1, { message: "Filename is required" }),
base64Data: z.string().nullable(),
contentType: z
.string()
.refine((val) => ALLOWED_TYPES.includes(val), {
message: "Only PDF, PNG, JPG, or JPEG files are allowed",
}),
documentId: z.string().optional(),
fileSize: z.number().max(MAX_FILE_SIZE, {
message: "File size must be less than or equal to 5MB",
}),
description: z.string().optional(),
isActive: z.boolean().default(true),
})
)
,
})
};
billAttachments: z.array(
z.object({
fileName: z.string().min(1, { message: "Filename is required" }),
base64Data: z.string().nullable(),
contentType: z.string().refine((val) => ALLOWED_TYPES.includes(val), {
message: "Only PDF, PNG, JPG, or JPEG files are allowed",
}),
documentId: z.string().optional(),
fileSize: z.number().max(MAX_FILE_SIZE, {
message: "File size must be less than or equal to 5MB",
}),
description: z.string().optional(),
isActive: z.boolean().default(true),
})
),
});
};
export const defaultPaymentRequest = {
title:"",
title: "",
description: "",
payee: "",
currencyId: "",
@ -63,7 +59,6 @@ export const defaultPaymentRequest = {
billAttachments: [],
};
export const SearchPaymentRequestSchema = z.object({
projectIds: z.array(z.string()).optional(),
statusIds: z.array(z.string()).optional(),
@ -86,7 +81,6 @@ export const defaultPaymentRequestFilter = {
endDate: null,
};
export const PaymentRequestActionScheam = (
isTransaction = false,
transactionDate
@ -149,9 +143,9 @@ export const defaultPRActionValues = {
paidTransactionId: null,
paidAt: null,
paidById: null,
tdsPercentage:"0",
tdsPercentage: "0",
baseAmount: null,
taxAmount:null,
taxAmount: null,
};
export const RequestedExpenseSchema = z.object({

16
src/components/PaymentRequest/PaymentStatusLogs.jsx
View File

@ -5,7 +5,6 @@ import Timeline from "../common/TimeLine";
import moment from "moment";
import { getColorNameFromHex } from "../../utils/appUtils";
const PaymentStatusLogs = ({ data }) => {
const [visibleCount, setVisibleCount] = useState(4);
const sortedLogs = useMemo(() => {
if (!data?.updateLogs) return [];
@ -14,18 +13,16 @@ const PaymentStatusLogs = ({ data }) => {
);
}, [data?.updateLogs]);
const logsToShow = useMemo(
() => sortedLogs.slice(0, visibleCount),
[sortedLogs, visibleCount]
);
const timelineData = useMemo(() => {
return logsToShow.map((log, index) => ({
id: index + 1,
return sortedLogs.map((log, index) => ({
id: log.id,
title: log.nextStatus?.name || "Status Updated",
description: log.nextStatus?.description || "",
timeAgo: log.updatedAt,
color: getColorNameFromHex(log.nextStatus?.color) || "primary",
userComment:log.comment,
users: log.updatedBy
? [
{
@ -37,14 +34,13 @@ const PaymentStatusLogs = ({ data }) => {
]
: [],
}));
}, [logsToShow]);
}, [sortedLogs]);
const handleShowMore = () => {
setVisibleCount((prev) => prev + 4);
};
return (
<div className="page-min-h overflow-auto">
<div className="page-min-h overflow-auto h-56" >
{/* <div className="row g-2">
{logsToShow.map((log) => (
<div key={log.id} className="col-12 d-flex align-items-start mb-1">

16
src/components/common/TimeLine.jsx
View File

@ -5,6 +5,13 @@ import { formatUTCToLocalTime } from "../../utils/dateUtils";
import moment from "moment";
const Timeline = ({ items = [], transparent = true }) => {
if(items.length === 0){
return (
<div className="d-flex justify-content-center align-item-center page-min-h">
<p>Not Action yet</p>
</div>
)
}
return (
<ul
className={`timeline ${
@ -25,12 +32,12 @@ const Timeline = ({ items = [], transparent = true }) => {
></span>
<div className="timeline-event">
<div className="timeline-header mb-3 d-flex justify-content-between">
<div className="timeline-header mb-1 d-flex justify-content-between">
<h6 className="mb-0 text-body">{item.title}</h6>
<small className="text-body-secondary"><Tooltip text={formatUTCToLocalTime(item.timeAgo,true)}>{moment.utc(item.timeAgo).local().fromNow()}</Tooltip></small>
</div>
{item.description && <p className="mb-2">{item.description}</p>}
{item.description && <p className="mb-1">{item.description}</p>}
{item.attachments && item.attachments.length > 0 && (
<div className="d-flex align-items-center mb-2">
@ -54,7 +61,7 @@ const Timeline = ({ items = [], transparent = true }) => {
)}
{item.users && item.users.length > 0 && (
<div className="d-flex flex-wrap align-items-center mb-2">
<div className="d-flex flex-wrap align-items-center ">
<ul className="list-unstyled users-list d-flex align-items-center avatar-group m-0">
{item.users.map((user, i) => (
<li key={i} className="avatar me-1" title={user.name}>
@ -82,8 +89,11 @@ const Timeline = ({ items = [], transparent = true }) => {
<small>{item.users[0].role}</small>
</div>
)}
</div>
)}
<div className="d-flex flex-wrap ms-10">{item.userComment && <p className="mb-2 ">{item.userComment}</p>}</div>
</div>
</li>
))}

2
src/utils/constants.jsx
View File

@ -64,7 +64,7 @@ export const APPROVE_EXPENSE = "eaafdd76-8aac-45f9-a530-315589c6deca";
export const PROCESS_EXPENSE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11";
export const EXPENSE_MANAGE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11";
export const EXPENSE_MANAGE = "bdee29a2-b73b-402d-8dd1-c4b1f81ccbc3";
export const EXPENSE_REJECTEDBY = [
"965eda62-7907-4963-b4a1-657fb0b2724b",