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

Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
subsub 2024-01-26 10:57:00 +09:00
commit 95edc3ba50
5 changed files with 111 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml
View File

@ -691,11 +691,23 @@
, b.QUSTNR_RSLT_ID AS qustnrRsltId
/*
, b.VERY_SATISFIED AS verySatisfied
, b.SATISFIED AS satisfied
, b.NEITHER AS neither
, b.DISSATISFIED AS dissatisfied
, b.VERY_DISSATISFIED AS veryDissatisfied
*/
, NVL(b.VERY_SATISFIED, cVERY_SATISFIED) AS verySatisfied
, NVL(b.SATISFIED, cSATISFIED) AS satisfied
, NVL(b.NEITHER, cNEITHER) AS neither
, NVL(b.DISSATISFIED, cDISSATISFIED) AS dissatisfied
, NVL(b.VERY_DISSATISFIED, cVERY_DISSATISFIED) AS veryDissatisfied
, b.ANSWER AS answer
, b.QUSTNR_IEM_ID AS qustnrIemId
@ -722,6 +734,36 @@
AND c.QUSTNR_RESPOND_ID = #qustnrRespondId#
)
LEFT OUTER JOIN (
SELECT
c.QUSTNR_TMPLAT_ID ,
c.QESTNR_ID ,
c.QUSTNR_QESITM_ID ,
c.EDU_APLCT_ORD ,
c.EDU_CHASI_ORD ,
sum(c.very_satisfied) AS cvery_satisfied ,
sum(c.satisfied) AS csatisfied ,
sum(c.neither) AS cneither ,
sum(c.dissatisfied) AS cdissatisfied ,
sum(c.very_dissatisfied) AS cvery_dissatisfied
FROM
LETTNQESTNRRSLTEADetail c
GROUP BY
c.QUSTNR_TMPLAT_ID ,
c.QESTNR_ID ,
c.QUSTNR_QESITM_ID ,
c.EDU_APLCT_ORD ,
c.EDU_CHASI_ORD
)F ON
(
a.QUSTNR_TMPLAT_ID = f.QUSTNR_TMPLAT_ID
AND a.QESTNR_ID = f.QESTNR_ID
AND a.QUSTNR_QESITM_ID = f.QUSTNR_QESITM_ID
AND f.EDU_APLCT_ORD = #eduAplctOrd#
AND f.EDU_CHASI_ORD = #eduChasiOrd#
)
WHERE a.QUSTNR_TMPLAT_ID = #qustnrTmplatId#
AND a.QESTNR_ID = #qestnrId#

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

@ -4469,10 +4469,10 @@
, H.oneway_dstnc AS onewayDstnc
, A.rslt_atch_file_id AS rsltAtchFileId
, I.qustnr_tmplat_id AS qustnrTmplatId
, i.qestnr_id_10 AS qestnrId10
, i.qestnr_id_20 AS qestnrId20
, i.qestnr_id_30 AS qestnrId30
, I10.qustnr_tmplat_id AS qustnrTmplatId
, I10.qestnr_id_10 AS qestnrId10
, I20.qestnr_id_20 AS qestnrId20
, I30.qestnr_id_30 AS qestnrId30
FROM
VE_EDU_APLCT A
@ -4624,6 +4624,7 @@
LEFT OUTER JOIN (
/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */
/*
SELECT a.QUSTNR_TMPLAT_ID
, a.SITE_ID
, decode(a.site_id_cd,'10',a.QESTNR_ID) AS QESTNR_ID_10
@ -4631,16 +4632,62 @@
, decode(a.site_id_cd,'30',a.QESTNR_ID) AS QESTNR_ID_30
FROM LETTNQESTNRINFO a
WHERE a.SITE_ID =#siteId#
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')
ORDER BY nvl(a.qustnr_bgnde,'9999.12.31')
LIMIT 1
*/
SELECT a.QUSTNR_TMPLAT_ID
, a.SITE_ID
, decode(a.site_id_cd,'10',a.QESTNR_ID) AS QESTNR_ID_10
) I
FROM LETTNQESTNRINFO a
WHERE a.SITE_ID =#siteId#
AND a.SITE_ID_CD IN ('10')
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
) I10
on(1=1)
LEFT OUTER JOIN (
/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */
SELECT a.QUSTNR_TMPLAT_ID
, a.SITE_ID
, decode(a.site_id_cd,'20',a.QESTNR_ID) AS QESTNR_ID_20
FROM LETTNQESTNRINFO a
WHERE a.SITE_ID =#siteId#
AND a.SITE_ID_CD IN ('20')
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
) I20
on(1=1)
LEFT OUTER JOIN (
/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) */
SELECT a.QUSTNR_TMPLAT_ID
, a.SITE_ID
, 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 ('30')
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
) I30
on(1=1)
WHERE 1=1
AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
AND A.EDU_APLCT_ORD = B.EDU_APLCT_ORD

5
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -14,13 +14,14 @@
<%-- 웹접근성 각 페이지 타이틀 변경 220125--%>
$(document).ready(function (){
var titleNm = '';
/* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */
/* var titleNm = '';
if($('body').find('h2').length > 0){
titleNm = document.querySelector('h2').textContent;
if(document.title.indexOf(titleNm) < 0){
document.title = titleNm + "<" + document.title;
}
}
} */
});
</script>

5
src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp
View File

@ -136,7 +136,8 @@ function isMobile(){
}
<%-- 웹접근성 각 페이지 타이틀 변경 220125--%>
$(document).ready(function (){
var titleNm = '';
/* 240126 - common.js에서도 title 선언이 되어 중복 제거를 위한 주석처리 */
/* var titleNm = '';
if($('body').find('h2').length > 0){
titleNm = document.querySelector('h2').textContent;
if(document.title.indexOf(titleNm) < 0){
@ -145,7 +146,7 @@ $(document).ready(function (){
document.title = titelNavi.eq(4).text() +"<"+titelNavi.eq(2).text()+"< 한국저작권위원회 저작권교육 시스템";
}
}
} */
});
</script>

7
src/main/webapp/visitEdu/usr/publish/script/common.js
View File

@ -25,11 +25,16 @@ $(document).ready(function () {
else if($(".cont_tit h2").text() == "로그인"){
$("head title").text("로그인페이지 < 한국저작권위원회 저작권배움터");
}
else if(dep01_Text == ''){
$("head title").text(dep02_Text+" < "+" 한국저작권위원회 저작권배움터");
}
else{
$("head title").text(dep02_Text+" < "+dep01_Text+" < "+" 한국저작권위원회 저작권배움터");
}
if(dep01_Text == '' && dep02_Text == ''){
$("head title").text($(".cont_tit h2").text() + " < "+" 한국저작권위원회 저작권배움터");
}
if($(".full_menu .depth01_li a:contains('ZOOM 신청 게시판(청소년)')").length == "1"){
$(".full_menu .depth01_li>a").css("width","24%");