From 60359f2c390b2579f64f745947ef11a1f83180de Mon Sep 17 00:00:00 2001 From: subsub Date: Wed, 22 Nov 2023 17:45:46 +0900 Subject: [PATCH 1/6] =?UTF-8?q?2023/11/2=20select2=20css=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 2 +- .../visitEdu/adm/publish/css/content.css | 2 +- .../visitEdu/adm/publish/css/select2.min.css | 670 ++++++++++++++++++ 3 files changed, 672 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/visitEdu/adm/publish/css/select2.min.css diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 3d281687..055f3b05 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -30,7 +30,7 @@ - + diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index d0d3c1cb..a466044f 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -25,7 +25,7 @@ /* list_top */ .list_top{margin-bottom: 30px; background-color: #f1f2f4; padding:0 25px; border: 1px solid #dbdcdd; border-radius: 5px; box-sizing: border-box;} -.list_top>div {display: flex; align-items: center; height: 64px; border-bottom: 1px solid #e3e4e5; box-sizing: border-box;} +.list_top>div {display: flex; align-items: center; min-height: 64px; border-bottom: 1px solid #e3e4e5; box-sizing: border-box;padding:10px 0;} .list_top>div:last-child {border-bottom: 0;} .list_top .util_left {width: 150px;} .list_top .util_left p{padding-left: 10px; font-size: 18px; font-weight: 500; color: #222; position: relative;} diff --git a/src/main/webapp/visitEdu/adm/publish/css/select2.min.css b/src/main/webapp/visitEdu/adm/publish/css/select2.min.css new file mode 100644 index 00000000..f2b15f40 --- /dev/null +++ b/src/main/webapp/visitEdu/adm/publish/css/select2.min.css @@ -0,0 +1,670 @@ +.select2-container { + box-sizing: border-box; + display: inline-block; + margin: 0; + position: relative; + vertical-align: middle +} + +.select2-container button{height:auto;} + +.select2-container .select2-selection--single { + box-sizing: border-box; + cursor: pointer; + display: block; + height: 28px; + user-select: none; + -webkit-user-select: none +} + +.select2-container .select2-selection--single .select2-selection__rendered { + display: block; + padding-left: 8px; + padding-right: 20px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap +} + +.select2-container .select2-selection--single .select2-selection__clear { + background-color: transparent; + border: none; + font-size: 1em +} + +.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered { + padding-right: 8px; + padding-left: 20px +} + +.select2-container .select2-selection--multiple { + box-sizing: border-box; + cursor: pointer; + display: block; + min-height: 32px; + user-select: none; + -webkit-user-select: none +} + +.select2-container .select2-selection--multiple .select2-selection__rendered { + display: inline; + list-style: none; + padding: 0 +} + +.select2-container .select2-selection--multiple .select2-selection__clear { + background-color: transparent; + border: none; + font-size: 1em +} + +.select2-container .select2-search--inline .select2-search__field { + box-sizing: border-box; + border: none; + font-size: 100%; + padding: 0 5px; + height:100%; +} + +.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button { + -webkit-appearance: none +} + +.select2-dropdown { + background-color: white; + border: 1px solid #aaa; + border-radius: 4px; + box-sizing: border-box; + display: block; + position: absolute; + left: -100000px; + width: 100%; + z-index: 1051 +} + +.select2-results { + display: block +} + +.select2-results__options { + list-style: none; + margin: 0; + padding: 0 +} + +.select2-results__option { + padding: 6px; + user-select: none; + -webkit-user-select: none +} + +.select2-results__option--selectable { + cursor: pointer +} + +.select2-container--open .select2-dropdown { + left: 0 +} + +.select2-container--open .select2-dropdown--above { + border-bottom: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0 +} + +.select2-container--open .select2-dropdown--below { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0 +} + +.select2-search--dropdown { + display: block; + padding: 4px +} + +.select2-search--dropdown .select2-search__field { + padding: 4px; + width: 100%; + box-sizing: border-box +} + +.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button { + -webkit-appearance: none +} + +.select2-search--dropdown.select2-search--hide { + display: none +} + +.select2-close-mask { + border: 0; + margin: 0; + padding: 0; + display: block; + position: fixed; + left: 0; + top: 0; + min-height: 100%; + min-width: 100%; + height: auto; + width: auto; + opacity: 0; + z-index: 99; + background-color: #fff; + filter: alpha(opacity=0) +} + +.select2-hidden-accessible { + border: 0 !important; + clip: rect(0 0 0 0) !important; + -webkit-clip-path: inset(50%) !important; + clip-path: inset(50%) !important; + height: 1px !important; + overflow: hidden !important; + padding: 0 !important; + position: absolute !important; + width: 1px !important; + white-space: nowrap !important +} + +.select2-container--default .select2-selection--single { + background-color: #fff; + border: 1px solid #aaa; + border-radius: 4px +} + +.select2-container--default .select2-selection--single .select2-selection__rendered { + color: #444; + line-height: 28px +} + +.select2-container--default .select2-selection--single .select2-selection__clear { + cursor: pointer; + float: right; + font-weight: bold; + height: 26px; + margin-right: 20px; + padding-right: 0px +} + +.select2-container--default .select2-selection--single .select2-selection__placeholder { + color: #999 +} + +.select2-container--default .select2-selection--single .select2-selection__arrow { + height: 26px; + position: absolute; + top: 1px; + right: 1px; + width: 20px +} + +.select2-container--default .select2-selection--single .select2-selection__arrow b { + border-color: #888 transparent transparent transparent; + border-style: solid; + border-width: 5px 4px 0 4px; + height: 0; + left: 50%; + margin-left: -4px; + margin-top: -2px; + position: absolute; + top: 50%; + width: 0 +} + +.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear { + float: left +} + +.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow { + left: 1px; + right: auto +} + +.select2-container--default.select2-container--disabled .select2-selection--single { + background-color: #eee; + cursor: default +} + +.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear { + display: none +} + +.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b { + border-color: transparent transparent #888 transparent; + border-width: 0 4px 5px 4px +} + +.select2-container--default .select2-selection--multiple { + background-color: white; + border: 1px solid #d5d5d5; + border-radius: 5px; + cursor: text; + min-height:40px; + padding:0 5px; +} + +.select2-container--default .select2-selection--multiple .select2-selection__clear { + cursor: pointer; + float: right; + font-weight: bold; + height: 20px; + margin-right: 10px; + margin-top: 5px; + padding: 1px +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice { + background-color: #e4e4e4; + border: 1px solid #aaa; + border-radius: 4px; + display: inline-block; + margin-left: 5px; + margin-top: 5px; + padding: 0 +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__display { + cursor: default; + padding-left: 2px; + padding-right: 5px; + font-size:15px; +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove { + background-color: transparent; + border: none; + border-right: 1px solid #aaa; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + color: #999; + cursor: pointer; + font-size: 16px; + font-weight: bold; + padding: 0 4px; + margin:0; +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover, +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus { + background-color: #f1f1f1; + color: #333; + outline: none +} + +.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice { + margin-left: 5px; + margin-right: auto +} + +.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display { + padding-left: 5px; + padding-right: 2px +} + +.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { + border-left: 1px solid #aaa; + border-right: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px +} + +.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__clear { + float: left; + margin-left: 10px; + margin-right: auto +} + +.select2-container--default.select2-container--focus .select2-selection--multiple { + border: 1px solid #d5d5d5; + outline: 0; +} + +.select2-container--default.select2-container--disabled .select2-selection--multiple { + background-color: #eee; + cursor: default +} + +.select2-container--default.select2-container--disabled .select2-selection__choice__remove { + display: none +} + +.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, +.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple { + border-top-left-radius: 0; + border-top-right-radius: 0 +} + +.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, +.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0 +} + +.select2-container--default .select2-search--dropdown .select2-search__field { + border: 1px solid #aaa +} + +.select2-container--default .select2-search--inline .select2-search__field { + background: transparent; + border: none; + outline: 0; + box-shadow: none; + -webkit-appearance: textfield; + height:40px; +} + +.select2-container--default .select2-search--inline .select2-search__field::placeholder{font-size:16px;} + +.select2-container--default .select2-results>.select2-results__options { + max-height: 200px; + overflow-y: auto +} + +.select2-container--default .select2-results__option .select2-results__option { + padding-left: 1em +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__group { + padding-left: 0 +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__option { + margin-left: -1em; + padding-left: 2em +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option { + margin-left: -2em; + padding-left: 3em +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { + margin-left: -3em; + padding-left: 4em +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { + margin-left: -4em; + padding-left: 5em +} + +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { + margin-left: -5em; + padding-left: 6em +} + +.select2-container--default .select2-results__option--group { + padding: 0 +} + +.select2-container--default .select2-results__option--disabled { + color: #999 +} + +.select2-container--default .select2-results__option--selected { + background-color: #f2f4f9; +} + +.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable { + background-color: #5897fb; + color: white +} + +.select2-container--default .select2-results__group { + cursor: default; + display: block; + padding: 6px +} + +.select2-container--classic .select2-selection--single { + background-color: #f7f7f7; + border: 1px solid #aaa; + border-radius: 4px; + outline: 0; + background-image: -webkit-linear-gradient(top, #fff 50%, #eee 100%); + background-image: -o-linear-gradient(top, #fff 50%, #eee 100%); + background-image: linear-gradient(to bottom, #fff 50%, #eee 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0) +} + +.select2-container--classic .select2-selection--single:focus { + border: 1px solid #5897fb +} + +.select2-container--classic .select2-selection--single .select2-selection__rendered { + color: #444; + line-height: 28px +} + +.select2-container--classic .select2-selection--single .select2-selection__clear { + cursor: pointer; + float: right; + font-weight: bold; + height: 26px; + margin-right: 20px +} + +.select2-container--classic .select2-selection--single .select2-selection__placeholder { + color: #999 +} + +.select2-container--classic .select2-selection--single .select2-selection__arrow { + background-color: #ddd; + border: none; + border-left: 1px solid #aaa; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + height: 26px; + position: absolute; + top: 1px; + right: 1px; + width: 20px; + background-image: -webkit-linear-gradient(top, #eee 50%, #ccc 100%); + background-image: -o-linear-gradient(top, #eee 50%, #ccc 100%); + background-image: linear-gradient(to bottom, #eee 50%, #ccc 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0) +} + +.select2-container--classic .select2-selection--single .select2-selection__arrow b { + border-color: #888 transparent transparent transparent; + border-style: solid; + border-width: 5px 4px 0 4px; + height: 0; + left: 50%; + margin-left: -4px; + margin-top: -2px; + position: absolute; + top: 50%; + width: 0 +} + +.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear { + float: left +} + +.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow { + border: none; + border-right: 1px solid #aaa; + border-radius: 0; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + left: 1px; + right: auto +} + +.select2-container--classic.select2-container--open .select2-selection--single { + border: 1px solid #5897fb +} + +.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow { + background: transparent; + border: none +} + +.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b { + border-color: transparent transparent #888 transparent; + border-width: 0 4px 5px 4px +} + +.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0; + background-image: -webkit-linear-gradient(top, #fff 0%, #eee 50%); + background-image: -o-linear-gradient(top, #fff 0%, #eee 50%); + background-image: linear-gradient(to bottom, #fff 0%, #eee 50%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0) +} + +.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single { + border-bottom: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + background-image: -webkit-linear-gradient(top, #eee 50%, #fff 100%); + background-image: -o-linear-gradient(top, #eee 50%, #fff 100%); + background-image: linear-gradient(to bottom, #eee 50%, #fff 100%); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0) +} + +.select2-container--classic .select2-selection--multiple { + background-color: white; + border: 1px solid #aaa; + border-radius: 4px; + cursor: text; + outline: 0; + padding-bottom: 5px; + padding-right: 5px +} + +.select2-container--classic .select2-selection--multiple:focus { + border: 1px solid #5897fb +} + +.select2-container--classic .select2-selection--multiple .select2-selection__clear { + display: none +} + +.select2-container--classic .select2-selection--multiple .select2-selection__choice { + background-color: #e4e4e4; + border: 1px solid #aaa; + border-radius: 4px; + display: inline-block; + margin-left: 5px; + margin-top: 5px; + padding: 0 +} + +.select2-container--classic .select2-selection--multiple .select2-selection__choice__display { + cursor: default; + padding-left: 2px; + padding-right: 5px +} + +.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove { + background-color: transparent; + border: none; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + color: #888; + cursor: pointer; + font-size: 1em; + font-weight: bold; + padding: 0 4px +} + +.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover { + color: #555; + outline: none +} + +.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice { + margin-left: 5px; + margin-right: auto +} + +.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display { + padding-left: 5px; + padding-right: 2px +} + +.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px +} + +.select2-container--classic.select2-container--open .select2-selection--multiple { + border: 1px solid #5897fb +} + +.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0 +} + +.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple { + border-bottom: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0 +} + +.select2-container--classic .select2-search--dropdown .select2-search__field { + border: 1px solid #aaa; + outline: 0 +} + +.select2-container--classic .select2-search--inline .select2-search__field { + outline: 0; + box-shadow: none +} + +.select2-container--classic .select2-dropdown { + background-color: #fff; + border: 1px solid transparent +} + +.select2-container--classic .select2-dropdown--above { + border-bottom: none +} + +.select2-container--classic .select2-dropdown--below { + border-top: none +} + +.select2-container--classic .select2-results>.select2-results__options { + max-height: 200px; + overflow-y: auto +} + +.select2-container--classic .select2-results__option--group { + padding: 0 +} + +.select2-container--classic .select2-results__option--disabled { + color: grey +} + +.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable { + background-color: #3875d7; + color: #fff +} + +.select2-container--classic .select2-results__group { + cursor: default; + display: block; + padding: 6px +} + +.select2-container--classic.select2-container--open .select2-dropdown { + border-color: #5897fb +} \ No newline at end of file From 7e3698fbfda68a4958715e23c567e87e4af0c7c5 Mon Sep 17 00:00:00 2001 From: kmg Date: Thu, 23 Nov 2023 14:53:24 +0900 Subject: [PATCH 2/6] =?UTF-8?q?2023/11/23=20=EC=B2=B4=ED=97=98=EA=B5=90?= =?UTF-8?q?=EC=8B=A4=205=EB=8B=A8=EA=B3=84=20css=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/visitEdu/usr/publish/css/content.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index c654ae70..daa42ab5 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -359,6 +359,23 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_list02 table .btnType04 {border-radius:5px; padding:5px 10px; font-size:15px;} .tb_list02 table .btnType06 {border-radius:5px; padding:5px 10px; font-size:15px;} +/*체험교실대시보드 - 5단계(감리용)*/ +.ex_process {display:flex; justify-content:space-between; background:#f5f5f5; border:1px solid #cbcbcb; width:100%; border-radius:10px; margin: 0 0 40px 0; } +.ex_process li {position:relative; background-position:25 center; background-repeat: no-repeat; width:20%; color:#666; font-size:22px; font-weight:500; letter-spacing:-0.5; } +.ex_process li a {width:100%; padding:0; box-sizing: border-box; padding:45px 0 45px 125px ;} +.ex_process li.p_1 {background-image: url(/publish/image/content/ex_process1.png); background-position:50px center;} +.ex_process li.p_2 {background-image: url(/publish/image/content/ex_process2.png); background-position:50px center;} +.ex_process li.p_3 {background-image: url(/publish/image/content/ex_process3.png); background-position:50px center;} +.ex_process li.p_4 {background-image: url(/publish/image/content/ex_process4.png); background-position:50px center;} +.ex_process li.p_5 {background-image: url(/publish/image/content/ex_process5.png); background-position:50px center;} +.ex_process li.p_1_on {background-image: url(/publish/image/content/ex_process1_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_2_on {background-image: url(/publish/image/content/ex_process2_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_3_on {background-image: url(/publish/image/content/ex_process3_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_4_on {background-image: url(/publish/image/content/ex_process4_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_5_on {background-image: url(/publish/image/content/ex_process5_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li::after {position:absolute; content:""; width:1px; height:60px; background-color: #d5d5d5; right: 0; align-items: center; margin:-85px 0 0 0;} +.ex_process li.p_1_on::after, li.p_2_on::after, li.p_3_on::after, li.p_4_on::after, li.p_5::after, li.p_5_on::after {display:none; } + /*체험교실대시보드*/ .ex_process {display:flex; justify-content:space-between;} .ex_process li {border-radius: 10px; width:13.5%; text-align: center; color:#fff; padding:15px 0 18px 0; font-size:22px;} From 93348b92a5d127648849d835af33495a8c5c7d2b Mon Sep 17 00:00:00 2001 From: kmg Date: Thu, 23 Nov 2023 18:29:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?2023/11/23=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B2=84=ED=8A=BC,=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=ED=8C=9D=EC=97=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitEdu/usr/publish/css/content.css | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index daa42ab5..2db7b1c5 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -3,7 +3,7 @@ /* sub layout */ .container {width: 100%; min-height: 650px; position: relative; display: inline-block; box-sizing: border-box; margin-top: 130px; } -.container .inner{max-width: 1440px; width: 100%; padding: 0 20px; margin: 60px auto 76px auto; display: flex; box-sizing: border-box; justify-content: space-between;} +.container .inner{max-width: 1440px; width: 100%; padding: 0 20px; margin: 60px auto 76px auto; /*display: flex;*/ box-sizing: border-box; justify-content: space-between;} .container .inner .cont_wrap {width: 100%;} .cont_nav{width: 100%; height: 60px; background-color: #2353b5; position: fixed; top: 134px; z-index: 10;} @@ -847,6 +847,9 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .mypage_wrap .mypage li{width: calc((100% - 45px)/2); margin: 0 0 40px 0;} .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 67px); height: calc(100% - 116px); padding: 7px 7px 11px 7px; margin: 21px auto 0 auto;} .mypage_wrap .mypage_table .right{margin: 0 40px 0 0;} + + .tb_tit01{display: block;} + .tb_tit01 .btn_wrap button{margin: 10px 0 0 0;} } @media all and (max-width: 1280px){ @@ -870,10 +873,28 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /* 강사유형 선택 */ .sel_tpye {margin: 100px 120px 24px 120px;} + + /*체험교실대시보드 5단계 (감리용)*/ + .ex_process {background:#f5f5f5; border:1px solid #cbcbcb; width:100%; border-radius:10px; margin: 0; margin:0 0 30px 0; } + .ex_process li {position:relative; background-position:25 center; background-repeat: no-repeat; width:20%; color:#666; font-size:17px; letter-spacing: -1px; font-weight:500;} + .ex_process li a { padding:20px 0; text-align:center;} + .ex_process li.p_1_on {background-image: none;} + .ex_process li.p_2_on {background-image: none;} + .ex_process li.p_3_on {background-image: none;} + .ex_process li.p_4_on {background-image: none;} + .ex_process li.p_5_on {background-image: none;} + .ex_process li.p_1 {background-image: none;} + .ex_process li.p_2 {background-image: none;} + .ex_process li.p_3 {background-image: none;} + .ex_process li.p_4 {background-image: none;} + .ex_process li.p_5 {background-image: none;} + .ex_process li::after {position:absolute; content:""; width:1px; height:30px; background-color: #d5d5d5; right: 0; margin:-45px 0 0 0;} + .ex_process li.p_1_on::after, li.p_2_on::after, li.p_3_on::after, li.p_4_on::after, li.p_5_on::after {display:none; } + - /*체험교실대시보드*/ + /*체험교실대시보드 7단계 .ex_process li {font-size:18px; padding:8px 3px 10px 3px; border-radius:5px; width:12%; line-height:20px; display: flex; align-items: center; justify-content: center;} - + */ } @media all and (max-width: 860px){ @@ -898,7 +919,8 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_tit01 .tb_tit01_left p {font-size: 20px;} .btn_wrap {position: relative;} - .btn_wrap button {display: none; height: 40px; padding: 0 20px; font-size: 16px;} + /*.btn_wrap button {display: none; height: 40px; padding: 0 20px; font-size: 16px;} 1123*/ + .btn_wrap.btn_layout01 button {height: 40px; padding: 0 20px; font-size: 16px;} .btn_wrap button.m_btn_block {display: inline-block;} .btn_wrap.btn_layout01>.btn_right button.m_btn_block:nth-child(2) {margin-top: 5px;} .survey_btn_wrap.btn_layout01>.btn_left {display: none;} @@ -1078,7 +1100,8 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /*마이페이지 추가*/ .mypage_wrap .mypage{margin: 0 0 -40px 0;} .mypage_wrap .mypage li{width: calc((100% - 26px)/2); margin: 0 0 25px 0;} - .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 7px; margin: 21px auto 0 auto;} + .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 7px; margin: 21px auto 0 auto;} + .time_layer.on{position:fixed; width:100%; top:calc(100% - 143px); left:0; border:0;} } @media all and (max-width: 560px){ @@ -1087,7 +1110,8 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .edu_wrap .tb_type01 table tbody .edu_sus_num li p{line-height: 1.2;} .edu_wrap .tb_type01 table tbody .edu_sus_num li p b::after{display: none;} .edu_wrap .tb_type01 table tbody .edu_sus_num li .num{margin: 10px 0 10px 5px;} - .edu_wrap .edu_img img{width: 100%;} + .edu_wrap .edu_img img{width: 100%;} + .btn_wrap.btn_layout01 button {padding:0 7px;}/*1123*/ } @media all and (max-width: 520px) { From 2ad07eb5b8c3a2fecf06e97460a121c6ac04a168 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 23 Nov 2023 18:37:13 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20231123=20?= =?UTF-8?q?=EA=B0=90=EB=A6=AC=EB=8C=80=EC=9D=91=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/comweb/CommonWebController.java | 23 +- .../instrInfo/web/InstrPrflController.java | 6 + .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 7 +- .../sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml | 2 +- .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp | 27 +- .../oprtn/adultVisitEdu/instrMngDetail.jsp | 59 +- .../adultVisitEdu/popup/instrAsgnmPopup.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctList.jsp | 31 + .../exprnClsrmAplctReg_back_231121.jsp | 1226 +++++++++++++++++ .../tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp | 6 +- .../instrInfo/instrPrflDetail.jsp | 41 + 11 files changed, 1420 insertions(+), 10 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg_back_231121.jsp diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 1a07565d..057a68fe 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -1,5 +1,6 @@ package kcc.ve.aplct.comweb; +import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; @@ -31,6 +32,7 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -86,6 +88,10 @@ public class CommonWebController { @Resource(name = "vEAStngService") private VEAStngService vEAStngService; + //강사상세 정보 + @Resource(name="vEInstrDetailService") + private VEInstrDetailService vEInstrDetailService; + @RequestMapping("/popup/searchBeforeContent.do") public String searchBeforeContentPopup(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model, HttpServletRequest request) throws Exception{ @@ -1027,6 +1033,7 @@ public class CommonWebController { //step3-1.해당 차시에 강사 교육확정 vEInstrAsgnmVO.setAsgnmAprvlCd(veEduAplctVO.getAsgnmAprvlCd()); + ArrayList vEInstrDetailVOList = new ArrayList(); for (int i=0;i vEInstrActvtHstryList = vEInstrDetailActvtHstryService.select(vEInstrDetailActvtHstryVO); model.addAttribute("vEInstrActvtHstryList", vEInstrActvtHstryList); + // 이력관리 리스트 + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setUserId(vEInstrDetailVO.getUserId()); + List selectList_VEAIHM = vEAStngService.selectList_VEAIHM(vEAStngVO); + + model.addAttribute("selectListVEAIHM",selectList_VEAIHM); return "/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index a9de88b8..0053fd24 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -701,11 +701,14 @@ AND AA.asgnmAprvlCd = #asgnmAprvlCd# AND AA.userId = #userId# AND AA.instrDiv = #instrDiv# + + AND scholInsttNm LIKE '%' || #searchKeyword# || '%' + - AND AA.eduHopeDt = ]]> REPLACE(#searchEduHopeStartDt#, '.' , '') + AND REPLACE(AA.eduHopeDt, '.' , '') = ]]> REPLACE(#searchEduHopeStartDt#, '.' , '') - AND AA.eduHopeDt REPLACE(#searchEduHopeEndDt#, '.' , '') + AND REPLACE(AA.eduHopeDt, '.' , '') REPLACE(#searchEduHopeEndDt#, '.' , '') diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml index b2f2b968..52fc4513 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml @@ -100,7 +100,7 @@ ,TRGT_PRSNL = #trgtPrsnl# ,OPRTN_STRT_DT = #oprtnStrtDt# ,OPRTN_END_DT = #oprtnEndDt# - ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDT_PNTTM = SYSDATE ,LAST_UPDUSR_ID = #lastUpdusrId# ,ISLANDS_YN = #islandsYn# ,REMOTE_YN = #remoteYn# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp index 89529cee..f9d0a834 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -39,6 +39,7 @@ white-space : nowrap; } + <%--
@@ -313,6 +339,12 @@ function getYears(getYear){ `
--%> +
+ + + + +
@@ -515,7 +547,30 @@ function getYears(getYear){ - + +
+

비공개 메모

+
+
+ + + + + + + + + + +
+

내용

+ 		+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp index 1ded6ffb..98388560 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp @@ -207,7 +207,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index bf40d380..e4ab0f96 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -149,6 +149,9 @@
+ onclick="fncInstrAsgnm('', '', ''); return false;">선택 + + <%-- + --%> @@ -171,6 +174,34 @@ + + <%-- + 운영신청 + + + 운영확정 + + + 서류제출 요청 + + + 서류제출 + + + 운영 진행중 + + + 결과보고 완료 + + + 검토중 + + + 운영 종료 + + + - + --%> 운영신청 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg_back_231121.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg_back_231121.jsp new file mode 100644 index 00000000..19bac67b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg_back_231121.jsp @@ -0,0 +1,1226 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+

운영신청서 작성

+
+ + +
+
+
+
+

신청자 정보

+ * 항목은 필수 입력 사항입니다. +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + +
+

필수입력 항목*

+

학교(기관)명

+ 		+ + + + + ※ 학교명이 검색되지 않을 경우, 담당자에게 연락 + +
+

학교구분

+ 		+ checked> + checked> + checked> + checked> + checked> +
+

학교지역특성

+ 		+ checked> + checked> + checked> + checked> +
+

필수입력 항목*

+

교사명

+ 		+ + + +

필수입력 항목*

+

성별

+ 		+ +
+

필수입력 항목*

+

휴대폰

+ 		+ + + + - + + + - + + +
+

필수입력 항목*

+

전화

+ 		+ + + + - + + + - + + +
+

필수입력 항목*

+

이메일

+ 		+ + + + @ + + + + + + ※ 교내에서 확인 가능한 메일 계정 입력 (예) 공직자 통합메일 + +
+

주소

+ 		+ + + <%----%>
+ + + + +
+

필수입력 항목*

+

담당교과

+ 		+ + +
+

생년월일*

+

생년월일

+ 		+ + + + + + + + + + + +
+

필수입력 항목*

+

저작권 오프라인 교원연수

+ 		+ 이수년도 +     + 이수번호 + + + ※ 교내에서 확인 가능한 메일 계정 입력 (예) 교육청 도메인 + +
+

필수입력 항목*

+

체험교실운영여부

+ 		+
+ + + + +
+ + +
+ ※ 소속학교 변동 여부와는 관계없이 기운영 여부를 체크. +
+

필수입력 항목*

+

신청경로

+ 		+ + + +
+
+ +
+
+

운영 계획

+ * 항목은 필수 입력 사항입니다. +
+
+
+ + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + <%-- + + + --%> + +
운영 계획 (th 명)을 입력하는 표
+

필수입력 항목*

+

대상학년/반

+ 		+ + + +

필수입력 항목*

+

대상 반

+ 		+ + 반 +
+

필수입력 항목*

+

전체학생 수

+ 		+ + 명 + +

필수입력 항목*

+

운영시기

+ 		+ + + <%--
+ + " name="oprtnStrtDt" id="oprtnStrtDt" class="calendar" title="시작일 선택"> +
+ ~ +
+ + " name="oprtnEndDt" id="oprtnEndDt" class="calendar" title="종료일 선택"> +
--%> + + +
+ + <%-- --%> + " pattern="yyyy.MM.dd"> +
+ ~ +
+ + <%-- --%> + "> +
+ + + + +
+

필수입력 항목*

+

필요 교재 수량

+ 		+ + +
+

필수입력 항목*

+

첨부파일

+ 		+
+ + + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기 정보 제공
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+
+

최대 3개

+

50MB제한

+
+
+ + ※ 학교장 직인이 포함된 운영신청서 파일을 업로드 + +
+
+ +
+

필수입력 항목*

첨부파일
+
+
+ + <%-- --%> + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기 정보 제공
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 파일명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+
+

최대 3개

+

50MB제한

+
+
+ + ※ 학교장 직인이 포함된 운영신청서 파일을 업로드 + +
+
+ +
+
+

개인정보 이용 동의

+
+
+
+ 
1. 개인정보 수집 및 이용 목적
+- 제공하신 정보는 한국저작권위원회에서 운영하는 <저작권 체험교실 운영> 일정 안내를 위해 사용됩니다.
+
+2. 수집하려는 개인정보의 항목
+- [필수] 신청자의 성명, 주소, 연락처, 휴대폰, 이메일, 직장연락처, 직장주소
+
+3. 개인정보의 보유 및 이용 기간
+- 3년
+
+4. 개인정보 수집 동의 거부의 권리
+- 귀하는 이에 대한 동의를 거부할 수 있습니다.
+다만, 동의 거부 시 한국저작권위원회의 <저작권 체험교실 운영> 신청이 불가능 할 수도 있습니다.
+
+
+
+
+ + +
+
+
+
+
+
+

저작권 체험교실 운영 결과보고서 이용 허락

+
+
+
+ 
+한국저작권위원회에서는 저작권 체험교실 운영 결과보고서를 복제(ebook 제작 등 디지털화를 포함) 및 배포, 전송, 2차적 저작물 작성, 그 밖의 사업 목적상 필요한 범위 내에서 이용할 수 있습니다.
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+ + + + + + + + + + + +
+
+ + +
+
+ +
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp index b77168a0..f34cd6f0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -56,7 +56,7 @@ -
+
@@ -70,6 +70,8 @@
+ +
@@ -219,7 +221,7 @@ -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index 983fb6cc..d9a80244 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -951,6 +951,47 @@
+ +
+
+

강사 이력

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사 이력
교육명교육기간비고등록자등록일
~
+
From 2d71edb6d486718691de0aaa30c384e674beb690 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 24 Nov 2023 09:36:36 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=B0=BE?= =?UTF-8?q?=EA=B5=90=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 엑셀 다운로드 수정 --- .../com/cmm/spring/data/util/ExcelUtil.java | 4 +- .../qmc/web/UserQustnrManageController.java | 20 ++ .../trgtMng/service/CndtnTrgtMngVO.java | 7 + .../trgtMng/web/CndtnTrgtMngController.java | 191 +++++++++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 15 ++ .../uss/olp/qqm/UserQustnrManageQrCreate.jsp | 239 ++++++++++++++++++ 6 files changed, 470 insertions(+), 6 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserQustnrManageQrCreate.jsp diff --git a/src/main/java/kcc/com/cmm/spring/data/util/ExcelUtil.java b/src/main/java/kcc/com/cmm/spring/data/util/ExcelUtil.java index 8baa2969..95fb3bdd 100644 --- a/src/main/java/kcc/com/cmm/spring/data/util/ExcelUtil.java +++ b/src/main/java/kcc/com/cmm/spring/data/util/ExcelUtil.java @@ -100,8 +100,8 @@ public class ExcelUtil { for (int i = 0; i < order.length; i++) { for (Method method : methods) { // vo 내부 메소드 반복 - //System.out.println("voList.method()"); - //System.out.println(method.getName()); + System.out.println("voList.method()"); + System.out.println(method.getName()); if (method.getName().equals("get" + (order[i] == null ? "" : order[i]))) { // vo메소드 이름과 order의 이름 비교 // getter 호출 준비 diff --git a/src/main/java/kcc/let/uss/olp/qmc/web/UserQustnrManageController.java b/src/main/java/kcc/let/uss/olp/qmc/web/UserQustnrManageController.java index 79fe238e..b4f74eb4 100644 --- a/src/main/java/kcc/let/uss/olp/qmc/web/UserQustnrManageController.java +++ b/src/main/java/kcc/let/uss/olp/qmc/web/UserQustnrManageController.java @@ -799,6 +799,26 @@ public class UserQustnrManageController { } + + /** + * @methodName : UserQustnrManageQrCreate + * @author : JunHo Lee + * @date : 2023.11.23 + * @description : qr코드 생성 + * @param qustnrQestnManageVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value="/uss/olp/qqm/UserQustnrManageQrCreate.do") + public String UserQustnrManageQrCreate( + @ModelAttribute("qustnrQestnManageVO") QustnrQestnManageVO qustnrQestnManageVO, + ModelMap model) throws Exception { + + return "/uss/olp/qqm/UserQustnrManageQrCreate"; + + } + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 1e98b1cd..74733256 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -26,6 +26,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private String trgtNm; // 대상자성명 private String clphone; // 연락처 private String dBirth; // 생년월일 + private String DBirth; // 생년월일 private String addr; // 주소 private String addrDetail; // 상세주소 private String email; // 이메일주소 @@ -210,6 +211,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { public void setSearchSelStatusToList(String searchSelStatus) { this.searchSelStatusList = Arrays.asList(searchSelStatus.split(",")); } + public String getDBirth() { + return DBirth; + } + public void setDBirth(String dBirth) { + DBirth = dBirth; + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 352a9e41..59f2d5d8 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -5,12 +5,16 @@ import java.time.Period; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Locale; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -29,6 +33,7 @@ import kcc.com.cmm.service.CmmnDetailCode; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.spring.data.util.ExcelUtil; import kcc.com.cmm.util.DateUtil; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckFileUtil; @@ -494,7 +499,7 @@ public class CndtnTrgtMngController { private String getReqNmbr(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { //성인 미성년 구분 - String adultWhether = getIsAdultInKorea(cndtnTrgtInfoMngVO.getdBirth()); + String adultWhether = getIsAdultInKorea(cndtnTrgtInfoMngVO.getDBirth()); String reqNmbrTemp = adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+DateUtil.getStringToLocalDateYear(); int cnt = cndtnTrgtInfoMngService.findCntreqNmber("%" + reqNmbrTemp + "%"); @@ -684,10 +689,10 @@ public class CndtnTrgtMngController { List cndtnTrgtInfoMngVOList = new ArrayList(); - System.out.println(StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth())); + System.out.println(StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isEmpty(cndtnTrgtInfoMngVO.getDBirth())); System.out.println("StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) : "+ StringUtils.isEmpty(cndtnTrgtInfoMngVO.getTrgtNm())); - System.out.println("StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth()) : "+ StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth())); - if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getdBirth())) + System.out.println("StringUtils.isEmpty(cndtnTrgtInfoMngVO.getdBirth()) : "+ StringUtils.isEmpty(cndtnTrgtInfoMngVO.getDBirth())); + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getTrgtNm()) || StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getDBirth())) { cndtnTrgtInfoMngVO.setFirstIndex(0); cndtnTrgtInfoMngVO.setRecordCountPerPage(100000); @@ -910,6 +915,162 @@ public class CndtnTrgtMngController { } + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/trgtMngExcel.do") + public ModelAndView trgtMngExcel( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("excelDownloadView"); + + + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + System.out.println("loginVO.getAuthority() :: "+ loginVO.getAuthority()); + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject(model); + return modelAndView; + } + + //로그인 처리==================================== + + //1.pageing step1 + PaginationInfo paginationInfo = this.setCndtnPagingStep1(cndtnTrgtInfoMngVO); + + //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 + //paginationInfo.setRecordCountPerPage(10000); + + //2. pageing step2 + cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); + + //검색 조회 + String selectCondition = ""; + if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){ + String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus(); +// selectCondition = "AND a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')"; + selectCondition = "AND a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'"; + cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + } + + if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus())) + { + cndtnTrgtInfoMngVO.setSearchSelStatusToList(cndtnTrgtInfoMngVO.getSearchSelStatus()); + } + + List cndtnTrgtInfoMngVOList = null; + + try { + + cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + + for(CndtnTrgtMngVO tmp : cndtnTrgtInfoMngVOList) { + //의뢰읠 + tmp.setReqPnttm(tmp.getReqPnttm().substring(0, 10)); + //사건번호 + tmp.setVntYear(tmp.getVntYear()+"형제"+tmp.getVntNmbr()); + //관할청 + if(StringUtil.isNotEmpty(tmp.getCmptntAthrt())) { + vo.setCodeId("VEA008"); + vo.setCode(tmp.getCmptntAthrt()); + CmmnDetailCode cmmnDetailCode= egovCmmUseService.selectCmmCodeDetailValue(vo); + tmp.setCmptntAthrt(StringUtil.escapeXml(cmmnDetailCode.getCodeNm())); + } + //생년월일 + if(StringUtil.isNotEmpty(tmp.getdBirth())) { + tmp.setDBirth(tmp.getdBirth()); + } + //성별 + if(StringUtil.isNotEmpty(tmp.getSex())) { + vo.setCodeId("COM014"); + vo.setCode(tmp.getSex()); + CmmnDetailCode cmmnDetailCodeSex= egovCmmUseService.selectCmmCodeDetailValue(vo); + tmp.setSex((StringUtil.escapeXml(cmmnDetailCodeSex.getCodeNm()))); + } + //의뢰상태 + if(StringUtil.isNotEmpty(tmp.getReqStateCd())) { + vo.setCodeId("VEA005"); + vo.setCode(tmp.getReqStateCd()); + CmmnDetailCode cmmnDetailCodeReqState= egovCmmUseService.selectCmmCodeDetailValue(vo); + tmp.setReqStateCd((StringUtil.escapeXml(cmmnDetailCodeReqState.getCodeNm()))); + } + //교육상태 + if(StringUtil.isNotEmpty(tmp.getEduStateCd())) { + vo.setCodeId("VEA002"); + vo.setCode(tmp.getEduStateCd()); + CmmnDetailCode cmmnDetailCodeEduState= egovCmmUseService.selectCmmCodeDetailValue(vo); + tmp.setEduStateCd((StringUtil.escapeXml(cmmnDetailCodeEduState.getCodeNm()))); + } + //주소 + if(StringUtil.isNotEmpty(tmp.getAddr()) && StringUtil.isNotEmpty(tmp.getAddrDetail())) { + tmp.setAddr(tmp.getAddr()+" "+tmp.getAddrDetail()); + } + } + + int[] width = { + 4000, 5000, 5000, 5000, 3000 + , 3000, 5000, 4000, 5000, 13000 + + , 3500 + }; // 너비 + String[] header = { + "의뢰일", "사건번호", "관할청", "생년월일", "성명" + , "성별" , "의뢰번호", "의뢰상태", "교육상태", "주소" + , "검사명" + }; // 헤더에 들어갈 이름 + String[] order = { + "ReqPnttm", "VntYear", "CmptntAthrt", "DBirth", "TrgtNm" + , "Sex", "ReqNmbr", "ReqStateCd", "EduStateCd", "Addr" + + , "PrsctrNm" + }; // vo 내부의 필드 이름 (첫글자 대문자, 낙타체 사용) + + excelDown( + cndtnTrgtInfoMngVOList, + "대상자 목록", + width, + header, + order, + model + ); + + + + + + + //3.pageing step3 +// paginationInfo = this.setCndtnPagingStep3(cndtnTrgtInfoMngVOList, paginationInfo); +// +// model.addAttribute("paginationInfo", paginationInfo); +// +// +// //대상 리스트, 페이징 정보 전달 +// model.addAttribute("list", cndtnTrgtInfoMngVOList); +// +// ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); +// codeParam.setCodeId("VEA008"); +// List CmmnDetailCodeList = egovCmmUseService.selectCmmCodeDetailOrderByCode(codeParam); +// model.addAttribute("CmmnDetailCodeList", CmmnDetailCodeList); + + modelAndView.addObject(model); + + return modelAndView; + } + + @@ -1010,4 +1171,26 @@ public class CndtnTrgtMngController { return p_paginationInfo; } + + @SuppressWarnings("unused") + private void excelDown( + List list, + String title, + int[] width, + String[] header, + String[] order, + ModelMap model + ){ + // 호출 + SXSSFWorkbook workbook; + try { + workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(list, header, order, width, title); + model.addAttribute("locale", Locale.KOREA); + model.addAttribute("workbook", workbook); + model.addAttribute("workbookName", title); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 3d281687..f58c5399 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -215,6 +215,13 @@ } + + function fncExcel(){ + var listForm = document.listForm ; +// listForm.searchCondition.value = $("#searchCondition").val() ; + listForm.action = ""; + listForm.submit(); + } 교육과정관리 @@ -309,6 +316,14 @@
+
+
+

엑셀 다운로드

+
+
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserQustnrManageQrCreate.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserQustnrManageQrCreate.jsp new file mode 100644 index 00000000..261ec477 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/UserQustnrManageQrCreate.jsp @@ -0,0 +1,239 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +qr 생성 + + + + + + +
+
+
+

설문문항 등록

+
+
+
+ + + + + + + + + + + + + + + ` + + + + + + + + + + + + +
설문지정보(제목) + + +
질문 내용 + +
질문 순번 + ${qustnrQestnManageVO.qestnSn} + +
질문 유형 + +
최대선택건수 + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
1 + +
2 + +
${status.count} + +
+
+
+
+ + +
+
+ + + + + + + + + + +
+
+
+
+
+ +
+ + + + + + + + + +
1 + +
2 + +
+ + + + + + + + + + + + + + + + + + + + + +
1 + +
2 + +
3 + +
4 + +
5 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1 + +
2 + +
3 + +
4 + +
5 + +
6 + +
7 + +
+
+
+ +
From 5f192b1689f3cfe7510c4956ec197d541f143da2 Mon Sep 17 00:00:00 2001 From: kmg Date: Fri, 24 Nov 2023 11:36:45 +0900 Subject: [PATCH 6/6] =?UTF-8?q?2023/11/23=20=EC=B2=B4=ED=97=98=EA=B5=90?= =?UTF-8?q?=EC=8B=A4=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=205=EB=8B=A8?= =?UTF-8?q?=EA=B3=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=207=EB=8B=A8=EA=B3=84=EB=8A=94?= =?UTF-8?q?=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitEdu/usr/publish/css/content.css | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 2db7b1c5..2d405c8f 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -363,24 +363,25 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .ex_process {display:flex; justify-content:space-between; background:#f5f5f5; border:1px solid #cbcbcb; width:100%; border-radius:10px; margin: 0 0 40px 0; } .ex_process li {position:relative; background-position:25 center; background-repeat: no-repeat; width:20%; color:#666; font-size:22px; font-weight:500; letter-spacing:-0.5; } .ex_process li a {width:100%; padding:0; box-sizing: border-box; padding:45px 0 45px 125px ;} -.ex_process li.p_1 {background-image: url(/publish/image/content/ex_process1.png); background-position:50px center;} -.ex_process li.p_2 {background-image: url(/publish/image/content/ex_process2.png); background-position:50px center;} -.ex_process li.p_3 {background-image: url(/publish/image/content/ex_process3.png); background-position:50px center;} -.ex_process li.p_4 {background-image: url(/publish/image/content/ex_process4.png); background-position:50px center;} -.ex_process li.p_5 {background-image: url(/publish/image/content/ex_process5.png); background-position:50px center;} -.ex_process li.p_1_on {background-image: url(/publish/image/content/ex_process1_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} -.ex_process li.p_2_on {background-image: url(/publish/image/content/ex_process2_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} -.ex_process li.p_3_on {background-image: url(/publish/image/content/ex_process3_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} -.ex_process li.p_4_on {background-image: url(/publish/image/content/ex_process4_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} -.ex_process li.p_5_on {background-image: url(/publish/image/content/ex_process5_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_1 {background-image: url(../images/content/ex_process1.png); background-position:50px center;} +.ex_process li.p_2 {background-image: url(../images/content/ex_process2.png); background-position:50px center;} +.ex_process li.p_3 {background-image: url(../images/content/ex_process3.png); background-position:50px center;} +.ex_process li.p_4 {background-image: url(../images/content/ex_process4.png); background-position:50px center;} +.ex_process li.p_5 {background-image: url(../images/content/ex_process5.png); background-position:50px center;} +.ex_process li.p_1_on {background-image: url(../images/content/ex_process1_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_2_on {background-image: url(../images/content/ex_process2_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_3_on {background-image: url(../images/content/ex_process3_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_4_on {background-image: url(../images/content/ex_process4_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} +.ex_process li.p_5_on {background-image: url(../images/content/ex_process5_on.png); background-position:50px center; background-color:#f37632; border-radius:10px; color:#fff; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);} .ex_process li::after {position:absolute; content:""; width:1px; height:60px; background-color: #d5d5d5; right: 0; align-items: center; margin:-85px 0 0 0;} .ex_process li.p_1_on::after, li.p_2_on::after, li.p_3_on::after, li.p_4_on::after, li.p_5::after, li.p_5_on::after {display:none; } -/*체험교실대시보드*/ +/*체험교실대시보드 7단계 .ex_process {display:flex; justify-content:space-between;} .ex_process li {border-radius: 10px; width:13.5%; text-align: center; color:#fff; padding:15px 0 18px 0; font-size:22px;} .ex_process li.p {background-color: #a7acb6;} .ex_process li.p_on {background-color:#f37632;} +*/ /* 첨부파일 */ .tb_type01.attach {margin-bottom: 10px;}