diff --git a/package-lock.json b/package-lock.json index 95dde8d..84ceec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,7 @@ "history": "5.0.1", "html-react-parser": "^1.3.0", "lodash": "^4.17.21", + "moment": "^2.29.3", "prop-types": "15.7.2", "query-string": "7.0.1", "react": "^16.14.0", @@ -21789,6 +21790,14 @@ "node": ">=0.10.0" } }, + "node_modules/moment": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==", + "engines": { + "node": "*" + } + }, "node_modules/moo": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", @@ -50221,6 +50230,11 @@ "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", "dev": true }, + "moment": { + "version": "2.29.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz", + "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==" + }, "moo": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz", diff --git a/package.json b/package.json index 072dc87..da53a19 100755 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "history": "5.0.1", "html-react-parser": "^1.3.0", "lodash": "^4.17.21", + "moment": "^2.29.3", "prop-types": "15.7.2", "query-string": "7.0.1", "react": "^16.14.0", diff --git a/src/containers/ListView/SubmissionsTable.jsx b/src/containers/ListView/SubmissionsTable.jsx index 4f92792..9352b89 100644 --- a/src/containers/ListView/SubmissionsTable.jsx +++ b/src/containers/ListView/SubmissionsTable.jsx @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; +import moment from 'moment'; import { DataTable, @@ -53,7 +54,7 @@ export class SubmissionsTable extends React.Component { } formatDate = ({ value }) => { - const date = new Date(value); + const date = new Date(moment(value)); return date.toLocaleString(); } diff --git a/src/containers/ListView/SubmissionsTable.test.jsx b/src/containers/ListView/SubmissionsTable.test.jsx index 42b2f58..062238d 100644 --- a/src/containers/ListView/SubmissionsTable.test.jsx +++ b/src/containers/ListView/SubmissionsTable.test.jsx @@ -43,9 +43,9 @@ let el; jest.useFakeTimers('modern'); const dates = [ - new Date(16131215154955).toLocaleTimeString(), - new Date(16131225154955).toLocaleTimeString(), - new Date(16131215250955).toLocaleTimeString(), + '2021-12-08 09:06:15.319213+00:00', + '2021-12-10 18:06:15.319213+00:00', + '2021-12-11 07:06:15.319213+00:00', ]; const individualData = [ diff --git a/src/containers/ListView/__snapshots__/SubmissionsTable.test.jsx.snap b/src/containers/ListView/__snapshots__/SubmissionsTable.test.jsx.snap index 82bab11..3234100 100644 --- a/src/containers/ListView/__snapshots__/SubmissionsTable.test.jsx.snap +++ b/src/containers/ListView/__snapshots__/SubmissionsTable.test.jsx.snap @@ -58,7 +58,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: h data={ Array [ Object { - "dateSubmitted": "9:05:54 PM", + "dateSubmitted": "2021-12-08 09:06:15.319213+00:00", "gradingStatus": "ungraded", "score": Object { "pointsEarned": 1, @@ -67,7 +67,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: h "username": "username-1", }, Object { - "dateSubmitted": "11:52:34 PM", + "dateSubmitted": "2021-12-10 18:06:15.319213+00:00", "gradingStatus": "graded", "score": Object { "pointsEarned": 2, @@ -76,7 +76,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: h "username": "username-2", }, Object { - "dateSubmitted": "9:07:30 PM", + "dateSubmitted": "2021-12-11 07:06:15.319213+00:00", "gradingStatus": "in-progress", "score": Object { "pointsEarned": 3, @@ -176,7 +176,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: t data={ Array [ Object { - "dateSubmitted": "9:05:54 PM", + "dateSubmitted": "2021-12-08 09:06:15.319213+00:00", "gradingStatus": "ungraded", "score": Object { "pointsEarned": 1, @@ -185,7 +185,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: t "teamName": "teamName-1", }, Object { - "dateSubmitted": "11:52:34 PM", + "dateSubmitted": "2021-12-10 18:06:15.319213+00:00", "gradingStatus": "graded", "score": Object { "pointsEarned": 2, @@ -194,7 +194,7 @@ exports[`SubmissionsTable component component render tests snapshots snapshot: t "teamName": "teamName-2", }, Object { - "dateSubmitted": "9:07:30 PM", + "dateSubmitted": "2021-12-11 07:06:15.319213+00:00", "gradingStatus": "in-progress", "score": Object { "pointsEarned": 3,