Merge branch 'advc' of http://hylee@vcs.iten.co.kr:9999/hylee/offedu into advc
This commit is contained in:
hylee
commit
9e888a75b8
@ -446,7 +446,9 @@
|
||||
FROM lettnfiledetail
|
||||
WHERE atch_file_id = a.atch_file_id LIMIT 1
|
||||
)
|
||||
AS atchFileNm
|
||||
AS atchFileNm,
|
||||
a.dprtm_nm AS dprtmNm ,
|
||||
a.cn_atch_file_id AS cnAtchFileId
|
||||
FROM ve_prcs_aplct_prd a
|
||||
WHERE 1 = 1
|
||||
<isNotEmpty property="lctrDivCd">
|
||||
@ -498,11 +500,12 @@
|
||||
,a.edu_strt_pnttm AS eduStrtPnttm
|
||||
,a.edu_ddln_pnttm AS eduDdlnPnttm
|
||||
,b.prcs_cn AS prcsCn
|
||||
,(SELECT lctr_plan_atch_file_id
|
||||
<!-- ,(SELECT lctr_plan_atch_file_id
|
||||
FROM vea_prcs_aplct_prd_instr_asgnm
|
||||
WHERE prcs_aplct_prd_ord = a.prcs_aplct_prd_ord
|
||||
)
|
||||
AS lctrPlanRsltAtchFileId
|
||||
AS lctrPlanRsltAtchFileId -->
|
||||
,'' AS lctrPlanRsltAtchFileId <!-- 임시 -->
|
||||
FROM ve_prcs_aplct_prd a
|
||||
, ve_prcs b
|
||||
|
||||
|
||||
@ -970,19 +970,18 @@
|
||||
<div class="util_left">
|
||||
<p>학교(기관)명</p>
|
||||
</div>
|
||||
<div class="util_right">
|
||||
<input type="text" id="searchScholNm" name="searchScholNm" style="margin-left:25px;" class="search_input" placeholder="검색어를 입력하세요" value="${vEEduAplctVO.searchScholNm}" onkeyDown="press(event);">
|
||||
<div class="util_right" style="justify-content:space-between;">
|
||||
<div class="left_box">
|
||||
<input type="text" id="searchScholNm" name="searchScholNm" class="search_input" placeholder="검색어를 입력하세요" value="${vEEduAplctVO.searchScholNm}" onkeyDown="press(event);">
|
||||
<button class="btn_type08" onclick="fncGoList(); return false;">검색</button>
|
||||
<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
|
||||
<div class="btn_wrap btn_layout01" style="width:100%;">
|
||||
<div class="btn_right" style="width:100%;margin-bottom:40px;">
|
||||
<!-- <button type="button" class="btn_type06" onclick="fncInstrMassAsgnm(); return false;">강사배정(전체)X</button> -->
|
||||
</div>
|
||||
<div class="right_box">
|
||||
<!-- <button type="button" class="btn_type06" onclick="fncInstrMassAsgnm(); return false;">강사배정(전체)X</button>-->
|
||||
<button type="button" class="btn_type06" onclick="fncInstrMassAsgnm20231109(); return false;">강사배정(전체)</button>
|
||||
<!-- <button type="button" class="btn_type06" onclick="fncInstrMassAsgnmEA(); return false;">강사배정(개별)X</button> -->
|
||||
<button type="button" class="btn_type06" onclick="fncInstrMassAsgnmEA20231115(); return false;">강사배정(개별)</button>
|
||||
|
||||
<button type="button" style="width:200px;" class="btn_type06" onclick="fncSpcfcInstrAsgnmInfo(); return false;">특정강사배정</button>
|
||||
</div>
|
||||
<!-- <button type="button" class="btn_type06" onclick="fncInstrMassAsgnmEA(); return false;">강사배정(개별)X</button> -->
|
||||
<button type="button" class="btn_type06" onclick="fncInstrMassAsgnmEA20231115(); return false;">강사배정(개별)</button>
|
||||
<button type="button" style="width:200px;" class="btn_type06" onclick="fncSpcfcInstrAsgnmInfo(); return false;">특정강사배정</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -991,13 +990,14 @@
|
||||
<div class="util_left">
|
||||
<p>강사명</p>
|
||||
</div>
|
||||
<div class="util_right">
|
||||
<div class="util_right" style="justify-content:space-between;">
|
||||
<div class="left_box">
|
||||
<input type="text" id="searchInstrNm" name="searchInstrNm" class="search_input" placeholder="검색어를 입력하세요" value="${cryptoUtil.decrypt(vEEduAplctVO.searchInstrNm)}" onkeyDown="press(event);">
|
||||
<div class="btn_wrap btn_layout01" style="width:100%;">
|
||||
<div class="btn_right" style="width:100%;margin-bottom:40px;">
|
||||
</div>
|
||||
<div class="right_box">
|
||||
<button type="button" class="btn_type06" onclick="fncInstrMassAsgnmDelete(); return false;">강사배치삭제(개별)</button>
|
||||
<button type="button" style="width:200px;" class="btn_type06" onclick="fncInstrMassAsgnm30(); return false;">교육수락처리(개별)</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -53,16 +53,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="list_top">
|
||||
<div class="list_top_left">
|
||||
</div>
|
||||
<div class="btn_wrap">
|
||||
|
||||
<span class="cf_text" style="font-size: 16px; font-weight: 400; color: #e40000;line-height: 1.5;left-margin:5px;"
|
||||
>※ 각종 서류 제출은 하단 목록을 클릭하셔서 운영내역
|
||||
<br/> 상세페이지에서 제출해주시기 바랍니다.
|
||||
<div class="list_top_left">
|
||||
<span class="cf_text" style="font-size: 16px; font-weight: 400; color: #e40000;line-height: 1.5;left-margin:5px; text-align:center;">※ 각종 서류 제출은 하단 목록을 클릭하셔서 운영내역 상세페이지에서 제출해주시기 바랍니다.
|
||||
<br/> ('결과보고제출'버튼은 상세 페이지 하단에 있습니다)
|
||||
</span>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
<div class="btn_wrap">
|
||||
<p style="padding-right:5px;font-weight:bold;">신청일 : ${vEEduAplctVO.searchEndSbmtPnttm}</p>
|
||||
<div class="calendar_wrap">
|
||||
<%-- <input type="text" class="calendar" id="searchStartSbmtPnttm" name="searchStartSbmtPnttm" title="시작일 선택" value="${vEEduAplctVO.searchStartSbmtPnttm}"> --%>
|
||||
|
||||
@ -87,16 +87,16 @@
|
||||
|
||||
<div class="list_view">
|
||||
<div class="view_top">
|
||||
<p class="view_title"><c:out value="${info.title}" /></p>
|
||||
<p class="view_title"><c:out value="${detailVO.title}" /></p>
|
||||
<div class="view_info">
|
||||
<p>담당부서 <span><c:out value="${info.dprtmNm}"/></span></p>
|
||||
<p>등록일<span><c:out value="${info.frstRegistPnttm}" /></span></p>
|
||||
<p>담당부서 <span><c:out value="${detailVO.dprtmNm}"/></span></p>
|
||||
<p>등록일<span><c:out value="${detailVO.frstRegistPnttm}" /></span></p>
|
||||
</div>
|
||||
<div class="view_info">
|
||||
<dl>
|
||||
<dd>
|
||||
<c:import url="/cmm/fms/selectBBSFileInfsCustom.do" charEncoding="utf-8">
|
||||
<c:param name="param_atchFileId" value="${info.cnAtchFileId}" />
|
||||
<c:param name="param_atchFileId" value="${detailVO.cnAtchFileId}" />
|
||||
<c:param name="pdf_view" value="Y" />
|
||||
</c:import>
|
||||
</dd>
|
||||
|
||||
@ -84,6 +84,9 @@
|
||||
.btn_down_excel{ height: 40px; padding: 0 18px 0 41px; border: 1px solid #0e8040; margin-left: 2px; background-color: #f9f9f9; color: #0e803f; font-size: 16px; border-radius: 5px; box-sizing: border-box; letter-spacing: -0.5px; background-image: url(../image/content/btn_down_excel.png); background-repeat: no-repeat; background-position: 18px center; vertical-align: middle;}
|
||||
.btn_down_excel:hover{background-color: #f2f2f2;}
|
||||
|
||||
.right_box {text-align:right;}
|
||||
.right_box .btn_type06 {font-size:16px; width:200px; padding:0 3px; margin:1px 0;}
|
||||
|
||||
/* 기타 input select type */
|
||||
input[type="text"]:disabled,input[type="password"]:disabled{border: 1px solid #d5d5d5; background-color: #ededed; color: #888; height: 40px; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px;}
|
||||
input[type="text"],input[type="password"],select{height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px; color: #222; box-sizing: border-box;}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user