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

Convert all date to DD-MM-YYYY accross all component.

Browse Source
This commit is contained in:
kartik.sharma 2025-05-27 11:53:56 +05:30 committed by pramod.mahajan
parent 5572b80f4a
commit 4b64e7450e
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Activities/AttendcesLogs.jsx
View File

@ -127,7 +127,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
id="DataTables_Table_0_length" id="DataTables_Table_0_length"
> >
<div className="col-md-3 my-0 "> <div className="col-md-3 my-0 ">
<DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday} /> <DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday} />
</div> </div>
<div className="col-md-2 m-0 text-end"> <div className="col-md-2 m-0 text-end">
<i <i
@ -171,7 +171,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
acc.push( acc.push(
<tr key={`header-${currentDate}`} className="table-row-header"> <tr key={`header-${currentDate}`} className="table-row-header">
<td colSpan={6} className="text-start"> <td colSpan={6} className="text-start">
<strong>{moment(currentDate).format("YYYY-MM-DD")}</strong> <strong>{moment(currentDate).format("DD-MM-YYYY")}</strong>
</td> </td>
</tr> </tr>
); );

2
src/components/common/DateRangePicker.jsx
View File

@ -12,7 +12,7 @@ const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate =
const fp = flatpickr(inputRef.current, { const fp = flatpickr(inputRef.current, {
mode: "range", mode: "range",
dateFormat: "Y-m-d", dateFormat: "d-m-Y",
defaultDate: [fifteenDaysAgo, today], defaultDate: [fifteenDaysAgo, today],
static: true, static: true,
clickOpens: true, clickOpens: true,

38
src/pages/Activities/DailyTask.jsx
View File

@ -6,7 +6,7 @@ import { useTaskList } from "../../hooks/useTasks";
import { useProjects } from "../../hooks/useProjects"; import { useProjects } from "../../hooks/useProjects";
import { setProjectId } from "../../slices/localVariablesSlice"; import { setProjectId } from "../../slices/localVariablesSlice";
import { useProfile } from "../../hooks/useProfile"; 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 GlobalModel from "../../components/common/GlobalModel";
import AssignRoleModel from "../../components/Project/AssignRole"; import AssignRoleModel from "../../components/Project/AssignRole";
import { ReportTask } from "../../components/Activities/ReportTask"; import { ReportTask } from "../../components/Activities/ReportTask";
@ -14,6 +14,7 @@ import ReportTaskComments from "../../components/Activities/ReportTaskComments";
import DateRangePicker from "../../components/common/DateRangePicker"; import DateRangePicker from "../../components/common/DateRangePicker";
import DatePicker from "../../components/common/DatePicker"; import DatePicker from "../../components/common/DatePicker";
import { useSearchParams } from "react-router-dom"; import { useSearchParams } from "react-router-dom";
import moment from "moment";
const DailyTask = () => { const DailyTask = () => {
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
@ -141,6 +142,7 @@ const DailyTask = () => {
<DateRangePicker <DateRangePicker
onRangeChange={setDateRange} onRangeChange={setDateRange}
DateDifference="6" DateDifference="6"
dateFormat="DD-MM-YYYY"
/> />
</div> </div>
<div className="col-sm-3 col-6 text-end mb-1"> <div className="col-sm-3 col-6 text-end mb-1">
@ -188,7 +190,7 @@ const DailyTask = () => {
</tr> </tr>
)} )}
{!task_loading && TaskList.length === 0 && ( {!task_loading && TaskList.length === 0 && (
<tr> <tr>
<td colSpan={7} className="text-center"> <td colSpan={7} className="text-center">
<p>No Reports Found</p> <p>No Reports Found</p>
</td> </td>
@ -199,7 +201,7 @@ const DailyTask = () => {
<React.Fragment key={i}> <React.Fragment key={i}>
<tr className="table-row-header"> <tr className="table-row-header">
<td colSpan={7} className="text-start"> <td colSpan={7} className="text-start">
<strong>{date}</strong> <strong>{moment(date).format("DD-MM-YYYY")}</strong>
</td> </td>
</tr> </tr>
{TaskLists.filter((task) => {TaskLists.filter((task) =>
@ -246,7 +248,7 @@ const DailyTask = () => {
task.workItem.completedWork} task.workItem.completedWork}
</td> </td>
<td>{task.completedTask}</td> <td>{task.completedTask}</td>
<td>{formatDate(task.assignmentDate)}</td> <td>{moment(task.assignmentDate).format("DD-MM-YYYY")}</td>
<td className="text-center"> <td className="text-center">
<div <div
key={refIndex} key={refIndex}
@ -264,23 +266,23 @@ const DailyTask = () => {
${task.teamMembers ${task.teamMembers
.map( .map(
(member) => ` (member) => `
<div class="d-flex align-items-center gap-2 mb-2"> <div class="d-flex align-items-center gap-2 mb-2">
<div class="avatar avatar-xs"> <div class="avatar avatar-xs">
<span class="avatar-initial rounded-circle bg-label-primary"> <span class="avatar-initial rounded-circle bg-label-primary">
${ ${
member?.firstName?.charAt( member?.firstName?.charAt(
0 0
) || "" ) || ""
}${ }${
member?.lastName?.charAt(0) || "" member?.lastName?.charAt(0) || ""
} }
</span> </span>
</div> </div>
<span>${member.firstName} ${ <span>${member.firstName} ${
member.lastName member.lastName
}</span> }</span>
</div> </div>
` `
) )
.join("")} .join("")}
</div> </div>
@ -362,4 +364,4 @@ const DailyTask = () => {
</> </>
); );
}; };
export default DailyTask; export default DailyTask;