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

fixed category filter field

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-04 10:46:20 +05:30
parent 3aa9934f8b
commit 192c04fb6f
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
handleGroupBy, handleGroupBy,
selectedGroup.id, selectedGroup.id,
appliedStatusId, appliedStatusId,
selectedProjectId, // ✅ Added dependency selectedProjectId,
]); ]);
if (isLoading || isFetching) return <ExpenseFilterSkeleton />; if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
@ -180,7 +180,6 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
</button> </button>
</div> </div>
</div> </div>
<label className="fw-semibold">Choose Date Range:</label>
<DateRangePicker1 <DateRangePicker1
placeholder="DD-MM-YYYY To DD-MM-YYYY" placeholder="DD-MM-YYYY To DD-MM-YYYY"
startField="startDate" startField="startDate"
@ -188,6 +187,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
resetSignal={resetKey} resetSignal={resetKey}
defaultRange={false} defaultRange={false}
maxDate={new Date()} maxDate={new Date()}
className="w-100"
/> />
</div> </div>

5
src/components/PaymentRequest/ManagePaymentRequest.jsx
View File

@ -217,12 +217,13 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
<div className="row my-2 text-start"> <div className="row my-2 text-start">
<div className="col-md-6"> <div className="col-md-6">
<Label htmlFor="dueDate" className="form-label" required> <Label htmlFor="dueDate" className="form-label" required>
Transaction Date Due To Date
</Label> </Label>
<DatePicker <DatePicker
name="dueDate" name="dueDate"
control={control} control={control}
maxDate={new Date()} minDate={new Date()}
className='w-100'
/> />
{errors.dueDate && ( {errors.dueDate && (

4
src/components/PaymentRequest/PaymentRequestFilterPanel.jsx
View File

@ -96,11 +96,11 @@ const PaymentRequestFilterPanel = ({ onApply, handleGroupBy }) => {
<div className="d-flex align-items-center mb-2"> <div className="d-flex align-items-center mb-2">
<label className="form-label me-2">Filter By:</label> <label className="form-label me-2">Filter By:</label>
</div> </div>
<label className="fw-semibold">Choose Date Range:</label>
<DateRangePicker1 <DateRangePicker1
placeholder="DD-MM-YYYY To DD-MM-YYYY" placeholder="DD-MM-YYYY To DD-MM-YYYY"
startField="startDate" startField="startDate"
endField="endDate" endField="endDate"
className="w-100"
resetSignal={resetKey} resetSignal={resetKey}
defaultRange={false} defaultRange={false}
maxDate={new Date()} maxDate={new Date()}
@ -130,7 +130,7 @@ const PaymentRequestFilterPanel = ({ onApply, handleGroupBy }) => {
valueKey="id" valueKey="id"
/> />
<SelectMultiple <SelectMultiple
name="expensesCategory" name="expenseCategoryIds"
label="Category :" label="Category :"
options={data?.expensesCategory} options={data?.expensesCategory}
labelKey={(item) => item.name} labelKey={(item) => item.name}

4
src/components/PaymentRequest/ViewPaymentRequest.jsx
View File

@ -127,7 +127,7 @@ const ViewPaymentRequest = ({ requestId }) => {
className="form-label me-2 mb-0 fw-semibold text-start" className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }} style={{ minWidth: "130px" }}
> >
Projct Name : Project Name :
</label> </label>
<div className="text-muted"> <div className="text-muted">
{data.project.name} {data.project.name}
@ -153,7 +153,7 @@ const ViewPaymentRequest = ({ requestId }) => {
className="form-label me-2 mb-0 fw-semibold text-start" className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }} style={{ minWidth: "130px" }}
> >
Expense Type : Expense Category :
</label> </label>
<div className="text-muted">{data?.expenseCategory?.name}</div> <div className="text-muted">{data?.expenseCategory?.name}</div>
</div> </div>

8
src/hooks/useExpense.js
View File

@ -10,7 +10,7 @@ import moment from "moment";
const cleanFilter = (filter) => { const cleanFilter = (filter) => {
const cleaned = { ...filter }; const cleaned = { ...filter };
["projectIds", "statusIds", "createdByIds", "paidById","ExpenseTypeIds"].forEach((key) => { ["projectIds", "statusIds", "createdByIds", "paidById","expenseCategoryIds"].forEach((key) => {
if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) { if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
delete cleaned[key]; delete cleaned[key];
} }
@ -364,7 +364,11 @@ export const usePaymentRequestFilter = () => {
return useQuery({ return useQuery({
queryKey: ["PaymentRequestFilter"], queryKey: ["PaymentRequestFilter"],
queryFn: async () => queryFn: async () =>
await ExpenseRepository.GetPaymentRequestFilter().then((res) => res.data), {
const response = await ExpenseRepository.GetPaymentRequestFilter();
return response.data;
}
}); });
}; };