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

Merge pull request 'Expense Module – Default date range filter hides all records on page load' (#365) from Kartik_Bug#955 into Issues_Aug_2W

Browse Source 
Reviewed-on: #365
Merged
This commit is contained in:
pramod.mahajan 2025-09-01 09:11:17 +00:00
commit 8bce930028
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
startField="startDate" startField="startDate"
endField="endDate" endField="endDate"
resetSignal={resetKey} resetSignal={resetKey}
defaultRange={false}
/> />
</div> </div>

12
src/hooks/useExpense.js
View File

@ -17,13 +17,13 @@ const cleanFilter = (filter) => {
}); });
// moment.utc() to get consistent UTC ISO strings // moment.utc() to get consistent UTC ISO strings
if (!cleaned.startDate) { // if (!cleaned.startDate) {
cleaned.startDate = moment.utc().subtract(7, "days").startOf("day").toISOString(); // cleaned.startDate = moment.utc().subtract(7, "days").startOf("day").toISOString();
} // }
if (!cleaned.endDate) { // if (!cleaned.endDate) {
cleaned.endDate = moment.utc().startOf("day").toISOString(); // cleaned.endDate = moment.utc().startOf("day").toISOString();
} // }
return cleaned; return cleaned;
}; };