diff --git a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js index 0ada6e7..7adbab9 100644 --- a/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js +++ b/egovframe-template-simple-react-contribution/src/components/editor/RichTextEditor.js @@ -4,7 +4,7 @@ import 'react-quill/dist/quill.snow.css'; // react-quill에 기반을 둔 텍스트 에디터 컴포넌트 const RichTextEditor = ({item, setText}) => { - const style = { height: "400px"}; + const style = { height: "400px", paddingBottom: "69px"}; const onChangeEvent = (e) => { setText(e); diff --git a/egovframe-template-simple-react-contribution/src/constants/url.js b/egovframe-template-simple-react-contribution/src/constants/url.js index d36fd9e..7fbb159 100644 --- a/egovframe-template-simple-react-contribution/src/constants/url.js +++ b/egovframe-template-simple-react-contribution/src/constants/url.js @@ -98,12 +98,14 @@ const URL = { ADMIN__STANDARDS__INFO_DISCLOSURE : "/admin/standards/info-disclosure", // 건설기준 관리/정보공개 관리 // 관리자 - 컨텐츠 관리 - ADMIN__CONTENTS__SURVEY : "/admin/contents/survey", // 컨텐츠 관리/설문 관리 - ADMIN__CONTENTS__POP_UP : "/admin/contents/pop-up", // 컨텐츠 관리/팝업 관리 - ADMIN__CONTENTS__POP_UP__CREATE : "/admin/contents/pop-up/create", // 관리자 - 컨텐츠 관리/팝업 관리/팝업 추가 - ADMIN__CONTENTS__POP_UP__MODIFY : "/admin/contents/pop-up/modify", // 관리자 - 컨텐츠 관리/팝업 관리/팝업 수정 - ADMIN__CONTENTS__STANDARDS_RESEARCH : "/admin/contents/standards-research", // 컨텐츠 관리/건설기준연구 관리 - ADMIN__CONTENTS__TEXT_MESSAGES : "/admin/contents/text-messages", // 컨텐츠 관리/문자 발송 + ADMIN__CONTENTS__SURVEY : "/admin/contents/survey", // 컨텐츠 관리/설문 관리 + ADMIN__CONTENTS__POP_UP : "/admin/contents/pop-up", // 컨텐츠 관리/팝업 관리 + ADMIN__CONTENTS__POP_UP__CREATE : "/admin/contents/pop-up/create", // 관리자 - 컨텐츠 관리/팝업 관리/팝업 추가 + ADMIN__CONTENTS__POP_UP__MODIFY : "/admin/contents/pop-up/modify", // 관리자 - 컨텐츠 관리/팝업 관리/팝업 수정 + ADMIN__CONTENTS__STANDARDS_RESEARCH : "/admin/contents/standards-research", // 컨텐츠 관리/건설기준연구 관리 + ADMIN__CONTENTS__STANDARDS_RESEARCH__CREATE : "/admin/contents/standards-research/create", // 컨텐츠 관리/건설기준연구 관리/추가 + ADMIN__CONTENTS__STANDARDS_RESEARCH__MODIFY : "/admin/contents/standards-research/modify", // 컨텐츠 관리/건설기준연구 관리/수정 + ADMIN__CONTENTS__TEXT_MESSAGES : "/admin/contents/text-messages", // 컨텐츠 관리/문자 발송 // 관리자 - 위원회 관리 ADMIN__COMMITTEE__PROGRESS_STATUS : "/admin/committee/progress-status", // 위원회 관리/진행현황 관리 diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupEditor.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupEditor.jsx index 026a33f..05460a2 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupEditor.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp/PopupEditor.jsx @@ -21,10 +21,6 @@ const StyledDiv = styled.div` margin-bottom: 30px; } - .board_btn_area { - - margin-top: 70px; - } `; diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index fb24312..82d9d9b 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -55,9 +55,9 @@ function StandardResearch(props) { } - const onChangeActivationSwitch = (e, popupId) => { + const onChangeActivationSwitch = (e, rsId) => { const checked = e.target.checked; - const requestURL = `/contents/api/popup-manage/activation-switch/${popupId}?checked=${checked}`; + const requestURL = `/contents/api/popup-manage/activation-switch/${rsId}?checked=${checked}`; const requestOptions = { method: "PUT", @@ -114,7 +114,7 @@ function StandardResearch(props) { {/* */}
- 글 작성 + 글 작성
{/* */} @@ -135,7 +135,7 @@ function StandardResearch(props) { {list.map((it)=>(
{it.id}
-
{it.title}
+
{it.title}
{it.researchStartDate} ~ {it.researchEndDate}
{it.director}
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch/StandardResearchEditor.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch/StandardResearchEditor.jsx index 5e1c30b..7dacc1c 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch/StandardResearchEditor.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch/StandardResearchEditor.jsx @@ -21,9 +21,20 @@ const StyledDiv = styled.div` margin-bottom: 30px; } - .board_btn_area { - - margin-top: 70px; + .label-text-editor { + font-size: 19px; + font-weight: 600; + color: #212529; + margin-bottom: 10px; + .req { + display: inline-block; + width: 7px; + height: 7px; + margin-left: 2px; + font-size: 0; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdCNDNBMURDRjVFRDExRUJBMkM3OUEyMERCMzg3NTBGIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdCNDNBMURERjVFRDExRUJBMkM3OUEyMERCMzg3NTBGIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6N0I0M0ExREFGNUVEMTFFQkEyQzc5QTIwREIzODc1MEYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6N0I0M0ExREJGNUVEMTFFQkEyQzc5QTIwREIzODc1MEYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5vOlo3AAAAbElEQVR42mL4//8/Awy/zij/D8ShMD7Tm8wKQQYsACTOCFS5Csh2AeKzUPoeVP49E5BIB+JOIFaCCoJMWg3Erkwi0zveAxmzoIL3oPRZkDgTVHUHVMIEqrAcJMgClQQZywA1JR3omFAQHyDAAEctLdb1Cc0kAAAAAElFTkSuQmCC) no-repeat; + vertical-align: 17px; + } } `; @@ -34,16 +45,16 @@ function StandardResearchEditor(props) { const location = useLocation(); const [modeInfo, setModeInfo] = useState({ mode: props.mode }); - const [text, setText] = useState(""); - const [textOriginal, setTextOriginal] = useState(""); - const [popupDetail, setPopupDetail] = useState({ startDate: new Date(), endDate: new Date() }); + const [purpose, setPurpose] = useState(""); + const [purposeOriginal, setPurposeOriginal] = useState(""); + const [content, setContent] = useState(""); + const [contentOriginal, setContentOriginal] = useState(""); + const [effectContent, setEffectContent] = useState(""); + const [effectContentOriginal, setEffectContentOriginal] = useState(""); - const [schdulBgndeHH, setSchdulBgndeHH] = useState(); - const [schdulBgndeMM, setSchdulBgndeMM] = useState(); - const [schdulEnddeHH, setSchdulEnddeHH] = useState(); - const [schdulEnddeMM, setSchdulEnddeMM] = useState(); - const [boardAttachFiles, setBoardAttachFiles] = useState(); + + const [standardResearchDetail, setStandardResearchDetail] = useState({ researchStartDate: new Date(), researchEndDate: new Date() }); const [confirm, setConfirm] = React.useState(); @@ -55,7 +66,7 @@ function StandardResearchEditor(props) { const formValidator = (formData) => { if (formData.get('title') === null || formData.get('title') === "") { - alert("제목은 필수 값입니다."); + alert("연구명은 필수 값입니다."); return false; } @@ -63,8 +74,24 @@ function StandardResearchEditor(props) { alert("종료일시는 시작일시보다 앞 설 수 없습니다."); return false; } - if (formData.get('contents') === null || formData.get('contents') === "") { - alert("내용은 필수 값입니다."); + + if (formData.get('director') === null || formData.get('director') === "") { + alert("연구책임자는 필수 값입니다."); + return false; + } + + if (formData.get('purpose') === null || formData.get('purpose') === "") { + alert("연구목적은 필수 값입니다."); + return false; + } + + if (formData.get('content') === null || formData.get('content') === "") { + alert("연구내용은 필수 값입니다."); + return false; + } + + if (formData.get('effectContent') === null || formData.get('effectContent') === "") { + alert("기대효과는 필수 값입니다."); return false; } return true; @@ -79,7 +106,7 @@ function StandardResearchEditor(props) { ...modeInfo, modeTitle: "등록", method : "POST", - editURL: '/contents/api/popup-manage' + editURL: '/contents/standard-research' }); break; case CODE.MODE_MODIFY: @@ -87,7 +114,7 @@ function StandardResearchEditor(props) { ...modeInfo, modeTitle: "수정", method : "PUT", - editURL: '/contents/api/popup-manage' + editURL: '/contents/standard-research' }); break; default: @@ -102,7 +129,7 @@ function StandardResearchEditor(props) { return; } - const retrieveDetailURL = `/contents/api/popup-manage/${location.state?.popupId}`; + const retrieveDetailURL = `/contents/standard-research/${location.state?.rsId}`; const requestOptions = { method: "GET", headers: { @@ -114,36 +141,49 @@ function StandardResearchEditor(props) { function (resp) { let rawDetail = resp.result; //기본값 설정 - setPopupDetail({ - ...popupDetail, + setStandardResearchDetail({ + ...standardResearchDetail, ...rawDetail, - startDate: convertDate(rawDetail.schdulBgnde), - endDate: convertDate(rawDetail.schdulEndde), + researchStartDate: convertDate(rawDetail.researchStartDate), + researchEndDate: convertDate(rawDetail.researchEndDate), }); - setText(rawDetail.contents); - setTextOriginal(rawDetail.contents); + setPurpose(rawDetail.purpose); + setPurposeOriginal(rawDetail.purpose); + setContent(rawDetail.content); + setContentOriginal(rawDetail.content); + setEffectContent(rawDetail.effectContent); + setEffectContentOriginal(rawDetail.effectContent); } ); } - const createPopup = () => { + const createItem = () => { const formData = new FormData(); - for (let key in popupDetail) { - if ( key === 'startDate' ) { - formData.append(key, getDateFourteenDigit( popupDetail[key] )); - } else if( key === 'endDate' ) { - formData.append(key, getDateFourteenDigit( popupDetail[key] )); + for (let key in standardResearchDetail) { + if ( key === 'researchStartDate' ) { + formData.append(key, getDateFourteenDigit( standardResearchDetail[key] )); + } else if( key === 'researchEndDate' ) { + formData.append(key, getDateFourteenDigit( standardResearchDetail[key] )); } else { - formData.append(key, popupDetail[key]); + formData.append(key, standardResearchDetail[key]); } } - //게시글 내용 - formData.delete("contents"); - formData.append("contents", text); + //연구 목적 + formData.delete("purpose"); + formData.append("purpose", purpose); + + //연구 내용 + formData.delete("content"); + formData.append("content", content); + + //기대 효과 + formData.delete("effectContent"); + formData.append("effectContent", effectContent); + if (formValidator(formData)) { const requestOptions = { @@ -159,7 +199,7 @@ function StandardResearchEditor(props) { if (modeInfo.mode === CODE.MODE_MODIFY) { alert("게시글이 수정 되었습니다."); } - navigate({ pathname: URL.ADMIN__CONTENTS__POP_UP }); + navigate({ pathname: URL.ADMIN__CONTENTS__STANDARDS_RESEARCH }); } else { navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}}); } @@ -171,15 +211,15 @@ function StandardResearchEditor(props) { if (modeInfo.mode === CODE.MODE_CREATE) { setConfirm({...confirm, open: true, body: "추가하시겠습니까?", yesCallback: requestTask, yesCallbackParams: {requestUrl:modeInfo.editURL}}); } else if (modeInfo.mode === CODE.MODE_MODIFY) { - setConfirm({...confirm, open: true, body: "수정하시겠습니까?", yesCallback: requestTask, yesCallbackParams: {requestUrl:`${modeInfo.editURL}/${location.state?.popupId}`}}); + setConfirm({...confirm, open: true, body: "수정하시겠습니까?", yesCallback: requestTask, yesCallbackParams: {requestUrl:`${modeInfo.editURL}/${location.state?.rsId}`}}); } } } - const onClickDelete = (popupId) => { - const deleteBoardURL = `/contents/api/popup-manage/${popupId}`; + const onClickDelete = (rsId) => { + const deleteBoardURL = `/contents/standard-research/${rsId}`; const requestOptions = { method: "DELETE", @@ -210,7 +250,12 @@ function StandardResearchEditor(props) { const requestTask = () => { navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true }); }; - if( text !== textOriginal ) { + + if( purpose !== purposeOriginal ) { + setConfirm({...confirm, open: true, body: "작업 내용을 취소하시겠습니까?", yesCallback: requestTask}); + } else if( content !== contentOriginal ) { + setConfirm({...confirm, open: true, body: "작업 내용을 취소하시겠습니까?", yesCallback: requestTask}); + } else if( effectContent !== effectContentOriginal ) { setConfirm({...confirm, open: true, body: "작업 내용을 취소하시겠습니까?", yesCallback: requestTask}); } else { requestTask(); @@ -245,7 +290,7 @@ function StandardResearchEditor(props) {
  • Home
  • 사이트 관리
  • 컨텐츠 관리
    • -
  • 팝업 관리
    • +
  • 건설기준연구 관리
    • ) @@ -267,91 +312,82 @@ function StandardResearchEditor(props) { {/* */}
    -

    팝업 추가

    +

    건설기준연구 추가

    {/* */}
    -
    필수
    +
    필수
    - setPopupDetail({ ...popupDetail, title: e.target.value })} + setStandardResearchDetail({ ...standardResearchDetail, title: e.target.value })} />
    -
    기간필수
    +
    연구 기간필수
    { console.log("setStartDate : ", date); - setPopupDetail({ ...popupDetail, schdulBgnde: getDateFourteenDigit(date), schdulBgndeYYYMMDD: getYYYYMMDD(date), schdulBgndeHH: date.getHours(), schdulBgndeMM: date.getMinutes(), startDate: date }); - setSchdulBgndeHH(date.getHours()); - setSchdulBgndeMM(date.getMinutes()); + setStandardResearchDetail({ ...standardResearchDetail, schdulBgnde: getDateFourteenDigit(date), schdulBgndeYYYMMDD: getYYYYMMDD(date), researchStartDate: date }); }} /> - - ~ { console.log("setEndDate: ", date); - setPopupDetail({ ...popupDetail, schdulEndde: getDateFourteenDigit(date), schdulEnddeYYYMMDD: getYYYYMMDD(date), schdulEnddeHH: date.getHours(), schdulEnddeMM: date.getMinutes(), endDate: date }); - setSchdulEnddeHH(date.getHours()); - setSchdulEnddeMM(date.getMinutes()); + setStandardResearchDetail({ ...standardResearchDetail, schdulEndde: getDateFourteenDigit(date), schdulEnddeYYYMMDD: getYYYYMMDD(date), researchEndDate: date }); } } /> - -
    - { - console.log("====>>> Changed attachfile file = ", attachfile); - const arrayConcat = { ...popupDetail}; // 기존 단일 파일 업로드에서 다중파일 객체 추가로 변환(아래 for문으로) - for ( let i = 0; i < attachfile.length; i++) { - arrayConcat[`file_${i}`] = attachfile[i]; - } - setPopupDetail(arrayConcat); - }} - fnDeleteFile={(deletedFile) => { - console.log("====>>> Delete deletedFile = ", deletedFile); - setBoardAttachFiles(deletedFile); - }} - boardFiles={boardAttachFiles} - mode={props.mode} /> +
    +
    필수
    +
    + setStandardResearchDetail({ ...standardResearchDetail, director: e.target.value })} + /> +
    +
    {/* */} {/* */} - + + + + + + + + {/* */} {/* */}
    {modeInfo.mode === CODE.MODE_MODIFY && }
    diff --git a/egovframe-template-simple-react-contribution/src/routes/index.jsx b/egovframe-template-simple-react-contribution/src/routes/index.jsx index a821863..a087981 100644 --- a/egovframe-template-simple-react-contribution/src/routes/index.jsx +++ b/egovframe-template-simple-react-contribution/src/routes/index.jsx @@ -89,11 +89,12 @@ import AdminStandardsSimilarityCheck from 'pages/admin/standards/SimilarityCheck import AdminStandardsInfoDisclosure from 'pages/admin/standards/InfoDisclosure'; // 관리자 - 건설기준 관리/정보공개 관리 // 관리자 - 컨텐츠 관리 -import AdminContentsSurvey from 'pages/admin/contents/Survey'; // 관리자 - 컨텐츠 관리/설문 관리 -import AdminContentsPopUp from 'pages/admin/contents/PopUp'; // 관리자 - 컨텐츠 관리/팝업 관리 -import AdminContentsPopUpWriter from 'pages/admin/contents/PopUp/PopupEditor'; // 관리자 - 컨텐츠 관리/팝업 관리/팝업 추가 또는 수정 -import AdminContentsStandardResearch from 'pages/admin/contents/StandardResearch'; // 관리자 - 컨텐츠 관리/건설기준연구 관리 -import AdminContentsTextMessages from 'pages/admin/contents/TextMessages'; // 관리자 - 컨텐츠 관리/문자 발송 +import AdminContentsSurvey from 'pages/admin/contents/Survey'; // 관리자 - 컨텐츠 관리/설문 관리 +import AdminContentsPopUp from 'pages/admin/contents/PopUp'; // 관리자 - 컨텐츠 관리/팝업 관리 +import AdminContentsPopUpEditor from 'pages/admin/contents/PopUp/PopupEditor'; // 관리자 - 컨텐츠 관리/팝업 관리/팝업 추가 또는 수정 +import AdminContentsStandardResearch from 'pages/admin/contents/StandardResearch'; // 관리자 - 컨텐츠 관리/건설기준연구 관리 +import AdminContentsStandardResearchEditor from 'pages/admin/contents/StandardResearch/StandardResearchEditor'; // 컨텐츠 관리/건설기준연구 관리/추가 또는 수정 +import AdminContentsTextMessages from 'pages/admin/contents/TextMessages'; // 관리자 - 컨텐츠 관리/문자 발송 // 관리자 - 위원회 관리 import AdminCommitteeProgressStatus from 'pages/admin/committee/ProgressStatus'; // 관리자 - 위원회 관리/진행현황 관리 @@ -298,9 +299,11 @@ const SecondRoutes = () => { {/* 관리자 - 컨텐츠 관리 */} } /> } /> - } /> - } /> + } /> + } /> } /> + } /> + } /> } /> {/* 관리자 - 위원회 관리 */}