diff --git a/frontend/src/container/ListOfDashboard/TableComponents/CreatedBy.tsx b/frontend/src/container/ListOfDashboard/TableComponents/CreatedBy.tsx
index 9416261f39..33240935d1 100644
--- a/frontend/src/container/ListOfDashboard/TableComponents/CreatedBy.tsx
+++ b/frontend/src/container/ListOfDashboard/TableComponents/CreatedBy.tsx
@@ -1,5 +1,6 @@
import { Typography } from 'antd';
import convertDateToAmAndPm from 'lib/convertDateToAmAndPm';
+import getFormattedDate from 'lib/getFormatedDate';
import React from 'react';
import { Data } from '..';
@@ -7,11 +8,11 @@ import { Data } from '..';
const Created = (createdBy: Data['createdBy']): JSX.Element => {
const time = new Date(createdBy);
- return (
- {`${time.toLocaleDateString()} ${convertDateToAmAndPm(
- time,
- )}`}
- );
+ const date = getFormattedDate(time);
+
+ const timeString = `${date} ${convertDateToAmAndPm(time)}`;
+
+ return {`${timeString}`};
};
export default Created;
diff --git a/frontend/src/container/ListOfDashboard/TableComponents/Date.tsx b/frontend/src/container/ListOfDashboard/TableComponents/Date.tsx
index ef0bce03c9..464119f5c4 100644
--- a/frontend/src/container/ListOfDashboard/TableComponents/Date.tsx
+++ b/frontend/src/container/ListOfDashboard/TableComponents/Date.tsx
@@ -1,4 +1,6 @@
import { Typography } from 'antd';
+import convertDateToAmAndPm from 'lib/convertDateToAmAndPm';
+import getFormattedDate from 'lib/getFormatedDate';
import React from 'react';
import { Data } from '..';
@@ -6,9 +8,13 @@ import { Data } from '..';
const DateComponent = (
lastUpdatedTime: Data['lastUpdatedTime'],
): JSX.Element => {
- const date = new Date(lastUpdatedTime).toDateString();
+ const time = new Date(lastUpdatedTime);
- return {date};
+ const date = getFormattedDate(time);
+
+ const timeString = `${date} ${convertDateToAmAndPm(time)}`;
+
+ return {timeString};
};
export default DateComponent;
diff --git a/frontend/src/container/ListOfDashboard/index.tsx b/frontend/src/container/ListOfDashboard/index.tsx
index 8692e27730..8813accdf3 100644
--- a/frontend/src/container/ListOfDashboard/index.tsx
+++ b/frontend/src/container/ListOfDashboard/index.tsx
@@ -49,13 +49,22 @@ const ListOfAllDashboard = (): JSX.Element => {
{
title: 'Created At',
dataIndex: 'createdBy',
+ sorter: (a: Data, b: Data): number => {
+ const prev = new Date(a.createdBy).getTime();
+ const next = new Date(b.createdBy).getTime();
+
+ return prev - next;
+ },
render: Createdby,
},
{
title: 'Last Updated Time',
dataIndex: 'lastUpdatedTime',
sorter: (a: Data, b: Data): number => {
- return parseInt(a.lastUpdatedTime, 10) - parseInt(b.lastUpdatedTime, 10);
+ const prev = new Date(a.lastUpdatedTime).getTime();
+ const next = new Date(b.lastUpdatedTime).getTime();
+
+ return prev - next;
},
render: DateComponent,
},
diff --git a/frontend/src/lib/convertDateToAmAndPm.ts b/frontend/src/lib/convertDateToAmAndPm.ts
index ccc13bab22..0a0ad0a5fc 100644
--- a/frontend/src/lib/convertDateToAmAndPm.ts
+++ b/frontend/src/lib/convertDateToAmAndPm.ts
@@ -1,6 +1,6 @@
const convertDateToAmAndPm = (date: Date): string => {
return date.toLocaleString('en-US', {
- hour: 'numeric',
+ hour: '2-digit',
minute: 'numeric',
hour12: true,
});
diff --git a/frontend/src/lib/getFormatedDate.ts b/frontend/src/lib/getFormatedDate.ts
new file mode 100644
index 0000000000..bd5eb9a3a0
--- /dev/null
+++ b/frontend/src/lib/getFormatedDate.ts
@@ -0,0 +1,13 @@
+function getFormattedDate(date: Date): string {
+ const year = date.getFullYear();
+
+ let month = (1 + date.getMonth()).toString();
+ month = month.length > 1 ? month : '0' + month;
+
+ let day = date.getDate().toString();
+ day = day.length > 1 ? day : '0' + day;
+
+ return month + '/' + day + '/' + year;
+}
+
+export default getFormattedDate;