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

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a763ec4412 - Show all commits

2
src/components/Directory/NoteCardDirectoryEditable.jsx
View File

@ -153,7 +153,7 @@ const NoteCardDirectoryEditable = ({
.utc(noteItem?.createdAt) .utc(noteItem?.createdAt)
.add(5, "hours") .add(5, "hours")
.add(30, "minutes") .add(30, "minutes")
.format("MMMM DD, YYYY [at] hh:mm A")} .format("DD MMMM, YYYY [at] hh:mm A")}
</span> </span>
</span> </span>

2
src/components/Directory/ProfileContactDirectory.jsx
View File

@ -160,7 +160,7 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
<div className="d-flex align-items-center"> <div className="d-flex align-items-center">
<span> <span>
{moment(profileContactState.createdAt).format("MMMM DD, YYYY")} {moment(profileContactState.createdAt).format("DD MMMM, YYYY")}
</span> </span>
</div> </div>
</div> </div>

2
src/pages/Gallary/ImageGallary.jsx
View File

@ -394,7 +394,7 @@ useEffect(() => {
> >
{batch.documents.map((d, i) => { {batch.documents.map((d, i) => {
const hoverDate = moment(d.uploadedAt).format( const hoverDate = moment(d.uploadedAt).format(
"DD-MM-YYYY" "DD MMMM, YYYY"
); );
const hoverTime = moment(d.uploadedAt).format( const hoverTime = moment(d.uploadedAt).format(
"hh:mm A" "hh:mm A"

2
src/utils/dateUtils.jsx
View File

@ -68,7 +68,7 @@ export const formatNumber = (num) => {
return Number.isInteger(num) ? num : num.toFixed(2); return Number.isInteger(num) ? num : num.toFixed(2);
}; };
export const formatUTCToLocalTime = (datetime) =>{ export const formatUTCToLocalTime = (datetime) =>{
return moment.utc(datetime).local().format("MMMM DD, YYYY [at] hh:mm A"); return moment.utc(datetime).local().format("DD MMMM, YYYY [at] hh:mm A");
} }
export const getCompletionPercentage = (completedWork, plannedWork)=> { export const getCompletionPercentage = (completedWork, plannedWork)=> {