From 42df5ab159e6176d96da1abf5f5936fdca4e78f3 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 19 Jan 2024 16:46:50 +0900 Subject: [PATCH] =?UTF-8?q?build:=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/committee/Schedules.jsx | 3 +- .../admin/committee/Schedules/Detail.jsx | 84 ++++++------------- .../yarn.lock | 5 ++ 3 files changed, 34 insertions(+), 58 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx index 8c30565..edc6db1 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx @@ -18,7 +18,8 @@ function Schedules(props) { console.log("EgovAdminScheduleList [location] : ", location); const DATE = new Date(); - const TODAY = new Date(DATE.getFullYear(), DATE.getMonth(), DATE.getDate()); + //const TODAY = new Date(DATE.getFullYear(), DATE.getMonth(), DATE.getDate()); + const TODAY = new Date(DATE.getFullYear(), 1, DATE.getDate()); const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { schdulSe: '', year: TODAY.getFullYear(), month: TODAY.getMonth(), date: TODAY.getDate() }); const [calendarTag, setCalendarTag] = useState([]); diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx index b226544..bc9484d 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules/Detail.jsx @@ -33,42 +33,23 @@ function SchedulesDetail(props) { EgovNet.requestFetch(retrieveDetailURL, requestOptions, function (resp) { - let rawScheduleDetail = resp.result.scheduleDetail; - rawScheduleDetail.startDateTime = convertDate(rawScheduleDetail.schdulBgnde); - rawScheduleDetail.endDateTime = convertDate(rawScheduleDetail.schdulEndde); - rawScheduleDetail.reptitSeCodeNm = getCodeName(resp.result.reptitSeCode, resp.result.scheduleDetail.reptitSeCode); - rawScheduleDetail.schdulIpcrCodeNm = getCodeName(resp.result.schdulIpcrCode, resp.result.scheduleDetail.schdulIpcrCode); - rawScheduleDetail.schdulSeNm = getCodeName(resp.result.schdulSe, resp.result.scheduleDetail.schdulSe); - setScheduleDetail(rawScheduleDetail); - setUser(resp.result.user); - setBoardAttachFiles(resp.result.resultFiles); + /** + * dto.put("evtSeq", tnCmtEvent.getEvtSeq()); // sequence + dto.put("divMeet", tnCmtEvent.getEvtType()); // 구분 + dto.put("upCommittee", tnCmtEvent.getUpCmtSeq()); // 심의위원회 상위 코드 번호 + dto.put("committee", tnCmtEvent.getCmtSeq()); // 심의위원회 하위 코드 번호 + dto.put("title", tnCmtEvent.getEvtTitle()); // 제목 + dto.put("location", tnCmtEvent.getEvtLocation()); // 장소 + dto.put("contents", tnCmtEvent.getEvtContents()); // 내용 + dto.put("startDate", tnCmtEvent.getEvtStartDt()); // 날짜/시간의 시작 일시 + dto.put("endDate", tnCmtEvent.getEvtEndDt()); // 날짜/시간의 종료 일시 + */ + setScheduleDetail(resp.result); } ); } - const convertDate = (str) => { - let year = str.substring(0, 4); - let month = str.substring(4, 6); - let date = str.substring(6, 8); - let hour = str.substring(8, 10); - let minute = str.substring(10, 12); - return { - year: year, - month: month, - date: date, - hour: hour, - minute: minute, - dateForm: year + "년 " + month + "월 " + date + "일 " + hour + "시 " + minute + "분 " - } - } - const getCodeName = (codeArr, code) => { - return ( - codeArr.map((codeObj) => { - if (codeObj.code === code.trim()) return codeObj.codeNm - else return ""; - }) - ); - }; + const onClickDeleteSchedule = (schdulId) => { const deleteBoardURL = `/schedule/${schdulId}`; @@ -132,40 +113,30 @@ function SchedulesDetail(props) { {/* */}
-
일정구분
-
{scheduleDetail.schdulSeNm}
+
구분
+
{scheduleDetail.divMeetNm}
-
중요도
-
{scheduleDetail.schdulIpcrCodeNm}
+
심의위원회
+
{scheduleDetail.upCommitteeNm} - {scheduleDetail.committeeNm}
-
부서
-
{scheduleDetail.schdulDeptName}
+
제목
+
{scheduleDetail.title}
-
일정명
-
{scheduleDetail.schdulNm}
-
-
-
일정내용
-
{scheduleDetail.schdulCn}
-
-
-
반복구분
-
{scheduleDetail.reptitSeCodeNm}
-
+
장소
+
{scheduleDetail.location}
+
날짜/시간
-
{scheduleDetail.startDateTime?.dateForm} ~ {scheduleDetail.endDateTime?.dateForm}
+
{scheduleDetail.startDate} ~ {scheduleDetail.endDate}
-
담당자
-
{scheduleDetail.schdulChargerName}
+
내용
+
{scheduleDetail.contents}
- - {/* */}
{user.id && @@ -178,12 +149,11 @@ function SchedulesDetail(props) { - + }}>삭제
}
- 목록 + 목록
{/* */} diff --git a/egovframe-template-simple-react-contribution/yarn.lock b/egovframe-template-simple-react-contribution/yarn.lock index 7dc6b39..4debf9d 100644 --- a/egovframe-template-simple-react-contribution/yarn.lock +++ b/egovframe-template-simple-react-contribution/yarn.lock @@ -8203,6 +8203,11 @@ react-bootstrap@^2.9.0: uncontrollable "^7.2.1" warning "^4.0.3" +react-csv@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/react-csv/-/react-csv-2.2.2.tgz#5bbf0d72a846412221a14880f294da9d6def9bfb" + integrity sha512-RG5hOcZKZFigIGE8LxIEV/OgS1vigFQT4EkaHeKgyuCbUAu9Nbd/1RYq++bJcJJ9VOqO/n9TZRADsXNDR4VEpw== + react-datepicker@^4.8.0: version "4.10.0" resolved "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.10.0.tgz"