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

changed date format and add padding inside expense page card

Browse Source
This commit is contained in:
pramod mahajan 2025-08-02 18:26:17 +05:30
parent e0f130e6a6
commit 07e4c827f3
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Expenses/ExpenseList.jsx
View File

@ -202,7 +202,7 @@ const canDetetExpense = (expense)=>{
</div> </div>
)} )}
<div className="card"> <div className="card px-0 px-sm-4">
<div <div
className="card-datatable table-responsive " className="card-datatable table-responsive "
id="horizontal-example" id="horizontal-example"

13
src/hooks/useExpense.js
View File

@ -3,8 +3,10 @@ import ExpenseRepository from "../repositories/ExpsenseRepository";
import showToast from "../services/toastService"; import showToast from "../services/toastService";
import { queryClient } from "../layouts/AuthLayout"; import { queryClient } from "../layouts/AuthLayout";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import moment from "moment";
// -------------------Query------------------------------------------------------ // -------------------Query------------------------------------------------------
const cleanFilter = (filter) => { const cleanFilter = (filter) => {
const cleaned = { ...filter }; const cleaned = { ...filter };
@ -14,12 +16,19 @@ const cleanFilter = (filter) => {
} }
}); });
if (!cleaned.startDate) delete cleaned.startDate; // moment.utc() to get consistent UTC ISO strings
if (!cleaned.endDate) delete cleaned.endDate; if (!cleaned.startDate) {
cleaned.startDate = moment.utc().subtract(7, "days").startOf("day").toISOString();
}
if (!cleaned.endDate) {
cleaned.endDate = moment.utc().startOf("day").toISOString();
}
return cleaned; return cleaned;
}; };
export const useExpenseList = ( export const useExpenseList = (
pageSize, pageSize,
pageNumber, pageNumber,

4
src/utils/dateUtils.jsx
View File

@ -71,8 +71,8 @@ export const formatNumber = (num) => {
export const formatUTCToLocalTime = (datetime, timeRequired = false) => { export const formatUTCToLocalTime = (datetime, timeRequired = false) => {
return timeRequired return timeRequired
? moment.utc(datetime).local().format("DD MMMM YYYY hh:mm A") ? moment.utc(datetime).local().format("DD MMM YYYY hh:mm A")
: moment.utc(datetime).local().format("DD MMMM YYYY"); : moment.utc(datetime).local().format("DD MMM YYYY");
}; };
export const getCompletionPercentage = (completedWork, plannedWork)=> { export const getCompletionPercentage = (completedWork, plannedWork)=> {