Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging

This commit is contained in:
Fadli 2023-01-11 11:38:26 +07:00
commit 0351d4a9ad
3 changed files with 9 additions and 1 deletions

View File

@ -28,6 +28,7 @@
"case-sensitive-paths-webpack-plugin": "2.4.0", "case-sensitive-paths-webpack-plugin": "2.4.0",
"css-loader": "4.3.0", "css-loader": "4.3.0",
"date-fns": "^2.27.0", "date-fns": "^2.27.0",
"dateformat": "^5.0.3",
"dotenv": "8.2.0", "dotenv": "8.2.0",
"dotenv-expand": "5.1.0", "dotenv-expand": "5.1.0",
"eslint": "^7.28.0", "eslint": "^7.28.0",

View File

@ -307,7 +307,9 @@ export const DetailUser = observer(() => {
render: (text, record) => { render: (text, record) => {
return ( return (
<Text> <Text>
{moment(record.created_at.toLocaleString('en-GB')).format("MM-DD-YYYY HH:mm:ss")} {
moment(new Date (record.created_at).toISOString().replace('Z', ' ').replace('T', ' ')).format("MM-DD-YYYY HH:mm:ss")
}
</Text> </Text>
); );
}, },

View File

@ -4128,6 +4128,11 @@
"resolved" "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz" "resolved" "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz"
"version" "2.27.0" "version" "2.27.0"
"dateformat@^5.0.3":
"integrity" "sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA=="
"resolved" "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz"
"version" "5.0.3"
"dayjs@1.x": "dayjs@1.x":
"integrity" "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==" "integrity" "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
"resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz" "resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"