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 2024-01-02 16:48:57 +09:00
commit 913b4f8736
19 changed files with 215 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java
View File

@ -44,4 +44,7 @@ public interface InnorixFileService {
RestResponse insertInnorixReqRsltAjax(AdrInnorixFileVO adrInnorixFileVO);
//기반,기소 결과보고서 저장
RestResponse insertInnorixDocAtchFile(AdrInnorixFileVO adrInnorixFileVO);
}

30
src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java
View File

@ -606,4 +606,34 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I
return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now());
}
@Override
public RestResponse insertInnorixDocAtchFile(AdrInnorixFileVO adrInnorixFileVO) {
List<FileVO> result = null;
try {
// 파일 저장 후 저장할 file 정보를 받아옴
result = this.insertFileData(adrInnorixFileVO);
// 파일 정보 insert
String atchFileId = fileManageDAO.insertFileInfs(result);
VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO = new VEAPrcsAplctPrdInstrAsgnmVO();
vEAPrcsAplctPrdInstrAsgnmVO.setDocAtchFileId(atchFileId);
vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(adrInnorixFileVO.getUniqId());
vEAPrcsAplctPrdInstrAsgnmVO.setPrcsAplctPrdOrd(adrInnorixFileVO.getPrcsAplctPrdOrd());
vEAPrcsAplctPrdInstrAsgnmVO.setUserId(adrInnorixFileVO.getUniqId());
//저장
vEAPrcsAplctPrdInstrAsgnmService.updatDocAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO);
} catch (Exception e) {
e.printStackTrace();
return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now());
}
return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now());
}
}

24
src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java
View File

@ -281,4 +281,28 @@ public class InnorixFileController {
return ResponseEntity.ok(innorixService.insertInnorixDocFile(adrInnorixFileVO));
}
/**
* @methodName : insertInnorixDocAtchFile
* @author : 이호영
* @date : 2023.07.20
* @description : 파일 insert 전용
* @param adrInnorixFileVO
* @return
* @throws Exception
*/
@RequestMapping(value = {"/web/common/insertInnorixDocAtchFileAjax.do"}, method = RequestMethod.POST)
public ResponseEntity<RestResponse> insertInnorixDocAtchFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception {
//로그인 권한정보 불러오기
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
if(userId.equals("")) {
return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now()));
}
adrInnorixFileVO.setUniqId(userId);
return ResponseEntity.ok(innorixService.insertInnorixDocAtchFile(adrInnorixFileVO));
}
}

5
src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java
View File

@ -272,6 +272,11 @@ public class VEFndtnAsgnmController {
model.addAttribute("instrAsgnmList", instrAsgnmList);
}
//강사 강의계획서, 결과보고서 정보
vEPrcsDetailVO.setUserId(loginVO.getUniqId());
VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO);
model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail);
//사용자 교육신청 차시 리스트 - 설문정보
{
//사용자 교육신청 차시 리스트

5
src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java
View File

@ -270,6 +270,11 @@ public class VESspnIdtmtAsgnmController {
model.addAttribute("instrAsgnmList", instrAsgnmList);
}
//강사 강의계획서 정보
vEPrcsDetailVO.setUserId(loginVO.getUniqId());
VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO);
model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail);
//사용자 교육신청 차시 리스트 - 설문정보
{
//사용자 교육신청 차시 리스트

2
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java
View File

@ -23,4 +23,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService {
void updateEduStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO);
VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO);
void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO);
}

5
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java
View File

@ -55,4 +55,9 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO {
public VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO) {
return (VEAPrcsAplctPrdInstrAsgnmVO) select("VEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail", vEDetailVO);
}
public void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) {
update("VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO);
}
}

7
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java
View File

@ -81,4 +81,11 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst
return vEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail(vEDetailVO);
}
@Override
public void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) {
vEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO);
}
}

13
src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml
View File

@ -209,5 +209,16 @@
</isNotEmpty>
</select>
<!-- 결과보고 update -->
<update id="VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId" parameterClass="vEAPrcsAplctPrdInstrAsgnmVO">
/* VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId */
UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM
SET doc_atch_file_id = #docAtchFileId#
, last_updusr_id = #lastUpdusrId#
, last_updt_pnttm = sysdate
WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd#
AND user_id = #userId#
</update>
</sqlMap>

