Merge branch 'jiwoo'

This commit is contained in:
JIWOO 2025-10-30 16:46:02 +09:00
commit 01060da67e
9 changed files with 56 additions and 49 deletions

View File

@ -661,8 +661,8 @@
<col style="width: 150px;"><!-- name --> <col style="width: 150px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 410px;"><!-- 결과보고서 --> <%-- <col style="width: 410px;"><!-- 결과보고서 --> --%>
<col style="width: 100px;"><!-- 신청상태 --> <col style="width: 100px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -670,8 +670,8 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>결과보고서</th> <!-- <th>결과보고서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -689,7 +689,7 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
@ -702,8 +702,8 @@
<c:if test="${empty list.lctrPlanAtchFileId}"> <c:if test="${empty list.lctrPlanAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.docAtchFileId}" /> <c:param name="param_atchFileId" value="${list.docAtchFileId}" />
</c:import> </c:import>
@ -716,7 +716,7 @@
<c:if test="${empty list.docAtchFileId}"> <c:if test="${empty list.docAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -725,7 +725,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="6">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -612,7 +612,7 @@
<col style="width: 210px;"><!-- name --> <col style="width: 210px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -620,7 +620,7 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -638,11 +638,11 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -651,7 +651,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="5">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -737,8 +737,8 @@
<col style="width: 150px;"><!-- name --> <col style="width: 150px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 410px;"><!-- 결과보고서 --> <%-- <col style="width: 410px;"><!-- 결과보고서 --> --%>
<col style="width: 100px;"><!-- 신청상태 --> <col style="width: 100px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -746,8 +746,8 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>결과보고서</th> <!-- <th>결과보고서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -765,7 +765,7 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
@ -778,8 +778,8 @@
<c:if test="${empty list.lctrPlanAtchFileId}"> <c:if test="${empty list.lctrPlanAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.docAtchFileId}" /> <c:param name="param_atchFileId" value="${list.docAtchFileId}" />
</c:import> </c:import>
@ -792,7 +792,7 @@
<c:if test="${empty list.docAtchFileId}"> <c:if test="${empty list.docAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -801,7 +801,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="6">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -609,7 +609,7 @@
<col style="width: 210px;"><!-- name --> <col style="width: 210px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -617,7 +617,7 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -635,11 +635,11 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -648,7 +648,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="5">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -661,8 +661,8 @@
<col style="width: 150px;"><!-- name --> <col style="width: 150px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 410px;"><!-- 결과보고서 --> <%-- <col style="width: 410px;"><!-- 결과보고서 --> --%>
<col style="width: 100px;"><!-- 신청상태 --> <col style="width: 100px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -670,8 +670,8 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>결과보고서</th> <!-- <th>결과보고서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -689,7 +689,7 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
@ -702,8 +702,8 @@
<c:if test="${empty list.lctrPlanAtchFileId}"> <c:if test="${empty list.lctrPlanAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'planFndth')">강의계획서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.docAtchFileId}" /> <c:param name="param_atchFileId" value="${list.docAtchFileId}" />
</c:import> </c:import>
@ -716,7 +716,7 @@
<c:if test="${empty list.docAtchFileId}"> <c:if test="${empty list.docAtchFileId}">
<button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button> <button type="button" class="btn_type06" onclick="fncAttachFileCreate('${list.userId}', 'rprtFndth')">결과보고서 등록</button>
</c:if> </c:if>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -725,7 +725,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="6">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -602,7 +602,7 @@
<col style="width: 210px;"><!-- name --> <col style="width: 210px;"><!-- name -->
<col style="width: auto;"><!-- 제출일 --> <col style="width: auto;"><!-- 제출일 -->
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
<col style="width: 410px;"><!-- 강의계획서 --> <%-- <col style="width: 410px;"><!-- 강의계획서 --> --%>
<col style="width: 210px;"><!-- 신청상태 --> <col style="width: 210px;"><!-- 신청상태 -->
</colgroup> </colgroup>
<thead> <thead>
@ -610,7 +610,7 @@
<th>강사명</th> <th>강사명</th>
<th>연락처</th> <th>연락처</th>
<th>확정여부</th> <th>확정여부</th>
<th>강의계획서</th> <!-- <th>강의계획서</th> -->
<th>삭제</th> <th>삭제</th>
</tr> </tr>
</thead> </thead>
@ -628,11 +628,11 @@
<td> <td>
<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/> <ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
</td> </td>
<td> <%-- <td>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" /> <c:param name="param_atchFileId" value="${list.lctrPlanAtchFileId}" />
</c:import> </c:import>
</td> </td> --%>
<td> <td>
<button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button> <button type="button" class="btn_type01" onclick="fn_delInstr('<c:out value="${list.userId }" />')">삭제</button>
</td> </td>
@ -641,7 +641,7 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td colspan="5">강사 배치 정보가 없습니다.</td> <td colspan="4">강사 배치 정보가 없습니다.</td>
</tr> </tr>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

View File

@ -36,13 +36,14 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
var $ddlnCdStts = $(".ddlnCdStts"); var $ddlnCdStts = $(".ddlnCdStts");
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
// 상태에따라 싱천버튼 활성화 비활성화 // 상태에따라 싱천버튼 활성화 비활성화
var regStatus = true; var regStatus = true;

View File

@ -36,14 +36,14 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
var $ddlnCdStts = $(".ddlnCdStts"); var $ddlnCdStts = $(".ddlnCdStts");
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
// 상태에따라 싱천버튼 활성화 비활성화 // 상태에따라 싱천버튼 활성화 비활성화
var regStatus = true; var regStatus = true;

View File

@ -26,8 +26,12 @@
</style> </style>
<script type="text/javaScript" language="javascript"> <script type="text/javaScript" language="javascript">
$(document).ready(function(){ $(document).ready(function(){
// 상태값 확인 // 상태값 확인
ddlnCdSttsChk(); ddlnCdSttsChk();
@ -36,13 +40,15 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
var $ddlnCdStts = $(".ddlnCdStts"); var $ddlnCdStts = $(".ddlnCdStts");
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
// 상태에따라 싱천버튼 활성화 비활성화 // 상태에따라 싱천버튼 활성화 비활성화
var regStatus = true; var regStatus = true;