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

Refactor_Directory And Project Level Permsssion #404

Merged
pramod.mahajan merged 90 commits from Refactor_Directory into main 2025-09-17 10:24:46 +00:00
Conversation 0 Commits 90 Files Changed 143 +12 -7
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4927680fe3 - Show all commits

9
src/components/Expenses/ManageExpense.jsx
View File

@ -2,7 +2,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import React, { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { defaultExpense, ExpenseSchema } from "./ExpenseSchema";
import { formatFileSize } from "../../utils/appUtils";
import { formatFileSize, localToUtc } from "../../utils/appUtils";
import { useProjectName } from "../../hooks/useProjects";
import { useDispatch, useSelector } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice";
@ -183,9 +183,8 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
const onSubmit = (fromdata) => {
let payload = {
...fromdata,
transactionDate: moment
.utc(fromdata.transactionDate, "DD-MM-YYYY")
.toISOString(),
transactionDate: localToUtc(fromdata.transactionDate)
};
if (expenseToEdit) {
const editPayload = { ...payload, id: data.id };
@ -331,7 +330,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
<Label htmlFor="transactionDate" className="form-label" required>
Transaction Date
</Label>
<DatePicker name="transactionDate" control={control} />
<DatePicker name="transactionDate" control={control} maxDate={new Date()}/>
{errors.transactionDate && (
<small className="danger-text">

10
src/utils/appUtils.js
View File

@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { format, parseISO } from "date-fns";
export const formatFileSize=(bytes)=> {
if (bytes < 1024) return bytes + " B";
else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
@ -68,4 +68,10 @@ export const normalizeAllowedContentTypes = (allowedContentType) => {
if (Array.isArray(allowedContentType)) return allowedContentType;
if (typeof allowedContentType === "string") return allowedContentType.split(",");
return [];
};
};
export function localToUtc(localDateString) {
const date = new Date(localDateString);
return date.toISOString();
}