diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index b57a9c75..feda6c77 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -127,7 +127,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
id="DataTables_Table_0_length"
>
-
+
{
acc.push(
- {moment(currentDate).format("YYYY-MM-DD")}
+ {moment(currentDate).format("DD-MM-YYYY")}
|
);
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index 07c36e11..c56e742e 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -12,7 +12,7 @@ const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate =
const fp = flatpickr(inputRef.current, {
mode: "range",
- dateFormat: "Y-m-d",
+ dateFormat: "d-m-Y",
defaultDate: [fifteenDaysAgo, today],
static: true,
clickOpens: true,
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 5b69c596..58e7d57e 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -6,7 +6,7 @@ import { useTaskList } from "../../hooks/useTasks";
import { useProjects } from "../../hooks/useProjects";
import { setProjectId } from "../../slices/localVariablesSlice";
import { useProfile } from "../../hooks/useProfile";
-import { formatDate } from "../../utils/dateUtils";
+// import { formatDate } from "../../utils/dateUtils"; // Removed this import
import GlobalModel from "../../components/common/GlobalModel";
import AssignRoleModel from "../../components/Project/AssignRole";
import { ReportTask } from "../../components/Activities/ReportTask";
@@ -14,6 +14,7 @@ import ReportTaskComments from "../../components/Activities/ReportTaskComments";
import DateRangePicker from "../../components/common/DateRangePicker";
import DatePicker from "../../components/common/DatePicker";
import { useSearchParams } from "react-router-dom";
+import moment from "moment";
const DailyTask = () => {
const [searchParams] = useSearchParams();
@@ -141,6 +142,7 @@ const DailyTask = () => {
@@ -188,7 +190,7 @@ const DailyTask = () => {
)}
{!task_loading && TaskList.length === 0 && (
-
+
No Reports Found
|
@@ -199,7 +201,7 @@ const DailyTask = () => {
- {date}
+ {moment(date).format("DD-MM-YYYY")}
|
{TaskLists.filter((task) =>
@@ -246,7 +248,7 @@ const DailyTask = () => {
task.workItem.completedWork}
{task.completedTask} |
- {formatDate(task.assignmentDate)} |
+ {moment(task.assignmentDate).format("DD-MM-YYYY")} |
{
${task.teamMembers
.map(
(member) => `
-
-
-
- ${
- member?.firstName?.charAt(
- 0
- ) || ""
- }${
+
+
+
+ ${
+ member?.firstName?.charAt(
+ 0
+ ) || ""
+ }${
member?.lastName?.charAt(0) || ""
}
-
-
- ${member.firstName} ${
+
+
+ ${member.firstName} ${
member.lastName
}
-
- `
+
+ `
)
.join("")}
@@ -362,4 +364,4 @@ const DailyTask = () => {
>
);
};
-export default DailyTask;
+export default DailyTask;
\ No newline at end of file
|