8
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml
View File

@ -528,10 +528,10 @@
<!-- 교육시작기간 -->
<isNotEmpty property="srchKwd2_1">
AND a.edu_strt_pnttm >= #srchKwd2_1#
AND REPLACE(a.edu_strt_pnttm, '.', '') >= REPLACE(#srchKwd2_1#, '.', '')
</isNotEmpty>
<isNotEmpty property="srchKwd2_2">
AND #srchKwd2_2# >= a.edu_strt_pnttm
AND REPLACE(#srchKwd2_2#, '.', '') >= REPLACE(a.edu_strt_pnttm, '.', '')
</isNotEmpty>
@ -549,10 +549,10 @@
<!-- 실무역량강화, 기소유예의 종료 기준 구분 -->
<isNotEmpty property="endPnttm">
<isEqual property="lctrDivCd" compareValue="50">
AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') <![CDATA[ > ]]> REPLACE(a.edu_ddln_pnttm, '.' , '')
AND TO_CHAR(SYSDATE, 'YYYYMMDD') <![CDATA[ > ]]> REPLACE(a.edu_ddln_pnttm, '.' , '')
</isEqual>
<isEqual property="lctrDivCd" compareValue="60">
AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') <![CDATA[ > ]]> REPLACE(a.end_pnttm, '.' , '')
AND TO_CHAR(SYSDATE, 'YYYYMMDD') <![CDATA[ > ]]> REPLACE(a.edu_strt_pnttm, '.' , '')
</isEqual>
</isNotEmpty>

17
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -463,18 +463,20 @@
<div class="tb_type01">
<table>
<colgroup>
<col style="width: 210px;"><!-- name -->
<col style="width: 150px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 -->
<col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 결과보고서 -->
<col style="width: 100px;"><!-- 신청상태 -->
</colgroup>
<thead>
<tr>
<th>강사명</th>
<th>연락처</th>
<th>확정여부</th>
<th>강의계획서</th>
<th>강의계획서</th>
<th>결과보고서</th>
<th>삭제</th>
</tr>
</thead>
@ -497,6 +499,11 @@
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import>
</td>
<td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.docAtchFileId}" />
</c:import>
</td>
<td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td>
@ -505,7 +512,7 @@
</c:when>
<c:otherwise>
<tr>
<td colspan="4">강사 배치 정보가 없습니다.</td>
<td colspan="6">강사 배치 정보가 없습니다.</td>
</tr>
</c:otherwise>
</c:choose>

13
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp
View File

@ -460,11 +460,12 @@
<div class="tb_type01">
<table>
<colgroup>
<col style="width: 210px;"><!-- name -->
<col style="width: 150px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 -->
<col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 결과보고서 -->
<col style="width: 100px;"><!-- 신청상태 -->
</colgroup>
<thead>
<tr>
@ -472,6 +473,7 @@
<th>연락처</th>
<th>확정여부</th>
<th>강의계획서</th>
<th>결과보고서</th>
<th>삭제</th>
</tr>
</thead>
@ -494,6 +496,11 @@
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import>
</td>
<td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.docAtchFileId}" />
</c:import>
</td>
<td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td>
@ -502,7 +509,7 @@
</c:when>
<c:otherwise>
<tr>
<td colspan="4">강사 배치 정보가 없습니다.</td>
<td colspan="6">강사 배치 정보가 없습니다.</td>
</tr>
</c:otherwise>
</c:choose>

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

