tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-12-13 16:05:15 +09:00
commit 8dc91a10e9
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/egovframework/egovProps/globals_svr.properties
View File

@ -29,9 +29,9 @@ Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver
#\ub85c\uceec DB #\ub85c\uceec DB
#Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero #Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero
#\uc6b4\uc601 \uac1c\ubc1cDB - \ud14c\uc2a4\ud2b8 \uc644\ub8cc \ud6c4 \uc6b4\uc601 DB\ub85c \ubcc0\uacbd \uc608\uc815 #\uc6b4\uc601 \uac1c\ubc1cDB - \ud14c\uc2a4\ud2b8 \uc644\ub8cc \ud6c4 \uc6b4\uc601 DB\ub85c \ubcc0\uacbd \uc608\uc815
Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb #Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb
#\uc6b4\uc601 DB #\uc6b4\uc601 DB
#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb
# \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c)

7
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp
View File

@ -262,6 +262,13 @@
} }
function validCheck(){ function validCheck(){
var oathAtchFileId = '${info.oathAtchFileId}';
if(oathAtchFileId == null || oathAtchFileId == ''){
alert("서약서를 제출해주세요.");
return false;
}
if($('#trgtGrade').val() == ''){ if($('#trgtGrade').val() == ''){
alert('대상학년/반을 입력해주세요.'); alert('대상학년/반을 입력해주세요.');
$("#trgtGrade").focus(); $("#trgtGrade").focus();

8
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp
View File

@ -21,14 +21,16 @@
</style> </style>
<script type="text/javaScript" language="javascript"> <script type="text/javaScript" language="javascript">
var aprvlCd = ${info.aprvlCd} var aprvlCd = ${info.aprvlCd}
if(aprvlCd == '11' || aprvlCd == '12' || aprvlCd == '13'){
aprvlCd = '10';
}
$( document ).ready(function(){ $( document ).ready(function(){
if(${info == null}){ if(${info == null}){
alert("진행 중인 체험교실이 없습니다."); alert("진행 중인 체험교실이 없습니다.");
location.href = "<c:url value='/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.do'/>"; location.href = "<c:url value='/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.do'/>";
}else{ }else{
if(aprvlCd == '11' || aprvlCd == '12' || aprvlCd == '13'){
aprvlCd = '10';
}
$("#p_"+aprvlCd).parent().attr('class', 'p_on'); $("#p_"+aprvlCd).parent().attr('class', 'p_on');
$("#p_"+aprvlCd).parent().prevAll().attr('class', 'p_on'); $("#p_"+aprvlCd).parent().prevAll().attr('class', 'p_on');
$("#p_"+aprvlCd).css("color", "#FFFF00"); $("#p_"+aprvlCd).css("color", "#FFFF00");

7
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp
View File

@ -237,6 +237,13 @@
function validCheck(){ function validCheck(){
var oathAtchFileId = '${info.oathAtchFileId}';
if(oathAtchFileId == null || oathAtchFileId == ''){
alert("서약서를 제출해주세요.");
return false;
}
if($('#trgtGrade').val() == ''){ if($('#trgtGrade').val() == ''){
alert('대상학년/반을 입력해주세요.'); alert('대상학년/반을 입력해주세요.');
$("#trgtGrade").focus(); $("#trgtGrade").focus();