From a816b4c24e4604da7ab146257823643f56b0dfd0 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 25 Jan 2024 17:08:58 +0900 Subject: [PATCH 1/8] =?UTF-8?q?2024-01-25=2017:08=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=ED=99=94=EB=A9=B4=20UI=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 | 2 +- .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp | 33 ++++++++++--------- .../popup/instrAsgnmDstncPopup.jsp | 4 ++- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 3f15635f..fa63f472 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -1379,7 +1379,7 @@ public class CommonWebController { //step3-4.월별시수대비할당이적은자 우선(필) - String s_orderByQuery = " aaa.instrSumChasi*10000/(aaa.asgnmTm+1) asc "; + String s_orderByQuery = " NVL(aaa.instrSumChasi*10000,0)/(aaa.asgnmTm+1) asc "; s_user_id = "'aaa'"; for (int j=0;j - + + - + - + - + - + ~ (분) - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp index 1bb7c678..318ef3e5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp @@ -261,9 +261,11 @@ 계산완료 + From 370ac1cda1df355562583f085893a8161196238b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 25 Jan 2024 18:03:11 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EA=B3=BC=EC=A0=95=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=8B=9C=20useYn=20=3D=20'Y'=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 67b5c8fc..b3c8f3cc 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -632,6 +632,7 @@ public class CndtnPrcsInfoMngController { vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setUseYn("Y"); String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); vEPrcsAplctPrdService.insert(vEPrcsDetailVO); From 2f33c7724ea296151d09cbea7c4c237a595e391b Mon Sep 17 00:00:00 2001 From: kmg Date: Thu, 25 Jan 2024 18:22:21 +0900 Subject: [PATCH 3/8] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20:=20a=ED=83=9C=EA=B7=B8=EC=97=90=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20tab=20?= =?UTF-8?q?=EA=B1=B4=EB=84=88=EB=9D=84=EA=B8=B0=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20=EC=86=8C=EC=8A=A4=20?= =?UTF-8?q?=EC=97=AC=EB=B0=B1=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp index 41bc0ef2..3e76bae7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp @@ -134,20 +134,14 @@ - - - + - - - + - - - + From 4a22e5ae4051e7eda3ba48dcddc90d13d97b8160 Mon Sep 17 00:00:00 2001 From: kmg Date: Thu, 25 Jan 2024 18:26:28 +0900 Subject: [PATCH 4/8] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20:=20a=ED=83=9C=EA=B7=B8=EC=97=90=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=EC=97=86=EC=9D=8C=EB=A1=9C=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/visitEdu/usr/publish/script/content.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/visitEdu/usr/publish/script/content.js b/src/main/webapp/visitEdu/usr/publish/script/content.js index fbf47d2d..33481a50 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/content.js +++ b/src/main/webapp/visitEdu/usr/publish/script/content.js @@ -1296,6 +1296,8 @@ $(document).ready(function () { $(".tb_list01 a").each(function(index,itm){ if($(itm).text()==""){ $(itm).attr("tabindex","-1"); + $(itm).text("내용없음"); + $(itm).css("text-indent","-99999px"); }else{} }); From 0f0d717291fa2491b3afbcd8dbe8e7b1246c335e Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 25 Jan 2024 18:28:01 +0900 Subject: [PATCH 5/8] =?UTF-8?q?2024-01-25=2018:27=20=EC=84=A4=EB=AC=B8=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 13 +++++++------ .../adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp | 13 ++++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 826fe15d..13ba6a1f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -4626,16 +4626,17 @@ /* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */ SELECT a.QUSTNR_TMPLAT_ID , a.SITE_ID - , max(decode(a.site_id_cd,'10',a.QESTNR_ID)) AS QESTNR_ID_10 - , max(decode(a.site_id_cd,'20',a.QESTNR_ID)) AS QESTNR_ID_20 - , max(decode(a.site_id_cd,'30',a.QESTNR_ID)) AS QESTNR_ID_30 + , decode(a.site_id_cd,'10',a.QESTNR_ID) AS QESTNR_ID_10 + , decode(a.site_id_cd,'20',a.QESTNR_ID) AS QESTNR_ID_20 + , decode(a.site_id_cd,'30',a.QESTNR_ID) AS QESTNR_ID_30 FROM LETTNQESTNRINFO a WHERE a.SITE_ID =#siteId# AND a.SITE_ID_CD IN ('10','20','30') - AND TO_CHAR(SYSDATE, 'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde,'2000.01.01') AND NVL(a.qustnr_endde,'9999.12.31') - GROUP BY a.QUSTNR_TMPLAT_ID - , a.SITE_ID + AND TO_CHAR(SYSDATE, 'YYYY.MM.DD') BETWEEN NVL(a.qustnr_bgnde,'2000.01.01') AND NVL(a.qustnr_endde,'9999.12.31') + ORDER BY nvl(a.qustnr_bgnde,'9999.12.31') + LIMIT 1 + ) I on(1=1) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 93e4b403..f376b04e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -567,11 +567,14 @@ - - - - - +

필수입력 항목*

강의계획서
+
+ + + + + +
From 84fbb4c198405b31f1732940650404c47112d7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Thu, 25 Jan 2024 18:31:25 +0900 Subject: [PATCH 6/8] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp | 4 +++- .../jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index f78a48ca..3b5714ee 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -624,12 +624,14 @@

교육매체

- + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index def08359..30f4fbfd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -1266,11 +1266,13 @@ function _chkChasiTime(p_this){ if (v_eduPlaceCd=='99'){ /* v_eduPlace.removeAttr('disabled'); */ - v_eduPlace.removeAttr('readonly'); + v_eduPlace.removeAttr('readonly'); + v_eduPlace.attr("style","background-color:#fff !important"); }else{ v_eduPlace.val(''); /* v_eduPlace.attr('disabled', 'disabled'); */ - v_eduPlace.attr('readonly', 'readonly'); + v_eduPlace.attr('readonly', 'readonly'); + v_eduPlace.removeAttr("style"); } } @@ -1552,6 +1554,7 @@ function _chkChasiTime(p_this){ onChange="eduPlaceChg();" /> + From 31b77cbdbe77c77cbf7aae802745a4abb753024d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Fri, 26 Jan 2024 09:15:00 +0900 Subject: [PATCH 8/8] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp | 4 ++-- .../exprnClsrmInfo/popup/qustnrPopList.jsp | 9 ++++++--- .../exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp index 6f6d357b..020bea82 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp @@ -447,7 +447,7 @@ $(document).ready(function(){ - +
@@ -466,7 +466,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp index bbf6175d..47fac30e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp @@ -219,7 +219,10 @@ $(document).ready(function(){ btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus','sub36_pop02_close'); */ - + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="sub36_pop02"]'); + activeTarget.hide(); + $('[data-tooltip="sub36_pop02"]').focus(); }) @@ -424,7 +427,7 @@ $(document).ready(function(){ - +
@@ -443,7 +446,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp index 3692c70a..7feb052e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp @@ -490,7 +490,7 @@ $(document).ready(function(){ - +
@@ -509,7 +509,7 @@ $(document).ready(function(){
- +