From 621f02ad7637169bbedebf1f025c5683ba2dbd48 Mon Sep 17 00:00:00 2001 From: sjh88 Date: Wed, 29 Mar 2023 16:34:06 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=82=A0=EC=A7=9C=20=EB=8F=99=EC=9E=91?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20x-date-picke?= =?UTF-8?q?rs=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 305 +++++++++++++++++- package.json | 4 +- .../biz/admin/judge/JudgeDateModifyForm.jsx | 60 ++-- .../biz/admin/judge/JudgeRegistReview.jsx | 19 +- src/views/biz/admin/judge/JudgeReview.jsx | 2 + .../biz/admin/judge/JudgeTargetSaveForm.jsx | 130 ++------ src/views/cmm/MuiXDatePicker.jsx | 63 ++++ 7 files changed, 428 insertions(+), 155 deletions(-) create mode 100644 src/views/cmm/MuiXDatePicker.jsx diff --git a/package-lock.json b/package-lock.json index 869ce91..b4ba36c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "xit-opst-fo", "version": "0.0.1", "dependencies": { + "@date-io/jalaali": "^2.16.1", "@emotion/cache": "^11.7.1", "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", @@ -25,6 +26,7 @@ "@mui/system": "^5.4.1", "@mui/utils": "^5.4.1", "@mui/x-data-grid": "^5.5.0", + "@mui/x-date-pickers": "^6.0.3", "@react-pdf/renderer": "^2.1.1", "@reduxjs/toolkit": "^1.7.2", "@tabler/icons": "^1.53.0", @@ -32,9 +34,9 @@ "axios": "^0.25.0", "axios-mock-adapter": "^1.20.0", "chance": "^1.1.8", - "core-js": "^3.27.2", + "core-js": "^3", "csstype": "^3.0.10", - "date-fns": "^2.28.0", + "date-fns": "^2.29.3", "draft-js": "^0.11.7", "emoji-picker-react": "^3.5.1", "env-cmd": "^10.1.0", @@ -1834,9 +1836,9 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "node_modules/@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", + "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", "dependencies": { "regenerator-runtime": "^0.13.11" }, @@ -1923,6 +1925,123 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, + "node_modules/@date-io/core": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", + "integrity": "sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==" + }, + "node_modules/@date-io/date-fns": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", + "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", + "dependencies": { + "@date-io/core": "^2.16.0" + }, + "peerDependencies": { + "date-fns": "^2.0.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + } + } + }, + "node_modules/@date-io/date-fns-jalali": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns-jalali/-/date-fns-jalali-2.16.0.tgz", + "integrity": "sha512-MNVvGYwRiBydbvY7gvZM14W2kosIG29G1Ekw5qmYWOXkIIFngh6ZvV7/uVGDCW+gqlIeSz/XitZXA9n8RO0tJw==", + "dependencies": { + "@date-io/core": "^2.16.0" + }, + "peerDependencies": { + "date-fns-jalali": "^2.13.0-0" + }, + "peerDependenciesMeta": { + "date-fns-jalali": { + "optional": true + } + } + }, + "node_modules/@date-io/dayjs": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/dayjs/-/dayjs-2.16.0.tgz", + "integrity": "sha512-y5qKyX2j/HG3zMvIxTobYZRGnd1FUW2olZLS0vTj7bEkBQkjd2RO7/FEwDY03Z1geVGlXKnzIATEVBVaGzV4Iw==", + "dependencies": { + "@date-io/core": "^2.16.0" + }, + "peerDependencies": { + "dayjs": "^1.8.17" + }, + "peerDependenciesMeta": { + "dayjs": { + "optional": true + } + } + }, + "node_modules/@date-io/hijri": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/hijri/-/hijri-2.16.1.tgz", + "integrity": "sha512-6BxY0mtnqj5cBiXluRs3uWN0mSJwGw0AB2ZxqtEHvBFoiSYEojW51AETnfPIWpdvDsBn+WAC7QrfBvQZnoyIkQ==", + "dependencies": { + "@date-io/moment": "^2.16.1" + }, + "peerDependencies": { + "moment-hijri": "^2.1.2" + }, + "peerDependenciesMeta": { + "moment-hijri": { + "optional": true + } + } + }, + "node_modules/@date-io/jalaali": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/jalaali/-/jalaali-2.16.1.tgz", + "integrity": "sha512-GLw87G/WJ1DNrQHW8p/LqkqAqTUSqBSRin0H1pRPwCccB5Fh7GT64sadjzEvjW56lPJ0aq2vp5yI2eIjZajfrw==", + "dependencies": { + "@date-io/moment": "^2.16.1" + }, + "peerDependencies": { + "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0" + }, + "peerDependenciesMeta": { + "moment-jalaali": { + "optional": true + } + } + }, + "node_modules/@date-io/luxon": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/luxon/-/luxon-2.16.1.tgz", + "integrity": "sha512-aeYp5K9PSHV28946pC+9UKUi/xMMYoaGelrpDibZSgHu2VWHXrr7zWLEr+pMPThSs5vt8Ei365PO+84pCm37WQ==", + "dependencies": { + "@date-io/core": "^2.16.0" + }, + "peerDependencies": { + "luxon": "^1.21.3 || ^2.x || ^3.x" + }, + "peerDependenciesMeta": { + "luxon": { + "optional": true + } + } + }, + "node_modules/@date-io/moment": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-2.16.1.tgz", + "integrity": "sha512-JkxldQxUqZBfZtsaCcCMkm/dmytdyq5pS1RxshCQ4fHhsvP5A7gSqPD22QbVXMcJydi3d3v1Y8BQdUKEuGACZQ==", + "dependencies": { + "@date-io/core": "^2.16.0" + }, + "peerDependencies": { + "moment": "^2.24.0" + }, + "peerDependenciesMeta": { + "moment": { + "optional": true + } + } + }, "node_modules/@emotion/babel-plugin": { "version": "11.10.5", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", @@ -3430,11 +3549,11 @@ } }, "node_modules/@mui/utils": { - "version": "5.11.7", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.11.7.tgz", - "integrity": "sha512-8uyNDeVHZA804Ego20Erv8TpxlbqTe/EbhTI2H1UYr4/RiIbBprat8W4Qqr2UQIsC/b3DLz+0RQ6R/E5BxEcLA==", + "version": "5.11.13", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.11.13.tgz", + "integrity": "sha512-5ltA58MM9euOuUcnvwFJqpLdEugc9XFsRR8Gt4zZNb31XzMfSKJPR4eumulyhsOTK1rWf7K4D63NKFPfX0AxqA==", "dependencies": { - "@babel/runtime": "^7.20.7", + "@babel/runtime": "^7.21.0", "@types/prop-types": "^15.7.5", "@types/react-is": "^16.7.1 || ^17.0.0", "prop-types": "^15.8.1", @@ -3476,6 +3595,78 @@ "react-dom": "^17.0.2 || ^18.0.0" } }, + "node_modules/@mui/x-date-pickers": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.0.3.tgz", + "integrity": "sha512-TgKfWf47WiNzSAY3C8R+FQ2grtVveoS3WCtLf6E1I/O2adxruxXA+AFiIRVnfv8QX9QFLNayTKoaVUISg/PcXQ==", + "dependencies": { + "@babel/runtime": "^7.21.0", + "@date-io/core": "^2.16.0", + "@date-io/date-fns": "^2.16.0", + "@date-io/date-fns-jalali": "^2.16.0", + "@date-io/dayjs": "^2.16.0", + "@date-io/hijri": "^2.16.1", + "@date-io/jalaali": "^2.16.1", + "@date-io/luxon": "^2.16.1", + "@date-io/moment": "^2.16.1", + "@mui/utils": "^5.11.13", + "@types/react-transition-group": "^4.4.5", + "clsx": "^1.2.1", + "prop-types": "^15.8.1", + "react-transition-group": "^4.4.5" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui" + }, + "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", + "@mui/material": "^5.4.1", + "@mui/system": "^5.4.1", + "date-fns": "^2.25.0", + "date-fns-jalali": "^2.13.0-0", + "dayjs": "^1.10.7", + "luxon": "^3.0.2", + "moment": "^2.29.4", + "moment-hijri": "^2.1.2", + "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0", + "react": "^17.0.2 || ^18.0.0", + "react-dom": "^17.0.2 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "date-fns": { + "optional": true + }, + "date-fns-jalali": { + "optional": true + }, + "dayjs": { + "optional": true + }, + "luxon": { + "optional": true + }, + "moment": { + "optional": true + }, + "moment-hijri": { + "optional": true + }, + "moment-jalaali": { + "optional": true + } + } + }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -29061,9 +29252,9 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "@babel/runtime": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz", - "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", + "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", "requires": { "regenerator-runtime": "^0.13.11" } @@ -29129,6 +29320,67 @@ "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz", "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, + "@date-io/core": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", + "integrity": "sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==" + }, + "@date-io/date-fns": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", + "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", + "requires": { + "@date-io/core": "^2.16.0" + } + }, + "@date-io/date-fns-jalali": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns-jalali/-/date-fns-jalali-2.16.0.tgz", + "integrity": "sha512-MNVvGYwRiBydbvY7gvZM14W2kosIG29G1Ekw5qmYWOXkIIFngh6ZvV7/uVGDCW+gqlIeSz/XitZXA9n8RO0tJw==", + "requires": { + "@date-io/core": "^2.16.0" + } + }, + "@date-io/dayjs": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@date-io/dayjs/-/dayjs-2.16.0.tgz", + "integrity": "sha512-y5qKyX2j/HG3zMvIxTobYZRGnd1FUW2olZLS0vTj7bEkBQkjd2RO7/FEwDY03Z1geVGlXKnzIATEVBVaGzV4Iw==", + "requires": { + "@date-io/core": "^2.16.0" + } + }, + "@date-io/hijri": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/hijri/-/hijri-2.16.1.tgz", + "integrity": "sha512-6BxY0mtnqj5cBiXluRs3uWN0mSJwGw0AB2ZxqtEHvBFoiSYEojW51AETnfPIWpdvDsBn+WAC7QrfBvQZnoyIkQ==", + "requires": { + "@date-io/moment": "^2.16.1" + } + }, + "@date-io/jalaali": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/jalaali/-/jalaali-2.16.1.tgz", + "integrity": "sha512-GLw87G/WJ1DNrQHW8p/LqkqAqTUSqBSRin0H1pRPwCccB5Fh7GT64sadjzEvjW56lPJ0aq2vp5yI2eIjZajfrw==", + "requires": { + "@date-io/moment": "^2.16.1" + } + }, + "@date-io/luxon": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/luxon/-/luxon-2.16.1.tgz", + "integrity": "sha512-aeYp5K9PSHV28946pC+9UKUi/xMMYoaGelrpDibZSgHu2VWHXrr7zWLEr+pMPThSs5vt8Ei365PO+84pCm37WQ==", + "requires": { + "@date-io/core": "^2.16.0" + } + }, + "@date-io/moment": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-2.16.1.tgz", + "integrity": "sha512-JkxldQxUqZBfZtsaCcCMkm/dmytdyq5pS1RxshCQ4fHhsvP5A7gSqPD22QbVXMcJydi3d3v1Y8BQdUKEuGACZQ==", + "requires": { + "@date-io/core": "^2.16.0" + } + }, "@emotion/babel-plugin": { "version": "11.10.5", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", @@ -30222,11 +30474,11 @@ "requires": {} }, "@mui/utils": { - "version": "5.11.7", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.11.7.tgz", - "integrity": "sha512-8uyNDeVHZA804Ego20Erv8TpxlbqTe/EbhTI2H1UYr4/RiIbBprat8W4Qqr2UQIsC/b3DLz+0RQ6R/E5BxEcLA==", + "version": "5.11.13", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.11.13.tgz", + "integrity": "sha512-5ltA58MM9euOuUcnvwFJqpLdEugc9XFsRR8Gt4zZNb31XzMfSKJPR4eumulyhsOTK1rWf7K4D63NKFPfX0AxqA==", "requires": { - "@babel/runtime": "^7.20.7", + "@babel/runtime": "^7.21.0", "@types/prop-types": "^15.7.5", "@types/react-is": "^16.7.1 || ^17.0.0", "prop-types": "^15.8.1", @@ -30245,6 +30497,27 @@ "reselect": "^4.1.6" } }, + "@mui/x-date-pickers": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.0.3.tgz", + "integrity": "sha512-TgKfWf47WiNzSAY3C8R+FQ2grtVveoS3WCtLf6E1I/O2adxruxXA+AFiIRVnfv8QX9QFLNayTKoaVUISg/PcXQ==", + "requires": { + "@babel/runtime": "^7.21.0", + "@date-io/core": "^2.16.0", + "@date-io/date-fns": "^2.16.0", + "@date-io/date-fns-jalali": "^2.16.0", + "@date-io/dayjs": "^2.16.0", + "@date-io/hijri": "^2.16.1", + "@date-io/jalaali": "^2.16.1", + "@date-io/luxon": "^2.16.1", + "@date-io/moment": "^2.16.1", + "@mui/utils": "^5.11.13", + "@types/react-transition-group": "^4.4.5", + "clsx": "^1.2.1", + "prop-types": "^15.8.1", + "react-transition-group": "^4.4.5" + } + }, "@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", diff --git a/package.json b/package.json index e86e205..fa552d6 100755 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "proxy": "http://localhost:8090", "dependencies": { + "@date-io/jalaali": "^2.16.1", "@emotion/cache": "^11.7.1", "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", @@ -21,6 +22,7 @@ "@mui/system": "^5.4.1", "@mui/utils": "^5.4.1", "@mui/x-data-grid": "^5.5.0", + "@mui/x-date-pickers": "^6.0.3", "@react-pdf/renderer": "^2.1.1", "@reduxjs/toolkit": "^1.7.2", "@tabler/icons": "^1.53.0", @@ -30,7 +32,7 @@ "chance": "^1.1.8", "core-js": "^3", "csstype": "^3.0.10", - "date-fns": "^2.28.0", + "date-fns": "^2.29.3", "draft-js": "^0.11.7", "emoji-picker-react": "^3.5.1", "env-cmd": "^10.1.0", diff --git a/src/views/biz/admin/judge/JudgeDateModifyForm.jsx b/src/views/biz/admin/judge/JudgeDateModifyForm.jsx index f7f885f..8c6ebfa 100644 --- a/src/views/biz/admin/judge/JudgeDateModifyForm.jsx +++ b/src/views/biz/admin/judge/JudgeDateModifyForm.jsx @@ -1,14 +1,16 @@ import { useState } from 'react'; import PropTypes from 'prop-types'; -import NumberFormat from 'react-number-format'; import { useAlert } from 'react-alert'; import { Grid, TextField } from '@mui/material'; import Button from '@mui/material/Button'; import { saveAlert } from 'commons/XitCmm'; +import { MuiXDatePicker, MuiXMobileTimePicker } from 'views/cmm/MuiXDatePicker'; +import format from 'date-fns/format'; +const toDate = new Date(); const JudgeDateModifyForm = ({ dateDatas, setDateModify, handleModalSave }) => { const alert = useAlert(); @@ -16,6 +18,7 @@ const JudgeDateModifyForm = ({ dateDatas, setDateModify, handleModalSave }) => { const [msYear, setMsYear] = useState(dateDatas?.msYear); const [msChasu, setMsChasu] = useState(dateDatas?.msChasu); const [msSdate, setMsSdate] = useState(dateDatas?.msSdate); + const [msStartsi, setMsStartsi] = useState(dateDatas?.msStartsi); const [msEdate, setMsEdate] = useState(dateDatas?.msEdate); const [msCdate, setMsCdate] = useState(dateDatas?.msCdate); const [msClosesi, setMsClosesi] = useState(dateDatas?.msClosesi); @@ -27,6 +30,7 @@ const JudgeDateModifyForm = ({ dateDatas, setDateModify, handleModalSave }) => { msYear, msChasu, msSdate, + msStartsi, msEdate, msCdate, msClosesi @@ -45,6 +49,10 @@ const JudgeDateModifyForm = ({ dateDatas, setDateModify, handleModalSave }) => { alert.show('심사 마감일자는 필수입니다.'); return; } + if (msStartsi.length < 2) { + alert.show('심사 시작시간은 필수입니다.'); + return; + } if (msClosesi.length < 2) { alert.show('심사 마감시간은 필수입니다.'); return; @@ -82,54 +90,24 @@ const JudgeDateModifyForm = ({ dateDatas, setDateModify, handleModalSave }) => { - setMsSdate(e?.target?.value)} - /> + + + + + + - setMsEdate(e?.target?.value)} - /> + + - setMsCdate(e?.target?.value)} - /> + - setMsClosesi(e?.target?.value)} - /> + diff --git a/src/views/biz/admin/judge/JudgeRegistReview.jsx b/src/views/biz/admin/judge/JudgeRegistReview.jsx index bef0534..2375a03 100644 --- a/src/views/biz/admin/judge/JudgeRegistReview.jsx +++ b/src/views/biz/admin/judge/JudgeRegistReview.jsx @@ -22,9 +22,23 @@ import { findJudgeTargets, saveJudgeTargets } from 'apis/judge'; import PropTypes from 'prop-types'; import getYear from 'date-fns/getYear'; import { useAlert } from 'react-alert'; +import CmmModalStyle from 'views/cmm/CmmModalStyle'; const year = getYear(new Date()).toString(); +const style = { + position: 'relative', + top: '50%', + left: '50%', + transform: 'translate(-50%, -50%)', + width: 500, + minHeight: 300, + bgcolor: 'background.paper', + border: '2px solid #000', + boxShadow: 24, + p: 3 +}; + const JudgeRegistReview = ({ scDatagb, menuName }) => { const showAlert = useAlert(); const [scTransfer, setScTransfer] = useState('1'); @@ -231,9 +245,10 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => { handleSelection={handleSelection} selectionModel={selectionModel} /> - + {/* */} + - + ); }; diff --git a/src/views/biz/admin/judge/JudgeReview.jsx b/src/views/biz/admin/judge/JudgeReview.jsx index 9868a5e..c5b8a8a 100644 --- a/src/views/biz/admin/judge/JudgeReview.jsx +++ b/src/views/biz/admin/judge/JudgeReview.jsx @@ -73,6 +73,7 @@ const JudgeReview = ({ msDatagb, menuName }) => { msYear: '', msChas: '', msSdate: '', + msStartsi: '', msEdate: '', msCdate: '', msClosesi: '' @@ -244,6 +245,7 @@ const JudgeReview = ({ msDatagb, menuName }) => { msYear: selectedYear, msChasu: e.row.msChasu, msSdate: e.row.msSdate, + msStartsi: e.row.msStartsi, msEdate: e.row.msEdate, msCdate: e.row.msCdate, msClosesi: e.row.msClosesi diff --git a/src/views/biz/admin/judge/JudgeTargetSaveForm.jsx b/src/views/biz/admin/judge/JudgeTargetSaveForm.jsx index 32484d3..e43aaf4 100644 --- a/src/views/biz/admin/judge/JudgeTargetSaveForm.jsx +++ b/src/views/biz/admin/judge/JudgeTargetSaveForm.jsx @@ -2,31 +2,27 @@ import { useState } from 'react'; import NumberFormat from 'react-number-format'; import format from 'date-fns/format'; -import getHours from 'date-fns/getHours'; -import koLocale from 'date-fns/locale/ko'; import { Grid, TextField, MenuItem, Select, FormControl, InputLabel, Divider } from '@mui/material'; -import DateAdapter from '@mui/lab/AdapterDateFns'; -import LocalizationProvider from '@mui/lab/LocalizationProvider'; -import { DatePicker, TimePicker } from '@mui/lab'; import Button from '@mui/material/Button'; import PropTypes from 'prop-types'; import { IconFileExport } from '@tabler/icons'; import combo from 'commons/combo_data'; import { useAlert } from 'react-alert'; +import { MuiXDatePicker, MuiXMobileTimePicker } from 'views/cmm/MuiXDatePicker'; const toDate = new Date(); const JudgeTargetSaveForm = ({ handleModalSave }) => { const showAlert = useAlert(); const [msuTeam, setMsuTeam] = useState(' '); + const [msChasu, setMsChasu] = useState(); const [msSdate, setMsSdate] = useState(format(toDate, 'yyyy-MM-dd')); - const [msStartsi, setMsStartsi] = useState(`${format(toDate, 'yyyy-MM-dd')} 09:00`); + const [msStartsi, setMsStartsi] = useState('00'); const [msEdate, setMsEdate] = useState(format(toDate, 'yyyy-MM-dd')); - const [msChasu, setMsChasu] = useState(); const [msCdate, setMsCdate] = useState(format(toDate, 'yyyy-MM-dd')); - const [msClosesi, setMsClosesi] = useState(`${format(toDate, 'yyyy-MM-dd')} 18:00`); + const [msClosesi, setMsClosesi] = useState('23'); const onSave = () => { if (!msuTeam || msuTeam.length < 3) { @@ -44,75 +40,36 @@ const JudgeTargetSaveForm = ({ handleModalSave }) => { return; } - if (msEdate.toString() > msCdate.toString()) { - showAlert.show('심의종료일과 심의마감일을 확인해 주세요'); + if (msEdate.replace(/-/g, '') > msCdate.replace(/-/g, '')) { + showAlert.show('심사 종료일자가 심사 마감일자보다 클 수 없습니다.'); + return; + } + + if (msStartsi.length < 2) { + showAlert.show('심사 시작시간은 필수입니다.'); + return; + } + + if (msClosesi.length < 2) { + showAlert.show('심사 마감시간은 필수입니다.'); return; } handleModalSave({ msuTeam, + msChasu, msSdate, - msStartsi: getHours(new Date(msStartsi)), + msStartsi, msEdate, - msChasu, msCdate, - msClosesi: getHours(new Date(msClosesi)) + msClosesi }); }; return ( <> - - - } - label="심의시작일" - value={msSdate} - inputFormat="yyyy-MM-dd" - mask="____-__-__" - onChange={(newValue) => { - setMsSdate(format(newValue, 'yyyy-MM-dd')); - }} - /> - - {/* */} - - - - } - label="심의시작시간" - value={msStartsi} - inputFormat="HH" - mask="__" - onChange={(newValue) => { - // setMsStartsi(format(newValue, 'HH')); - setMsStartsi(newValue); - }} - /> - - {/* */} - - - - } - label="심의종료일" - value={msEdate} - inputFormat="yyyy-MM-dd" - mask="____-__-__" - onChange={(newValue) => { - setMsEdate(format(newValue, 'yyyy-MM-dd')); - }} - /> - - - + 심의팀 - + { onValueChange={(values) => setMsChasu(values.value)} /> - - - } - label="심의마감일" - value={msCdate} - inputFormat="yyyy-MM-dd" - mask="____-__-__" - onChange={(newValue) => { - setMsCdate(format(newValue, 'yyyy-MM-dd')); - }} - /> - + + + + + + + + + + + + - - - } - renderInput={(props) => } - label="심의마감시간" - value={msClosesi} - inputFormat="HH" - mask="__" - onChange={(newValue) => { - console.log(newValue); - setMsClosesi(newValue); - }} - /> - + + diff --git a/src/views/cmm/MuiXDatePicker.jsx b/src/views/cmm/MuiXDatePicker.jsx new file mode 100644 index 0000000..89496b5 --- /dev/null +++ b/src/views/cmm/MuiXDatePicker.jsx @@ -0,0 +1,63 @@ +import format from 'date-fns/format'; +import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns'; +import { LocalizationProvider, DateTimePicker, DatePicker, MobileTimePicker } from '@mui/x-date-pickers'; +import PropTypes from 'prop-types'; + +const MuiXDateTimePicker = ({ label, date, setDate }) => ( + + { + setDate(format(newValue, 'yyyy-MM-dd HH:mm:ss')); + }} + /> + +); + +MuiXDateTimePicker.propTypes = { + label: PropTypes.string, + date: PropTypes.string, + setDate: PropTypes.func +}; + +const MuiXDatePicker = ({ label, date, setDate }) => ( + + { + setDate(format(newValue, 'yyyy-MM-dd')); + }} + /> + +); +MuiXDatePicker.propTypes = { + label: PropTypes.string, + date: PropTypes.string, + setDate: PropTypes.func +}; + +const MuiXMobileTimePicker = ({ label, date, setDate }) => ( + + { + setDate(format(newValue, 'HH')); + }} + /> + +); +MuiXMobileTimePicker.propTypes = { + label: PropTypes.string, + date: PropTypes.string, + setDate: PropTypes.func +}; + +export { MuiXDateTimePicker, MuiXDatePicker, MuiXMobileTimePicker };