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 @@ 계산완료 + 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/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp index 396d89f7..10079ea3 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 @@ -452,7 +452,11 @@ $(document).ready(function(){ +<<<<<<< HEAD +======= + +>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
@@ -471,7 +475,11 @@ $(document).ready(function(){
+<<<<<<< HEAD +======= + +>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
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 c1fffc10..6a7e6f86 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 @@ -225,6 +225,7 @@ $(document).ready(function(){ activeTarget.hide(); $('[data-tooltip="sub37_pop20"]:first-child').focus(); }); + }) @@ -428,7 +429,6 @@ $(document).ready(function(){
-
@@ -447,7 +447,6 @@ $(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 bc6064e0..631f8e6f 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 @@ -494,7 +494,6 @@ $(document).ready(function(){ -
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 @@ - - - + - - - + - - - + 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..7b4ad290 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"); } } @@ -1551,6 +1553,7 @@ function _chkChasiTime(p_this){ selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}" onChange="eduPlaceChg();" /> + @@ -1586,7 +1589,7 @@ function _chkChasiTime(p_this){ ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)
- +
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 @@ - - - - - +

필수입력 항목*

강의계획서
+
+ + + + + +
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{} });