@ -86,6 +86,7 @@
"prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val()
, "innorixFileListVO": data
, "successMsg" : "제출 완료되었습니다."
, "fileType" : "LCTRPLAN"
}
if(fn_innorixCmmAjax(sendData, url) == "OK")
{

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

@ -17,7 +17,7 @@
<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
<style>
#lctrPlan{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;}
#docAtch{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;}
.innorix_basic div.irx_filetree.empty-uploader{background: url(/offedu/visitEdu/usr/publish/images/content/dropzone_file_before.png) no-repeat center; height: 150px !important;}
.irx_filetree,.innorix_basic div.irx_infoBox{height: 150px !important;}
</style>
@ -46,9 +46,9 @@
//강의계획서 컨트롤 생성
control1 = innorix.create({
el : '#lctrPlan', // 컨트롤 출력 객체 ID
el : '#docAtch', // 컨트롤 출력 객체 ID
installUrl: '<c:url value="/innorix/install/install.html" />', // Agent 설치 페이지
uploadUrl: '<c:url value="/innorix/exam/upload.jsp?el=lctrPlan" />', // 업로드 URL
uploadUrl: '<c:url value="/innorix/exam/upload.jsp?el=docAtch" />', // 업로드 URL
maxFileCount : 1, // 첨부가능 파일 전체 개수
width : 870, // 컨트롤 출력 너비(pixel)
height : 80, // 컨트롤 출력 높이(pixel)
@ -58,16 +58,16 @@
//파일 추가 이벤트
control1.on('afterAddFiles', function (p) {
$('.lctrPlan_totalfileSize').text(getStrFileSize(p[0].fileSize)) ;
$('.lctrPlan_totalfileCount').text(p.length);
$('.docAtch_totalfileSize').text(getStrFileSize(p[0].fileSize)) ;
$('.docAtch_totalfileCount').text(p.length);
});
//파일 삭제 이벤트
control1.on('removeFiles', function (p) {
$('.lctrPlan_totalfileSize').text('0MB') ;
$('.lctrPlan_totalfileCount').text('0');
$('.docAtch_totalfileSize').text('0MB') ;
$('.docAtch_totalfileCount').text('0');
if(control1Tmprr == 'Y'){
if(confirm("삭제하시겠습니까?")){
innorixDelRprtAtchFile(p[0].uniqueFileName, 'lctrPlan_rslt_atch_file_id')
innorixDelRprtAtchFile(p[0].uniqueFileName, 'docAtch_rslt_atch_file_id')
control1Tmprr = 'N';
control1Chg = 'Y';
$("#control1DownBtn").css('display', 'none');
@ -81,15 +81,16 @@
control1.on('uploadComplete', function (p) {
/* fn_callBackInnorixInsert(p.files); */
var data = p.files;
var url = "<c:url value='/web/common/insertInnorixLctrPlanFileAjax.do' />";
var url = "<c:url value='/web/common/insertInnorixDocAtchFileAjax.do' />";
var sendData = {
"prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val()
, "innorixFileListVO": data
, "successMsg" : "제출 완료되었습니다."
, "fileType" : "DOCATCH"
}
if(fn_innorixCmmAjax(sendData, url) == "OK")
{
alert("업로드 완료");
location.reload();
}
});
});
@ -269,12 +270,12 @@
</th>
<td colspan="3"><ve:code codeId="VEA004" code="${info.ddlnCd}"/></td>
</tr>
<c:if test="${info.lctrPlanRsltAtchFileId != null && info.lctrPlanRsltAtchFileId != ''}">
<c:if test="${instrInfo.lctrPlanAtchFileId != null && instrInfo.lctrPlanAtchFileId != ''}">
<tr class="trLength4">
<th scope="row"><p>강의계획서</p></th>
<td>
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${info.lctrPlanRsltAtchFileId}" />
<c:param name="param_atchFileId" value="${instrInfo.lctrPlanAtchFileId}" />
</c:import>
</td>
</tr>
@ -325,7 +326,32 @@
</td>
</tr>
</c:forEach>
<tr class="trLength4">
<th scope="row"><p>결과보고</p></th>
<td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap">
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">강의계획서 파일찾기</button>
<button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div>
<div id="docAtch"></div><br/>
<div class="file_cf">
<div class="cf_left">
<p>최대 <span class="docAtch_limitFileCount">1</span>개</p>
</div>
<div class="cf_right">
<p>등록된 파일 <span class="upload_number docAtch_totalfileCount">0</span>개</p>
<span class="upload_number docAtch_totalfileSize">0MB</span>
</div>
</div>
</c:if>
<c:if test="${instrInfo.docAtchFileId != null && instrInfo.docAtchFileId != ''}">
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${instrInfo.docAtchFileId}" />
</c:import>
</c:if>
</td>
</tr>
</tbody>
</table>
</div>

6
src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp
View File

@ -26,7 +26,7 @@
function linkPage(pageNo){
var listForm = document.listForm ;
listForm.pageIndex.value = pageNo ;
listForm.action = "<c:url value='/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.do'/>";
listForm.action = "<c:url value='/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.do'/>";
listForm.submit();
}
@ -78,12 +78,12 @@
<div class="btn_wrap">
<div class="calendar_wrap">
<%-- <input type="text" name="searchEduHopeStartDt" value="${vEInstrAsgnmVO.searchEduHopeStartDt}" class="calendar" title="시작일 선택"> --%>
<duet-date-picker identifier="date" name="srchKwd2_1" class="startDate" value="${vEInstrAsgnmVO.searchEduHopeStartDt}"></duet-date-picker>
<duet-date-picker identifier="date" name="srchKwd2_1" class="startDate" value="${vEPrcsDetailVO.srchKwd2_1}"></duet-date-picker>
</div>
~
<div class="calendar_wrap">
<%-- <input type="text" name="searchEduHopeEndDt" value="${vEInstrAsgnmVO.searchEduHopeEndDt}" class="calendar" title="종료일 선택"> --%>
<duet-date-picker identifier="date" name="srchKwd2_2" class="endDate" value="${vEInstrAsgnmVO.searchEduHopeEndDt}"></duet-date-picker>
<duet-date-picker identifier="date" name="srchKwd2_2" class="endDate" value="${vEPrcsDetailVO.srchKwd2_2}"></duet-date-picker>
</div>
<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
<button type="button" class="btnType01" onclick="linkPage(1)">검색</button>

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

@ -86,6 +86,7 @@
"prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val()
, "innorixFileListVO": data
, "successMsg" : "제출 완료되었습니다."
, "fileType" : "LCTRPLAN"
}
if(fn_innorixCmmAjax(sendData, url) == "OK")
{

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

@ -17,7 +17,7 @@
<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
<style>
#lctrPlan{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;}
#docAtch{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;}
.innorix_basic div.irx_filetree.empty-uploader{background: url(/offedu/visitEdu/usr/publish/images/content/dropzone_file_before.png) no-repeat center; height: 150px !important;}
.irx_filetree,.innorix_basic div.irx_infoBox{height: 150px !important;}
</style>
@ -46,9 +46,9 @@
//강의계획서 컨트롤 생성
control1 = innorix.create({
el : '#lctrPlan', // 컨트롤 출력 객체 ID
el : '#docAtch', // 컨트롤 출력 객체 ID
installUrl: '<c:url value="/innorix/install/install.html" />', // Agent 설치 페이지
uploadUrl: '<c:url value="/innorix/exam/upload.jsp?el=lctrPlan" />', // 업로드 URL
uploadUrl: '<c:url value="/innorix/exam/upload.jsp?el=docAtch" />', // 업로드 URL
maxFileCount : 1, // 첨부가능 파일 전체 개수
width : 870, // 컨트롤 출력 너비(pixel)
height : 80, // 컨트롤 출력 높이(pixel)
@ -58,16 +58,16 @@
//파일 추가 이벤트
control1.on('afterAddFiles', function (p) {
$('.lctrPlan_totalfileSize').text(getStrFileSize(p[0].fileSize)) ;
$('.lctrPlan_totalfileCount').text(p.length);
$('.docAtch_totalfileSize').text(getStrFileSize(p[0].fileSize)) ;
$('.docAtch_totalfileCount').text(p.length);
});
//파일 삭제 이벤트
control1.on('removeFiles', function (p) {
$('.lctrPlan_totalfileSize').text('0MB') ;
$('.lctrPlan_totalfileCount').text('0');
$('.docAtch_totalfileSize').text('0MB') ;
$('.docAtch_totalfileCount').text('0');
if(control1Tmprr == 'Y'){
if(confirm("삭제하시겠습니까?")){
innorixDelRprtAtchFile(p[0].uniqueFileName, 'lctrPlan_rslt_atch_file_id')
innorixDelRprtAtchFile(p[0].uniqueFileName, 'docAtch_rslt_atch_file_id')
control1Tmprr = 'N';
control1Chg = 'Y';
$("#control1DownBtn").css('display', 'none');
@ -81,15 +81,16 @@
control1.on('uploadComplete', function (p) {
/* fn_callBackInnorixInsert(p.files); */
var data = p.files;
var url = "<c:url value='/web/common/insertInnorixLctrPlanFileAjax.do' />";
var url = "<c:url value='/web/common/insertInnorixDocAtchFileAjax.do' />";
var sendData = {
"prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val()
, "innorixFileListVO": data
, "successMsg" : "제출 완료되었습니다."
, "fileType" : "DOCATCH"
}
if(fn_innorixCmmAjax(sendData, url) == "OK")
{
alert("업로드 완료");
location.reload();
}
});
});
@ -255,6 +256,16 @@
</th>
<td colspan="3"><ve:code codeId="VEA004" code="${info.ddlnCd}"/></td>
</tr>
<c:if test="${instrInfo.lctrPlanAtchFileId != null && instrInfo.lctrPlanAtchFileId != ''}">
<tr class="trLength4">
<th scope="row"><p>강의계획서</p></th>
<td>
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${instrInfo.lctrPlanAtchFileId}" />
</c:import>
</td>
</tr>
</c:if>
<c:forEach var="list" items="${chasiList}" varStatus="status">
@ -301,7 +312,32 @@
</td>
</tr>
</c:forEach>
<tr class="trLength4">
<th scope="row"><p>결과보고</p></th>
<td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap">
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">강의계획서 파일찾기</button>
<button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div>
<div id="docAtch"></div><br/>
<div class="file_cf">
<div class="cf_left">
<p>최대 <span class="docAtch_limitFileCount">1</span>개</p>
</div>
<div class="cf_right">
<p>등록된 파일 <span class="upload_number docAtch_totalfileCount">0</span>개</p>
<span class="upload_number docAtch_totalfileSize">0MB</span>
</div>
</div>
</c:if>
<c:if test="${instrInfo.docAtchFileId != null && instrInfo.docAtchFileId != ''}">
<c:import url="/cmm/fms/selectScholSealInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${instrInfo.docAtchFileId}" />
</c:import>
</c:if>
</td>
</tr>
</tbody>
</table>
</div>

4
src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp
View File

@ -78,12 +78,12 @@
<div class="btn_wrap">
<div class="calendar_wrap">
<%-- <input type="text" name="searchEduHopeStartDt" value="${vEInstrAsgnmVO.searchEduHopeStartDt}" class="calendar" title="시작일 선택"> --%>
<duet-date-picker identifier="date" name="srchKwd2_1" class="startDate" value="${vEInstrAsgnmVO.searchEduHopeStartDt}"></duet-date-picker>
<duet-date-picker identifier="date" name="srchKwd2_1" class="startDate" value="${vEPrcsDetailVO.srchKwd2_1}"></duet-date-picker>
</div>
~
<div class="calendar_wrap">
<%-- <input type="text" name="searchEduHopeEndDt" value="${vEInstrAsgnmVO.searchEduHopeEndDt}" class="calendar" title="종료일 선택"> --%>
<duet-date-picker identifier="date" name="srchKwd2_2" class="endDate" value="${vEInstrAsgnmVO.searchEduHopeEndDt}"></duet-date-picker>
<duet-date-picker identifier="date" name="srchKwd2_2" class="endDate" value="${vEPrcsDetailVO.srchKwd2_2}"></duet-date-picker>
</div>
<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
<button type="button" class="btnType01" onclick="linkPage(1)">검색</button>

4
src/main/webapp/innorix/innorix_dev.js
View File

@ -17,7 +17,9 @@
// 개발 라이센스 적용 (만료 23.09.30)
//var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto=";
// 개발 라이센스 적용 (만료 23.12.31)
var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc=";
//var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc=";
// 개발 라이센스 적용 (만료 24.2.2)
var INNORIX_LICENSE = "vbdFWf6nF9xHZEBSPPSXvliqeqwJyAYFtnkYqhngYVfOoE/y4XBoUEslG3l1g7oSVdlPPlatW2oNMWbgeo8L60K1Pjs=";
var INNORIX_VERSION = '1.1.3.458';
var INNORIX_WIN_VERSION = '1.1.3.458';