diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx index 31c1522f..20f9e647 100644 --- a/src/components/Activities/AttendcesLogs.jsx +++ b/src/components/Activities/AttendcesLogs.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState, useMemo, useCallback } from "react"; import moment from "moment"; import Avatar from "../common/Avatar"; -import { convertShortTime } from "../../utils/dateUtils"; +import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils"; import RenderAttendanceStatus from "./RenderAttendanceStatus"; import { useSelector, useDispatch } from "react-redux"; import DateRangePicker from "../common/DateRangePicker"; @@ -228,23 +228,12 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => { className="dataTables_length text-start py-2 d-flex justify-content-between" id="DataTables_Table_0_length" > -
+
-
- setShowPending(e.target.checked)} - /> - -
+
@@ -292,8 +281,8 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => { className="table-row-header" > - - {moment(currentDate).format("DD-MM-YYYY")} + + {formatUTCToLocalTime(currentDate)} diff --git a/src/components/Dashboard/Attendance.jsx b/src/components/Dashboard/Attendance.jsx index 57c34a3a..db1dcee0 100644 --- a/src/components/Dashboard/Attendance.jsx +++ b/src/components/Dashboard/Attendance.jsx @@ -6,10 +6,9 @@ import { useSelectedProject } from "../../hooks/useSelectedProject"; const Attendance = () => { const { projects } = useProjects(); - const today = new Date().toISOString().split("T")[0]; // YYYY-MM-DD + const today = new Date().toISOString().split("T")[0]; const [selectedDate, setSelectedDate] = useState(today); - // central project selection hook const selectedProjectId = useSelectedProject() const { @@ -136,7 +135,6 @@ const selectedProjectId = useSelectedProject() )} - {/* Details */} {AttendanceData?.activeTab === "Details" && (
diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx index 16159a1c..640f0b77 100644 --- a/src/components/Expenses/ExpenseList.jsx +++ b/src/components/Expenses/ExpenseList.jsx @@ -124,7 +124,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { }, { key: "expensesType", - label: "Expense Type", + label: "Expense Category", getValue: (e) => e.expensesType?.name || "N/A", align: "text-start", }, @@ -250,10 +250,10 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { (col.isAlwaysVisible || groupBy !== col.key) && ( ) )} @@ -267,8 +267,8 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { Object.values(grouped).map(({ key, displayField, items }) => ( -
-
{col.label}
+
{col.label}
-
+
+
{" "} {displayField} :{" "} @@ -288,7 +288,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { (col.isAlwaysVisible || groupBy !== col.key) && (
{col.customRender ? col.customRender(expense) diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx index d0c01658..b8dde3bd 100644 --- a/src/components/common/DateRangePicker.jsx +++ b/src/components/common/DateRangePicker.jsx @@ -63,30 +63,27 @@ const DateRangePicker = ({ }; return ( -
+
- + > + +
); }; export default DateRangePicker; - - - - - export const DateRangePicker1 = ({ startField = "startDate", endField = "endDate", @@ -173,13 +170,12 @@ export const DateRangePicker1 = ({ } }, [resetSignal, defaultRange, setValue, startField, endField]); - const start = getValues(startField); const end = getValues(endField); const formattedValue = start && end ? `${start} To ${end}` : ""; return ( -
+
); }; -