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

Merge branch 'advc' of

Browse Source 
http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

Conflicts:
	src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp
	src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
	src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
This commit is contained in:
subsub 2024-01-26 09:38:33 +09:00
commit 8c468fa354
13 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
View File

@ -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<vEInstrAssiEduAplctVOList.size();j++) {
s_user_id = s_user_id + ",'" + vEInstrAssiEduAplctVOList.get(j).getUserId()+"'";

1
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
View File

@ -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);

13
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -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)

33
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
View File

@ -677,46 +677,47 @@
</td>
<td>
<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<!-- 교육배치관리는 링크가 없어서 우선 링크 제거함 -->
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<fmt:formatDate value="${eduHopeDt}" pattern="E"/>
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/><fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
~<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/><fmt:formatDate value="${endTm}" pattern="kk:mm"/>
(<c:out value="${list.lrnTm}" />분)
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<ve:code codeId="VE0007" code="${list.eduSlctCd}"/>
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/>
</a>
</td>
<td id="listScholInsttNm">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<c:out value="${list.insttNm}"/>
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<c:out value="${list.eduTrgt}"/>
</a>
</td>
<td>
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
<c:out value="${list.instrNm}"/>
</a>
</td>
<td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>

4
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp
View File

@ -261,9 +261,11 @@
</c:when>
<c:otherwise>
계산완료
<!--
<input name="chk" class="${list.asgnmAprvlCd}"
value="${list.eduAplctOrd}@${list.eduChasiOrd}"
title="Check" type="checkbox"/>
title="Check" type="checkbox"/>
-->
</c:otherwise>
</c:choose>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -624,12 +624,14 @@
<p>교육매체</p>
</th>
<td colspan="3">
<label for="eduMd" class="label">교육매체 입력</label>
<ve:radio codeId="VEA015" id="eduMdCd" name="eduMdCd"
selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}"
onChange="eduMdChg();"
/>
<label for="eduMd" class="label">교육매체 입력</label>
<input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25">
</td>
</tr>
<tr class="input_adress" id="juso">

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

@ -452,7 +452,11 @@ $(document).ready(function(){
<!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> -->
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<<<<<<< HEAD
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
=======
<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="sub36_pop02">취소</button>
>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
</div>
<div class="btn_right">
</div>
@ -471,7 +475,11 @@ $(document).ready(function(){
</div>
<div class="btn_center">
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<<<<<<< HEAD
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">닫기</button>
=======
<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="ssub36_pop02">닫기</button>
>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
</div>
<div class="btn_right">
</div>

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
View File

@ -225,6 +225,7 @@ $(document).ready(function(){
activeTarget.hide();
$('[data-tooltip="sub37_pop20"]:first-child').focus();
});
})
</script>
<!-- 일정 상세 -->
@ -428,7 +429,6 @@ $(document).ready(function(){
<div class="btn_center">
<button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
</div>
<div class="btn_right">
@ -447,7 +447,6 @@ $(document).ready(function(){
<div class="btn_left">
</div>
<div class="btn_center">
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">닫기</button>
</div>
<div class="btn_right">

1
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
View File

@ -494,7 +494,6 @@ $(document).ready(function(){
<!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> -->
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
</div>
<div class="btn_right">

12
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp
View File

@ -134,20 +134,14 @@
</a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<kc:code codeId="VE0007" code="${list.eduSlctCd}"/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><kc:code codeId="VE0007" code="${list.eduSlctCd}"/></a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<c:out value='${list.scholInsttNm}'/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><c:out value='${list.scholInsttNm}'/></a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<c:out value='${list.eduPlace}'/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><c:out value='${list.eduPlace}'/></a>
</td>
<td>
<c:choose>

9
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -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();"
/>
<label for="eduPlace" class="label">교육장소 입력</label>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" readonly>
</td>
</tr>
@ -1586,7 +1589,7 @@ function _chkChasiTime(p_this){
<span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)</span>
</div>
<div class="btn_wrap">
<button type="button" class="btnType01" data-tooltip="sub01_pop03" onclick="fncCalView();" title="팝업 열림">교육일정달력보기</button>
<!-- 2024.01.25 <button type="button" class="btnType01" data-tooltip="sub01_pop03" onclick="fncCalView();" title="팝업 열림">교육일정달력보기</button> -->
<button type="button" class="btnType05" title="교육차시 입력테이블 추가생성" onclick="addEduClassCopyTngr('addClassRow')">교육추가</button>
</div>
</div>

13
src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
View File

@ -567,11 +567,14 @@
</dd>
</c:if>
<c:if test="${not empty fileList}">
<td class="file_download">
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${info.lctrPlanAtchFileId}" />
</c:import>
</td>
<dt><p class="req_text"><span>필수입력 항목</span>*</p>강의계획서</dt>
<dd colspan="3" class="upload_area">
<td class="file_download">
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${info.lctrPlanAtchFileId}" />
</c:import>
</td>
</dd>
</c:if>
</dl>

2
src/main/webapp/visitEdu/usr/publish/script/content.js
View File

@ -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{}
});