2023-12-05 12:25 교육일정달력수정

src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java

@@ -19,6 +19,9 @@ public interface VEAStngMixService {
 	
 	//교육가능시수 데이터		-	교육가능시수 세부 선택 데이터
 	List<VEAStngVO> 	selectList_VEALPPS_2(VEAStngVO paramVO) throws Exception;				//	LIST
+
+	//교육가능시수 데이터		-	교육가능시수 세부 선택 데이터 - 사용자 달력용
+	List<VEAStngVO> 	selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception;				//	LIST
 	
 	//강의가능기간에 불가능한 일자 가져오기
 	List<VEAStngVO> 	selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception;				//	LIST

src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java

@@ -30,6 +30,11 @@ public class VEAStngMixDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VEAStngVO> selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception {
+		List<VEAStngVO> tlist = (List<VEAStngVO>) list("VEALctrYrStngMixDAO.selectList_VEALPPS_2_4_user", paramVO);
+		return tlist;
+	}	
+	
 	public List<VEAStngVO> selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception {
 		List<VEAStngVO> tlist = (List<VEAStngVO>) list("VEALctrYrStngMixDAO.selectList_VEALPPS_3", paramVO);
 		return tlist;

src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java

@@ -47,6 +47,11 @@ public class VEAStngMixServiceImpl implements VEAStngMixService {
 	public List<VEAStngVO> selectList_VEALPPS_2(VEAStngVO paramVO) throws Exception{
 		return vEAStngMixDAO.selectList_VEALPPS_2(paramVO);
 	}
+	
+	public List<VEAStngVO> selectList_VEALPPS_2_4_user(VEAStngVO paramVO) throws Exception{
+		return vEAStngMixDAO.selectList_VEALPPS_2_4_user(paramVO);
+	}
+	
 
 	public List<VEAStngVO> selectList_VEALPPS_3(VEAStngVO paramVO) throws Exception{
 		return vEAStngMixDAO.selectList_VEALPPS_3(paramVO);

src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java

@@ -253,7 +253,7 @@ public class ScholInfoController {
     	//schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", ""));
     	//step1.현재달력의 첫번째 날짜를 기준으로 그해와 다음해의 전체 일자를 만들고, 
     	
-    	List<VEAStngVO>	vList	=	vEAStngMixService.selectList_VEALPPS_2(vEAStngVO);
+    	List<VEAStngVO>	vList	=	vEAStngMixService.selectList_VEALPPS_2_4_user(vEAStngVO);
     	
     	//return vEAStngMixService.selectList_VEALPPS_1(vEAStngVO);
     	    	
@@ -270,10 +270,12 @@ public class ScholInfoController {
         		}else	if (Integer.parseInt(vList.get(i).getTitleF())>=Integer.parseInt(vList.get(i).getTitleB()))
         		{
             		vList.get(i).setColor("#FF0000");
+            		vList.get(i).setTitle("가능");
 
         		}else	if (Integer.parseInt(vList.get(i).getTitleF())*5>=Integer.parseInt(vList.get(i).getTitleB())*4)
         		{
             		vList.get(i).setColor("#FFAA00");
+            		vList.get(i).setTitle("가능");
         		}
         		
         		

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -5346,7 +5346,15 @@ VALUES
 			substring(bbbb.edu_hope_dt,1,4)|| '-'|| substring(bbbb.edu_hope_dt,5,2)|| '-'|| substring(bbbb.edu_hope_dt,7,2) AS eduHopeDt
 			, cccc.schol_instt_nm	AS scholInsttNm
 			, eeee.instr_nm		AS instrNm
+			/*
 			, IF(vals=0,'',vals) AS valss
+			*/
+			
+	     	, 	  					CASE
+	       					  		 WHEN vals=0	THEN ''
+	       					  		 ELSE vals
+	       					  		END AS valss
+	       					  					
             , aaaa.edu_aplct_ord
             , aaaa.edu_chasi_ord
                              
@@ -5384,7 +5392,7 @@ VALUES
 						       , nos||'' AS nos						       
 						       , 6-nos vals
 						       , SUM(
-						       		  	IF (qestnSn=1
+						       		  	DECODE (qestnSn,1
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5397,7 +5405,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn1
 						       , SUM(
-						       		  	IF (qestnSn=2
+						       		  	DECODE (qestnSn,2
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5410,7 +5418,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn2    
 						       , SUM(
-						       		  	IF (qestnSn=3
+						       		  	DECODE(qestnSn,3
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5423,7 +5431,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn3  
 						       , SUM(
-						       		  	IF (qestnSn=4
+						       		  	DECODE(qestnSn,4
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5436,7 +5444,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn4  
 						       			       , SUM(
-						       		  	IF (qestnSn=5
+						       		  	DECODE(qestnSn,5
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5449,7 +5457,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn5
 						       , SUM(
-						       		  	IF (qestnSn=6
+						       		  	DECODE(qestnSn,6
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5462,7 +5470,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn6  
 						       , SUM(
-						       		  	IF (qestnSn=7
+						       		  	DECODE(qestnSn,7
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5475,7 +5483,7 @@ VALUES
 						       						)
 						       			)			AS	qestnSn7  
 						       , SUM(
-						       		  	IF (qestnSn=8
+						       		  	DECODE(qestnSn,8
 						       		  					,
 						       		  					CASE
 						       					  		 WHEN nos=1	THEN verySatisfied
@@ -5522,11 +5530,11 @@ VALUES
 						                          )
 						                          ,
 						                          (
-						                          SELECT 1 NOs
+						                          SELECT 1 NOs FROM DUAL
-						                          UNION ALL SELECT 2 NOs
+						                          UNION ALL SELECT 2 NOs FROM DUAL
-						                          UNION ALL SELECT 3 NOs
+						                          UNION ALL SELECT 3 NOs FROM DUAL
-						                          UNION ALL SELECT 4 NOs
+						                          UNION ALL SELECT 4 NOs FROM DUAL
-						                          UNION ALL SELECT 5 NOs
+						                          UNION ALL SELECT 5 NOs FROM DUAL
 						                          )D
 						        WHERE    1               =1
 						        /*
@@ -5571,7 +5579,7 @@ VALUES
 									       , nos
 									       , 6-nos vals
 									       , SUM(
-									       		  	IF (qestnSn=1
+									       		  	DECODE(qestnSn,1
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5584,7 +5592,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn1
 									       , SUM(
-									       		  	IF (qestnSn=2
+									       		  	DECODE(qestnSn,2
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5597,7 +5605,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn2    
 									       , SUM(
-									       		  	IF (qestnSn=3
+									       		  	DECODE(qestnSn,3
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5610,7 +5618,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn3  
 									       , SUM(
-									       		  	IF (qestnSn=4
+									       		  	DECODE(qestnSn,4
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5623,7 +5631,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn4  
 									       			       , SUM(
-									       		  	IF (qestnSn=5
+									       		  	DECODE(qestnSn,5
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5636,7 +5644,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn5
 									       , SUM(
-									       		  	IF (qestnSn=6
+									       		  	DECODE(qestnSn,6
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5649,7 +5657,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn6  
 									       , SUM(
-									       		  	IF (qestnSn=7
+									       		  	DECODE(qestnSn,7
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5662,7 +5670,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn7  
 									       , SUM(
-									       		  	IF (qestnSn=8
+									       		  	DECODE(qestnSn,8
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5708,11 +5716,11 @@ VALUES
 									                          )
 									                          ,
 									                          (
-									                          SELECT 1 NOs
+									                          SELECT 1 NOs FROM DUAL
-									                          UNION ALL SELECT 2 NOs
+									                          UNION ALL SELECT 2 NOs FROM DUAL
-									                          UNION ALL SELECT 3 NOs
+									                          UNION ALL SELECT 3 NOs FROM DUAL
-									                          UNION ALL SELECT 4 NOs
+									                          UNION ALL SELECT 4 NOs FROM DUAL
-									                          UNION ALL SELECT 5 NOs
+									                          UNION ALL SELECT 5 NOs FROM DUAL
 									                          )D
 									        WHERE    1               =1
 									        /*
@@ -5752,7 +5760,7 @@ VALUES
 							  		, IF(qestnSn7 IS NULL OR qestnSn7=0,0,ROUND(CAST(SUM(qestnSn7*vals*1.0)  / SUM(qestnSn7*5.0)*100.0 AS double),2))	AS	qestnSn7
 							  		, IF(qestnSn8 IS NULL OR qestnSn8=0,0,ROUND(CAST(SUM(qestnSn8*vals*1.0)  / SUM(qestnSn8*5.0)*100.0 AS double),2))	AS	qestnSn8
 							  		*/
-							  		
+							  		/*
 			                        ,ROUND(SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1) *vals*1.0)*100 / IF(SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1)*5.0)=0,1,SUM(IF(qestnSn1 IS NULL OR qestnSn1=0,0,qestnSn1)*5.0)),2) AS qestnSn1 
                           			,ROUND(SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2) *vals*1.0)*100 / IF(SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2)*5.0)=0,1,SUM(IF(qestnSn2 IS NULL OR qestnSn2=0,0,qestnSn2)*5.0)),2) AS qestnSn2
                           			,ROUND(SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3) *vals*1.0)*100 / IF(SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3)*5.0)=0,1,SUM(IF(qestnSn3 IS NULL OR qestnSn3=0,0,qestnSn3)*5.0)),2) AS qestnSn3
@@ -5761,7 +5769,17 @@ VALUES
                           			,ROUND(SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6) *vals*1.0)*100 / IF(SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6)*5.0)=0,1,SUM(IF(qestnSn6 IS NULL OR qestnSn6=0,0,qestnSn6)*5.0)),2) AS qestnSn6
                           			,ROUND(SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7) *vals*1.0)*100 / IF(SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7)*5.0)=0,1,SUM(IF(qestnSn7 IS NULL OR qestnSn7=0,0,qestnSn7)*5.0)),2) AS qestnSn7
                           			,ROUND(SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8) *vals*1.0)*100 / IF(SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8)*5.0)=0,1,SUM(IF(qestnSn8 IS NULL OR qestnSn8=0,0,qestnSn8)*5.0)),2) AS qestnSn8
-							  		
+                          			*/
+
+			                        ,ROUND(SUM(DECODE(qestnSn1,0,0,qestnSn1) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn1,0,0,qestnSn1)*5.0),0,1,SUM(DECODE(qestnSn1,0,0,qestnSn1)*5.0)),2)	AS qestnSn1 
+			                        ,ROUND(SUM(DECODE(qestnSn2,0,0,qestnSn2) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn2,0,0,qestnSn2)*5.0),0,1,SUM(DECODE(qestnSn2,0,0,qestnSn2)*5.0)),2)	AS qestnSn2
+			                        ,ROUND(SUM(DECODE(qestnSn3,0,0,qestnSn3) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn3,0,0,qestnSn3)*5.0),0,1,SUM(DECODE(qestnSn3,0,0,qestnSn3)*5.0)),2)	AS qestnSn3
+			                        ,ROUND(SUM(DECODE(qestnSn4,0,0,qestnSn4) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn4,0,0,qestnSn4)*5.0),0,1,SUM(DECODE(qestnSn4,0,0,qestnSn4)*5.0)),2)	AS qestnSn4
+			                        ,ROUND(SUM(DECODE(qestnSn5,0,0,qestnSn5) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn5,0,0,qestnSn5)*5.0),0,1,SUM(DECODE(qestnSn5,0,0,qestnSn5)*5.0)),2)	AS qestnSn5
+			                        ,ROUND(SUM(DECODE(qestnSn6,0,0,qestnSn6) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn6,0,0,qestnSn6)*5.0),0,1,SUM(DECODE(qestnSn6,0,0,qestnSn6)*5.0)),2)	AS qestnSn6
+			                        ,ROUND(SUM(DECODE(qestnSn7,0,0,qestnSn7) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn7,0,0,qestnSn7)*5.0),0,1,SUM(DECODE(qestnSn7,0,0,qestnSn7)*5.0)),2)	AS qestnSn7
+			                        ,ROUND(SUM(DECODE(qestnSn8,0,0,qestnSn8) *vals*1.0)*100 / DECODE(SUM(DECODE(qestnSn8,0,0,qestnSn8)*5.0),0,1,SUM(DECODE(qestnSn8,0,0,qestnSn8)*5.0)),2)	AS qestnSn8
+                          			
 							  		, '99' AS srt
 						FROM (
 									/*
@@ -5776,7 +5794,7 @@ VALUES
 									       , nos
 									       , 6-nos vals
 									       , SUM(
-									       		  	IF (qestnSn=1
+									       		  	DECODE (qestnSn,1
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5789,7 +5807,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn1
 									       , SUM(
-									       		  	IF (qestnSn=2
+									       		  	DECODE (qestnSn,2
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5802,7 +5820,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn2    
 									       , SUM(
-									       		  	IF (qestnSn=3
+									       		  	DECODE (qestnSn,3
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5815,7 +5833,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn3  
 									       , SUM(
-									       		  	IF (qestnSn=4
+									       		  	DECODE (qestnSn,4
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5828,7 +5846,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn4  
 									       			       , SUM(
-									       		  	IF (qestnSn=5
+									       		  	DECODE (qestnSn,5
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5841,7 +5859,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn5
 									       , SUM(
-									       		  	IF (qestnSn=6
+									       		  	DECODE (qestnSn,6
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5854,7 +5872,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn6  
 									       , SUM(
-									       		  	IF (qestnSn=7
+									       		  	DECODE (qestnSn,7
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5867,7 +5885,7 @@ VALUES
 									       						)
 									       			)			AS	qestnSn7  
 									       , SUM(
-									       		  	IF (qestnSn=8
+									       		  	DECODE (qestnSn,8
 									       		  					,
 									       		  					CASE
 									       					  		 WHEN nos=1	THEN verySatisfied
@@ -5913,11 +5931,11 @@ VALUES
 									                          )
 									                          ,
 									                          (
-									                          SELECT 1 NOs
+									                          SELECT 1 NOs FROM DUAL
-									                          UNION ALL SELECT 2 NOs
+									                          UNION ALL SELECT 2 NOs FROM DUAL
-									                          UNION ALL SELECT 3 NOs
+									                          UNION ALL SELECT 3 NOs FROM DUAL
-									                          UNION ALL SELECT 4 NOs
+									                          UNION ALL SELECT 4 NOs FROM DUAL
-									                          UNION ALL SELECT 5 NOs
+									                          UNION ALL SELECT 5 NOs FROM DUAL
 									                          )D
 									        WHERE    1               =1
 									        /*

src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml

@@ -397,6 +397,197 @@
         	
 	</select>	
 
+	<!-- 교육가능시수 달력 용 데이터  -->
+	<select id="VEALctrYrStngMixDAO.selectList_VEALPPS_2_4_user" parameterClass="VEAStngVO" resultClass="VEAStngVO">
+		/*	교육가능시수 달력 용 데이터	VEALctrYrStngMixDAO.selectList_VEALPPS_2_4_user	*/
+		/*
+		SELECT '가능일1' title
+			, '2023-09-01' "START"
+			, '2023-09-01' "END"			
+			, 1 allday
+		FROM dual
+		UNION ALL
+		SELECT '가능일2' title
+			, '2023-09-05' "START"
+			, '2023-09-10' "END"
+			, 1 allday
+		FROM dual
+		*/
+		
+		SELECT DISTINCT aaa.datez "START"
+			, aaa.datez "END"
+			, 1 allDay			
+			
+			, aaa.datez AS rndsNm
+			
+			, ccc.yr
+			, bbb.DT_PSBL_TM_QNTTY_ORD AS dtPsblTmQnttyOrd
+			, CASE 
+					WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능'
+					/*
+					WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(NVL(fff.psblTmQnttyCnt,0))||'/'||to_char(ccc.psbl_tm_qntty)										
+					ELSE to_char(NVL(fff.psblTmQnttyCnt,0))||'/'||to_char(bbb.PSBL_TM_QNTTY)
+					*/
+					ELSE '가능'
+					
+				END AS title
+				/*		
+            , ddd.LCTR_PSBL_PRD_ORD
+			, eee.LCTR_PSBL_PRD_ORD
+			*/
+			
+			, CASE 
+					WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능'
+					WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(NVL(fff.psblTmQnttyCnt,0))										
+					ELSE to_char(NVL(fff.psblTmQnttyCnt,0))
+				END AS titleF			
+
+			, CASE 
+					WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능'
+					WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(ccc.psbl_tm_qntty)										
+					ELSE to_char(bbb.PSBL_TM_QNTTY)
+				END AS titleB
+										
+		FROM (
+				/*	Step1.올해-내년의 달력을 만들고, 	*/
+				SELECT 
+					to_date(aa.yr_mnt_day_str,'YYYY-MM-DD')					AS datez
+					, to_char(to_date(aa.yr_mnt_day_str,'YYYY-MM-DD'),'d')	AS num_week
+					, aa.yr_mnt_day_str										AS datez_str
+		
+				FROM (
+				
+				
+						SELECT a.yr||b.mnt					 			AS yr_mnt_str
+							, to_date(a.yr||b.mnt,'YYYYMM')				AS yr_mnt_date
+							, last_day(to_date(a.yr||b.mnt,'YYYYMM')) 	AS yr_mnt_last_day
+							, a.yr||'.'||b.mnt||'.'||c.dayz				AS yr_mnt_day_str
+						FROM (
+								SELECT $yr$ yr
+								FROM dual
+								UNION ALL
+								SELECT $yr$+1 yr
+								FROM dual
+							)a
+							,(
+								SELECT '01' mnt	FROM dual
+								UNION ALL SELECT '02' mnt	FROM dual
+								UNION ALL SELECT '03' mnt	FROM dual
+								UNION ALL SELECT '04' mnt	FROM dual
+								UNION ALL SELECT '05' mnt	FROM dual
+								UNION ALL SELECT '06' mnt	FROM dual
+								UNION ALL SELECT '07' mnt	FROM dual
+								UNION ALL SELECT '08' mnt	FROM dual
+								UNION ALL SELECT '09' mnt	FROM dual
+								UNION ALL SELECT '10' mnt	FROM dual
+								UNION ALL SELECT '11' mnt	FROM dual
+								UNION ALL SELECT '12' mnt	FROM dual
+							)b
+							,(
+								SELECT '01' dayz	FROM dual
+								UNION ALL SELECT '02' mnt	FROM dual
+								UNION ALL SELECT '03' mnt	FROM dual
+								UNION ALL SELECT '04' mnt	FROM dual
+								UNION ALL SELECT '05' mnt	FROM dual
+								UNION ALL SELECT '06' mnt	FROM dual
+								UNION ALL SELECT '07' mnt	FROM dual
+								UNION ALL SELECT '08' mnt	FROM dual
+								UNION ALL SELECT '09' mnt	FROM dual
+								UNION ALL SELECT '10' mnt	FROM dual
+								UNION ALL SELECT '11' mnt	FROM dual
+								UNION ALL SELECT '12' mnt	FROM dual
+								UNION ALL SELECT '13' mnt	FROM dual
+								UNION ALL SELECT '14' mnt	FROM dual
+								UNION ALL SELECT '15' mnt	FROM dual
+								UNION ALL SELECT '16' mnt	FROM dual
+								UNION ALL SELECT '17' mnt	FROM dual
+								UNION ALL SELECT '18' mnt	FROM dual
+								UNION ALL SELECT '19' mnt	FROM dual
+								UNION ALL SELECT '20' mnt	FROM dual
+								UNION ALL SELECT '21' mnt	FROM dual
+								UNION ALL SELECT '22' mnt	FROM dual
+								UNION ALL SELECT '23' mnt	FROM dual
+								UNION ALL SELECT '24' mnt	FROM dual
+								UNION ALL SELECT '25' mnt	FROM dual
+								UNION ALL SELECT '26' mnt	FROM dual
+								UNION ALL SELECT '27' mnt	FROM dual
+								UNION ALL SELECT '28' mnt	FROM dual
+								UNION ALL SELECT '29' mnt	FROM dual
+								UNION ALL SELECT '30' mnt	FROM dual			
+								UNION ALL SELECT '31' mnt	FROM dual
+							)c
+						)aa
+				WHERE to_char(aa.yr_mnt_last_day,'YYYY.MM.DD')>=aa.yr_mnt_day_str
+			)aaa
+			
+			/*	Step2.개별적으로 할당된 일별 시수를 가져오고	*/
+            LEFT OUTER JOIN vea_dt_psbl_tm_qntty_stng bbb
+            on(
+                 	aaa.datez_str=bbb.trgt_dt
+                 	/*
+                 	AND bbb.yr= yr 
+                 	*/
+            )   
+            
+            /*	Step3.신청 불가능 일자를 가져오고	*/
+            LEFT OUTER JOIN vea_lctr_psbl_prd_stng ddd
+            on(
+				ddd.LCTR_PSBL_YN ='N'
+            	AND ddd.LCTR_PSBL_STRT_DT = aaa.datez_str
+            )                             
+            
+            /*	Step4.신청가능 기간을 가져오고	*/
+            LEFT OUTER JOIN vea_lctr_psbl_prd_stng eee
+            on(
+				aaa.datez_str BETWEEN eee.lctr_psbl_strt_dt AND eee.lctr_psbl_ddln_dt
+				AND eee.lctr_psbl_yn='Y'
+            )        
+	        
+	        /*	Step5.사용자 교육신청 차시(요청 이상)를 가져오고	*/
+			LEFT OUTER JOIN (
+			
+			
+						        SELECT   d.edu_hope_dt, SUM(d.chasi) AS psblTmQnttyCnt
+						        	, replace(d.edu_hope_dt,'.','-')
+						        FROM     
+						                 vea_lctr_rnds_stng b ,
+						                 ve_edu_aplct c ,
+						                 ve_edu_chasi d
+						        WHERE    1                =1
+						        AND      b.RNDS_ORD       =c.RNDS_ORD
+						        AND      c.EDU_APLCT_ORD  =d.EDU_APLCT_ORD
+						        AND      NVL(c.use_yn,'Y')='Y'
+						        AND      c.SBMT_YN        = 'Y'
+						                 /* 요청(10), 선정완료(120), 승인(20), 교육확정(60), 수정요청(70), 수정요청 완료(80), 대기 수량(230)을 모두 카운트 한다.
+						                  * 참고용 취소(40)
+						                  *  */
+						        AND      c.aprvl_cd IN ('10',
+						                                '120',
+						                                '20',
+						                                '60',
+						                                '70',
+						                                '80',
+						                                '230')
+						        GROUP BY d.edu_hope_dt						
+			
+			
+			) fff
+			on(
+				aaa.datez=replace(fff.edu_hope_dt,'.','-')
+			)
+                                                  
+            
+            /*	Step5.각 년도의 기본 시수를 가져온다.	*/
+			, vea_lctr_yr_stng ccc
+		WHERE 1=1
+			AND aaa.num_week in(2,3,4,5,6)
+			AND aaa.datez	LIKE ccc.yr||'%'
+			AND eee.LCTR_PSBL_PRD_ORD is not null
+		
+		ORDER BY aaa.datez		
+        	
+	</select>	
+
 	<!-- 강의가능기간 해당 기간의 불가능한 일자 가져오기 -->
 	<select id="VEALctrYrStngMixDAO.selectList_VEALPPS_3" parameterClass="VEAStngVO" resultClass="VEAStngVO">
 		/*	VEALctrYrStngMixDAO.selectList_VEALPPS_3	*/

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList.jsp

@@ -78,9 +78,11 @@
 				listMonth: '일정'
 			},
 			headerToolbar: {
-				left: 'prevYear nextYear today',
+				//left: 'prevYear nextYear today',
+				//left: 'today',
+				left: '',
 				center: 'prev title next',
-				right: ' '
+				right: ''
 				//right: 'dayGridMonth,listMonth'
 			},
 			eventSources: [
@@ -344,9 +346,9 @@
 	<div class="popup_cont">
 		<div class="box">
 			<!-- cont_tit -->
-			<div class="cont_tit">
+			<div class="cont_tit" style="padding-top: 0px;">
 				<input type="hidden" id="searchCalendarCode" value="">
-				<h2>교육가능시수현황</h2>
+				<h2>교육신청가능일자현황</h2>
 				<!-- 
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
@@ -360,7 +362,9 @@
 			<!-- //cont_tit -->
 			
 			<br />
-			<div style="float: right; padding-right: 40px; color: #777777;" id="weekCnt"></div>		
+			<!-- 
+			<div style="float: right; padding-right: 40px; color: #777777;" id="weekCnt"></div>
+			 -->		
 	
 			<div class="cont">
 				<div id="schduleManager"></div>

src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp

@@ -282,6 +282,7 @@
 					
 					<c:forEach var="list" items="${chasiList}" varStatus="status">
 					
+						<!-- 
 						<tr>
 							<th scope="row">
 								<p>강사설문</p>
@@ -301,17 +302,12 @@
 										)" title="팝업 열림">설문등록</button>
 									</c:when>								
 									<c:otherwise>
-										해당설문없음
+										해당설문없음									
-									<!-- 
-										<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
-										onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','20','insert'
-										,'${list.qustnrTmplatId}','${list.qestnrId20}','${list.qustnrRespondId20}'
-										)" title="팝업 열림">설문등록</button>
-										 -->
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>						
+						</tr>	
+						 -->					
 					
 						<tr>
 							<th scope="row">

src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp

@@ -258,6 +258,7 @@
 					
 					<c:forEach var="list" items="${chasiList}" varStatus="status">
 					
+						<!-- 
 						<tr>
 							<th scope="row">
 								<p>강사설문</p>
@@ -278,16 +279,11 @@
 									</c:when>								
 									<c:otherwise>
 										해당설문없음
-									<!-- 
-										<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
-										onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','20','insert'
-										,'${list.qustnrTmplatId}','${list.qestnrId20}','${list.qustnrRespondId20}'
-										)" title="팝업 열림">설문등록</button>
-										 -->
 									</c:otherwise>
 								</c:choose>
 							</td>
-						</tr>						
+						</tr>	
+						 -->					
 					
 						<tr>
 							<th scope="row">