<기능개선>

1. PMS NO : 6638
2. (주요)작업내용 :
2. 현재 신청 중인 교육 페이지에서 -선택 가능한 교육 종료일이 없습니다 => -선택 가능한 교육일정이 없습니다.
로 문구변경 단 교육장교육일 경우에만 
3. 수강신청 조회 한 페이지에서 접수중 위에 교육장 선택 추가 (교육장교육 신철 시 교육장 선택탭? 이 있는데 온라인 교육은 미적용상태.
4.  온라인교육 신청 시 소속선택 부분에서 업체선택 시 업체정보란이 나오지 않아 정보 입력이 불가능
그 상태에서 수강신청을 누르면 알림창이 출력되며 신청이 되지 않음
5. 문구수정 
6. 문구추가
7번 문구삭제 및 추가
8번 나의 할 일에서 교육장은 안보이게

(1) 
FO\Views\Course\SmartSearch.cshtml 
FO\Views\Course\ApplyEdu.cshtml
FO\Views\Course\ApplyAgree.cshtml
FO\Views\Course\ApplyPay.cshtml
FO\Views\Course\ApplyComplete.cshtml
Model\BaseModel.cs
FO\Views\My\Index.cshtml
Dao\MyBatis\Maps\Lect.xml
This commit is contained in:
ljs0531 2022-09-04 10:12:46 +00:00
parent 0ee5d3636c
commit a147990fa3
8 changed files with 390 additions and 329 deletions

View File

@ -1368,9 +1368,10 @@
,a.time5,a.time6
,a.rno
,a.iscomplete
,a.studytime,
a.studyplacename studyplacename,
,a.studytime
,a.studyplacename studyplacename,
a.studyplace
,a.cshape
from(
select 1 dtype
,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7
@ -1400,6 +1401,7 @@
cc.cname studyplacename,
cmis.studyplace,
l.cdt
,c.cshape
from payitem a
inner join pay b on b.payno=a.payno and b.pstatus in (21,22,51,55) and b.rstatus &lt; 2
inner join cm c on c.cmno=a.itemno and c.rstime &lt; <include refid="sql.now"></include> and c.retime &gt; <include refid="sql.now"></include>
@ -1425,6 +1427,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 2 dtype
,c.tyear intval,c.tseq intval2,b.cshape intval3,0 intval4,0 intval5,a.isrebate intval6,a.cmno intval7,0 intval8
@ -1452,6 +1455,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join pay e on e.payno = a.payno
inner join cm b on b.cmno=a.cmno
@ -1475,6 +1479,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 3 dtype
,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@ -1488,6 +1493,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
inner join cminning c on c.cmno=b.cmno and c.isonline=1 and c.isscd = 0
@ -1511,6 +1517,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 3 dtype
,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@ -1524,6 +1531,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1-->
left outer join comcode bc on bc.ccode=b.studyplace
@ -1547,6 +1555,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 3 dtype
,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@ -1560,6 +1569,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
left outer join comcode bc on bc.ccode=b.studyplace
@ -1583,6 +1593,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 3 dtype
,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@ -1594,8 +1605,9 @@
,row_number() over(order by b.setime) rno
,a.iscomplete
,b.studytime,
cc.cname studyplacename,
cc.cname as studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
left outer join comcode bc on bc.ccode=b.studyplace
@ -1619,6 +1631,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 3 dtype
,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
@ -1632,6 +1645,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from lect a
inner join cm b on b.cmno=a.cmno <!--and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>-->
left outer join comcode bc on bc.ccode=b.studyplace
@ -1655,6 +1669,7 @@
,a.studytime,
a.studyplacename studyplacename,
a.studyplace
,a.cshape
from (
select 4 dtype
,a.scdno intval,a.dday intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,b.cmno intval7,0 intval8
@ -1666,6 +1681,7 @@
,b.studytime,
cc.cname studyplacename,
cmis.studyplace
,b.cshape
from alarms a
inner join cm b on b.cmno=a.cmexno
inner join lect c on c.cmno=b.cmno and c.userno=a.userno and c.status=1 and c.ischanged=0

View File

@ -149,7 +149,7 @@
- 건설사업관리기술인은 <span style="color:red;">감리업무를 수행하는 기술인</span>을 말합니다.<br />
- 승급교육일 경우 등급은 <span style="color:red;">승급 후 등급이 기재되어야</span> 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.<br />
- 승급교육 또는 계속교육을 인정받으려면 <span style="color:red;">기본교육 및 최초교육을 먼저 이수하여야 합니다.</span><br />
- 모든 최초,승급,계속 교육 등은 직무분야 교육이며<span style="color:red;">전문분야 관련으로 따로 이수하여야 할 교육은 없습니다.
- 모든 최초,승급,계속 교육 등은 직무분야 교육이며 <span style="color:red;">전문분야 관련으로 따로 이수하여야 할 교육은 없습니다.
</strong>
</p>

View File

@ -78,6 +78,16 @@ else
</div>
</li>
</ul>
<p class="subTxt">
<br />
<h4 class="clsTitle">교육비 입금기한 안내</h4>
- 온라인교육 : 신청일로 부터 한 달 이내<br />
- 교육장교육 : 교육시작일로 부터 7일 전까지 (단, 교육시작일이 7일 이내 인 경우 교육시작일 전 까지)<br />
</p>
if (Model.Pay.isready == 0 || Model.Pay.pstatus == 1 || Model.Pay.pstatus == 22)
{
<h4 class="clsTitle">결제정보</h4>
@ -101,7 +111,7 @@ else
</tr>
<tr>
<th>주문접수일</th>
<td>@DateTime.Now.ToString("yyyy-MM-dd HH:mm") (만료일: @Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))</td>
<td>@DateTime.Now.ToString("yyyy-MM-dd HH:mm") @*(만료일: @Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))*@</td>
</tr>
}
<tr>
@ -111,7 +121,7 @@ else
</tbody>
</table>
<ul class="clsBtn society">
<li><a href="/My/Paies">결제현황 이동</a></li>
<li><a href="/My/Paies">결제현황 관리</a></li>
<li><a href="/My/Index">마이페이지</a></li>
<li><a href="/">계속 신청하기</a></li>
</ul>

View File

@ -157,38 +157,38 @@
※수료증 소속부분에 기재될 내용으로 소속업체가 없으면 개인을 선택해 주세요.
</p>
</div>
@if (Model.CM.isrefund ==1)
@if (Model.CM.isrefund == 1)
{
<div class="div-rbankInfo">
<h4 class="clsTitle">환급금 수령계좌 등록<span style="color: red; font-weight: 700;"> (법인계좌만 입력가능)</span></h4>
<p class="subDsc">*는 필수 입력사항입니다.</p>
<table class="clsTable">
<tbody>
<tr>
<th class="req">은행명</th>
<td><input type="text" name="rbankname" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankname" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankname : string.Empty)" /></td>
</tr>
<tr>
<th class="req">계좌번호</th>
<td><input type="number" name="rbankacc" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankacc" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankacc : string.Empty)" /></td>
</tr>
<tr>
<th class="req">예금주</th>
<td><input type="text" name="rbankowner" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankowner" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankowner : string.Empty)" /></td>
</tr>
<tr>
<th class="req">고용보험관리번호</th>
<td><input type="number" name="eino" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="eino" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.eino : string.Empty)" /><button type="button" onclick="insuranceguide()" style="margin-left:10px;">고용보험관리번호 안내</button></td>
</tr>
</tbody>
</table>
<p class="subDsc mt10">※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. <span style="color:red;">(개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)</span></p>
</div>
<div class="div-rbankInfo">
<h4 class="clsTitle">환급금 수령계좌 등록<span style="color: red; font-weight: 700;"> (법인계좌만 입력가능)</span></h4>
<p class="subDsc">*는 필수 입력사항입니다.</p>
<table class="clsTable">
<tbody>
<tr>
<th class="req">은행명</th>
<td><input type="text" name="rbankname" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankname" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankname : string.Empty)" /></td>
</tr>
<tr>
<th class="req">계좌번호</th>
<td><input type="number" name="rbankacc" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankacc" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankacc : string.Empty)" /></td>
</tr>
<tr>
<th class="req">예금주</th>
<td><input type="text" name="rbankowner" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="rbankowner" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankowner : string.Empty)" /></td>
</tr>
<tr>
<th class="req">고용보험관리번호</th>
<td><input type="number" name="eino" onkeydown="checkSpacebar()" onKeypress='if ((event.keyCode > 32 && event.keyCode < 48) || (event.keyCode > 57 && event.keyCode < 65) || (event.keyCode > 90 && event.keyCode < 97) || (event.keyCode < 128 && event.keyCode > 122)) event.returnValue = false;' id="eino" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.eino : string.Empty)" /><button type="button" onclick="insuranceguide()" style="margin-left:10px;">고용보험관리번호 안내</button></td>
</tr>
</tbody>
</table>
<p class="subDsc mt10">※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. <span style="color:red;">(개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)</span></p>
</div>
}
<div id="postlayer" class="daumpost"><a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a></div>
@if (Model.CM.isrefund == 1)
{
@*@if (Model.CM.isrefund == 1)
{*@
<div class="div-companyInfo">
<h4 class="clsTitle">회사정보 확인</h4>
<p class="subDsc">*는 필수 입력사항입니다.</p>
@ -273,124 +273,124 @@
</tbody>
</table>
</div>
}
<h4 class="clsTitle">개인정보 확인</h4>
<p class="subDsc">*는 필수 입력사항입니다.</p>
@Html.HiddenFor(x => x.User.userno)
<table class="clsTable">
<tbody>
<tr>
<th class="req">이름</th>
<td><p>@Html.TextBoxFor(x => x.User.username, new { @class = "apylpt", @maxlength = "10", @style = "background-color:#ddd;", @readonly = true })</p></td>
</tr>
<tr>
<th class="req">주민등록번호</th>
<td>
<ul class="usrNum">
<li>@Html.TextBoxFor(x => x.User.userpno1, new { @maxlength = "6", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.userpno2, new { @maxlength = "7", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">휴대전화</th>
<td>
<ul class="usrPhn">
<li>@Html.TextBoxFor(x => x.User.mobile1, new { @maxlength = "3", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.mobile2, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.mobile3, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">이메일</th>
<td>
<ul class="clsMail">
<li>@Html.TextBoxFor(x => x.User.email1, new { @maxlength = "100" })</li>
<li></li>
<li>@Html.TextBoxFor(x => x.User.email2, new { @maxlength = "30" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">주소</th>
<td>
<ul class="apyAddr postbox">
<li>
@Html.TextBoxFor(x => x.User.post, new { @class = "postno", @style = "background-color:#ddd;", @readonly = true })
</li>
<li>
@Html.TextBoxFor(x => x.User.address1, new { @class = "postadr", @style = "background-color:#ddd;", @readonly = true, @placeholder = "주소입력" })
</li>
<li>
@Html.TextBoxFor(x => x.User.address2, new { @class = "postadrsub", @placeholder = "나머지 주소입력", @maxlength = "200" })
</li>
<li>
<a href="#" onclick="getpost2(this);">우편번호검색</a>
</li>
</ul>
</td>
</tr>
<tr style="display:none;">
<th class="req">채용형태</th>
<td>
<ul class="bakRadio">
<li>
@Html.RadioButtonFor(model => model.User.isassignuser, "1", new { @name = "recruit", @checked = "checked" })정규직
</li>
<li>
@Html.RadioButtonFor(model => model.User.isassignuser, "0", new { @name = "recruit" })비정규직
</li>
</ul>
</td>
</tr>
<tr class="uduty">
<th class="req">직위</th>
<td>
@Html.TextBoxFor(x => x.User.uduty, new { @class = "apylpt", @maxlength = "20" })
</td>
</tr>
<tr>
<th class="req">학력</th>
<td>
<ul class="bakRadio">
<li>
@Html.RadioButtonFor(model => model.User.slevel, "0", new { @name = "eduGrade", @checked = "checked" })기타
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "1", new { @name = "eduGrade" })고졸
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "2", new { @name = "eduGrade" })학사
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "3", new { @name = "eduGrade" })석사
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "4", new { @name = "eduGrade" })박사
</li>
</ul>
</td>
</tr>
</tbody>
</table>
@*}*@
<h4 class="clsTitle">개인정보 확인</h4>
<p class="subDsc">*는 필수 입력사항입니다.</p>
@Html.HiddenFor(x => x.User.userno)
<table class="clsTable">
<tbody>
<tr>
<th class="req">이름</th>
<td><p>@Html.TextBoxFor(x => x.User.username, new { @class = "apylpt", @maxlength = "10", @style = "background-color:#ddd;", @readonly = true })</p></td>
</tr>
<tr>
<th class="req">주민등록번호</th>
<td>
<ul class="usrNum">
<li>@Html.TextBoxFor(x => x.User.userpno1, new { @maxlength = "6", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.userpno2, new { @maxlength = "7", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">휴대전화</th>
<td>
<ul class="usrPhn">
<li>@Html.TextBoxFor(x => x.User.mobile1, new { @maxlength = "3", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.mobile2, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
<li>-</li>
<li>@Html.TextBoxFor(x => x.User.mobile3, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">이메일</th>
<td>
<ul class="clsMail">
<li>@Html.TextBoxFor(x => x.User.email1, new { @maxlength = "100" })</li>
<li></li>
<li>@Html.TextBoxFor(x => x.User.email2, new { @maxlength = "30" })</li>
</ul>
</td>
</tr>
<tr>
<th class="req">주소</th>
<td>
<ul class="apyAddr postbox">
<li>
@Html.TextBoxFor(x => x.User.post, new { @class = "postno", @style = "background-color:#ddd;", @readonly = true })
</li>
<li>
@Html.TextBoxFor(x => x.User.address1, new { @class = "postadr", @style = "background-color:#ddd;", @readonly = true, @placeholder = "주소입력" })
</li>
<li>
@Html.TextBoxFor(x => x.User.address2, new { @class = "postadrsub", @placeholder = "나머지 주소입력", @maxlength = "200" })
</li>
<li>
<a href="#" onclick="getpost2(this);">우편번호검색</a>
</li>
</ul>
</td>
</tr>
<tr style="display:none;">
<th class="req">채용형태</th>
<td>
<ul class="bakRadio">
<li>
@Html.RadioButtonFor(model => model.User.isassignuser, "1", new { @name = "recruit", @checked = "checked" })정규직
</li>
<li>
@Html.RadioButtonFor(model => model.User.isassignuser, "0", new { @name = "recruit" })비정규직
</li>
</ul>
</td>
</tr>
<tr class="uduty">
<th class="req">직위</th>
<td>
@Html.TextBoxFor(x => x.User.uduty, new { @class = "apylpt", @maxlength = "20" })
</td>
</tr>
<tr>
<th class="req">학력</th>
<td>
<ul class="bakRadio">
<li>
@Html.RadioButtonFor(model => model.User.slevel, "0", new { @name = "eduGrade", @checked = "checked" })기타
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "1", new { @name = "eduGrade" })고졸
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "2", new { @name = "eduGrade" })학사
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "3", new { @name = "eduGrade" })석사
</li>
<li>
@Html.RadioButtonFor(model => model.User.slevel, "4", new { @name = "eduGrade" })박사
</li>
</ul>
</td>
</tr>
</tbody>
</table>
<ul class="clsBtn society">
@if (Model.CM.applicableCM == "정상접수")
{
<li><a href="#" onclick="javascript:applyEdu();">수강신청</a></li>
}
else
{
<li><a href="#" onclick="javascript:applyEdu()">수강대기 신청</a></li>
}
<li><a href="#" id="btnback">뒤로가기</a></li>
</ul>
<ul class="clsBtn society">
@if (Model.CM.applicableCM == "정상접수")
{
<li><a href="#" onclick="javascript:applyEdu();">수강신청</a></li>
}
else
{
<li><a href="#" onclick="javascript:applyEdu()">수강대기 신청</a></li>
}
<li><a href="#" id="btnback">뒤로가기</a></li>
</ul>
</form>
</form>
@Html.Partial("./Partial/BoxAssign", null, new ViewDataDictionary { { "bindmethod", "bindassign" } })
@section styles{
<style type="text/css">
@ -412,7 +412,7 @@
@Html.Partial("./Partial/filescript")
}
<script type="text/javascript">
function checkSpacebar() {
var kcode = event.keyCode;
if (kcode == 32) event.returnValue = false
@ -442,6 +442,9 @@
setScd();
});
// 환급여부 체크하면 소속선택(div-isCompany)hide 환급금수령계좌(div-rbankInfo) show 회사정보확인(div-companyInfo) show
$("input:radio[name='isrebate']").on("click",function () {
$(".div-companyInfo").find(".clsTable").find("tr th").removeClass("req");
if ($(this).val() == "1") {
@ -450,7 +453,7 @@
$("input:radio[name='isCompany'][value='1']").click();
$(".uduty").show();
$(".div-companyInfo").find(".clsTable").find("tr th.offreq").addClass("req");
}
}// 비환급 체크하면 소속선택 show 환급금수령계좌 hide 보여진 소속선택에서 개인(val == 0) 체크하면 업체정보 hide
else {
$(".div-isCompany").show();
$(".div-rbankInfo").hide();
@ -473,7 +476,7 @@
$("#spninfeecost").html(bindComma(total));
});
$("input:radio[name='isCompany']").on("click", function () {
$("input:radio[name='isCompany']").on("click", function () {
if ($(this).val() == "0") {
$(".div-companyInfo").hide();
} else {

View File

@ -18,150 +18,166 @@
<input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
</form><input type="hidden" name="CM.cshape" id="cshape" value="@Model.CM.cshape" />
<form id="mform" name="mform" method="post" action="/Course/XpayREQ">
@Html.HiddenFor(m => m.payno)
<input type="hidden" name="cmno" id="cmno" value="@Model.cmno" /> @*강좌번호*@
<input type="hidden" name="stringval" id="stringval" value="@Model.stringval" /> @*법정교육/기타교육*@
<input type="hidden" name="stringval2" id="stringval2" value="@Model.stringval2" />@*교육유형*@
<input type="hidden" name="stringval3" id="stringval3" value="@Model.stringval3" />@*기술인분류*@
<input type="hidden" name="stringval4" id="stringval4" value="@Model.stringval4" />@*교육목적*@
<input type="hidden" name="stringval5" id="stringval5" value="@Model.stringval5" />@*등급*@
<input type="hidden" name="stringval6" id="stringval6" value="@Model.stringval6" />@*직무분야*@
<input type="hidden" name="stringval7" id="stringval7" value="@Model.stringval7" />@*직무분야*@
<input type="hidden" name="cmisno" id="cmisno" />
<input type="hidden" name="isrebate" id="isrebate" />
<input type="hidden" name="applicableCM" id="applicableCM" />
<input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
<input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
<input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
<h4 class="clsTitle">신청강좌</h4>
<ul class="smtList mt0" style="font-weight:500;">
<li>
<ul class="smtlChk">
<li>
<p>
<span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
@(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
</span>
@{
string strStudyPlaceTmp = "";
string strStudyPlaceTmp2 = "";
string strEduInfo = "";
if (Model.SelectCMInningscd.studyplace != null)
{
strStudyPlaceTmp = Model.SelectCMInningscd.studyplacename + "교육장";
strStudyPlaceTmp2 = Model.CM.cname;
}
else
{
strStudyPlaceTmp = Model.CM.cname;
}
if (Model.CM.cshape == 1)
{
strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
}
else
{
//Model.SelectCMInningscd.eend2 교육종료일
strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
}
}
<form id="mform" name="mform" method="post" action="/Course/XpayREQ">
@Html.HiddenFor(m => m.payno)
<input type="hidden" name="cmno" id="cmno" value="@Model.cmno" /> @*강좌번호*@
<input type="hidden" name="stringval" id="stringval" value="@Model.stringval" /> @*법정교육/기타교육*@
<input type="hidden" name="stringval2" id="stringval2" value="@Model.stringval2" />@*교육유형*@
<input type="hidden" name="stringval3" id="stringval3" value="@Model.stringval3" />@*기술인분류*@
<input type="hidden" name="stringval4" id="stringval4" value="@Model.stringval4" />@*교육목적*@
<input type="hidden" name="stringval5" id="stringval5" value="@Model.stringval5" />@*등급*@
<input type="hidden" name="stringval6" id="stringval6" value="@Model.stringval6" />@*직무분야*@
<input type="hidden" name="stringval7" id="stringval7" value="@Model.stringval7" />@*직무분야*@
<input type="hidden" name="cmisno" id="cmisno" />
<input type="hidden" name="isrebate" id="isrebate" />
<input type="hidden" name="applicableCM" id="applicableCM" />
<input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
<input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
<input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
<h4 class="clsTitle">신청강좌</h4>
<ul class="smtList mt0" style="font-weight:500;">
<li>
<ul class="smtlChk">
<li>
<p>
<span class="@(Model.CM.cshape == 0 ? "org" : Model.CM.cshape == 1 ? "nav_grn" : "nav_blu")">
@(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육")
</span>
@{
string strStudyPlaceTmp = "";
string strStudyPlaceTmp2 = "";
string strEduInfo = "";
if (Model.SelectCMInningscd.studyplace != null)
{
strStudyPlaceTmp = Model.SelectCMInningscd.studyplacename + "교육장";
strStudyPlaceTmp2 = Model.CM.cname;
}
else
{
strStudyPlaceTmp = Model.CM.cname;
}
if (Model.CM.cshape == 1)
{
strEduInfo = string.Format("교육기간 {0} | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
}
else
{
//Model.SelectCMInningscd.eend2 교육종료일
strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",
Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0"));
}
}
@if (Model.SelectCMInningscd.studyplace == null)
{
<span style="font-size:22px"><label><span>@strStudyPlaceTmp</span><span class="blu">@strStudyPlaceTmp2 </span></label></span><br />
}
else if (Model.SelectCMInningscd.studyplace != null)
{
<span style="font-size:22px"><label><span class="blu">[@strStudyPlaceTmp]</span><span>@strStudyPlaceTmp2 </span></label></span><br />
}
<span><label>@Html.Raw(strEduInfo)</label></span>
</p>
</li>
</ul>
<div class="apyCost">
@if (Model.PPLog.isaccommodation != 1)
{
<span>결제금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
}
else
{
<span>결제금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span>원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
}
</div>
</li>
</ul>
@if (Model.SelectCMInningscd.studyplace == null)
{
<span style="font-size:22px"><label><span>@strStudyPlaceTmp</span><span class="blu">@strStudyPlaceTmp2 </span></label></span><br />
}
else if (Model.SelectCMInningscd.studyplace != null)
{
<span style="font-size:22px"><label><span class="blu">[@strStudyPlaceTmp]</span><span>@strStudyPlaceTmp2 </span></label></span><br />
}
<span><label>@Html.Raw(strEduInfo)</label></span>
</p>
</li>
</ul>
<div class="apyCost">
@if (Model.PPLog.isaccommodation != 1)
{
<span>결제금액:<span class="red">@Model.CM.infee.ToString("#,0")</span>원</span>
}
else
{
<span>결제금액:<span class="red">@((Model.CM.infee + Model.CM.accommofee).ToString("#,0"))</span>원 (합숙 : @(Model.CM.accommofee.ToString("#,0"))원 포함)</span>
}
</div>
</li>
</ul>
<h4 class="clsTitle">결제방법(신용카드 선택 시 계산서 발급불가)</h4>
<ul class="apyRdo">
@if (Model.CM.infee > 0)
{
<li><input type="radio" name="ptype" id="pay0101" value="1"><label for="pay0101">신용카드</label></li>
<li><input type="radio" name="ptype" id="pay0102" value="3"><label for="pay0102">무통장입금(가상계좌)</label></li>
}
else
{
<li><input type="radio" name="ptype" id="pay0101" value="6" checked><label for="pay0101">무료</label></li>
}
</ul>
<div id="cashbox" style="display:none">
<h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4>
<ul class="apyRdo">
@if ((Model.PPLog.cshape != 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0))
{
<li><input type="radio" name="iscashrct" id="pay0202" value="1"><label for="pay0202">현금영수증 발행</label></li>
}
@if ((Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0 && !String.IsNullOrEmpty(Model.PPLog.asname)) || (Model.PPLog.cshape != 1 && !String.IsNullOrEmpty(Model.PPLog.asname)))
{
<li>
<input type="radio" name="iscashrct" id="pay0203" value="2"><label for="pay0203">계산서 발행</label>
</li>
<p class="subTxt">
<br />
<h4 class="clsTitle">교육비 환급대상자의 입금방법(중요)</h4>
<span style="font-size:18px;"><strong>■ 카드결제 시</strong></span><br />
- 반드시 <span style="color : red;">소속 회사의 법인카드로</span> 결제 해 주세요. <span style="color : red;"><strong>(개인카드 결제 시 환급불가)</strong></span><br />
- 카드결제 후 <span style="color : red;">결제한 카드 앞면을 복사하여</span> 입교 시 지참해 주세요.<br />
<span style="font-size:14px;">※ 결제 한 카드가 법인명의라는 것을 <span style="color : red;">노동부에 증빙하기 위하여 필요한 서류</span> 이며 회사 명이 잘 보이도록 <span style="color : red;">앞면 만 복사하시면</span> 됩니다.</span><br /><br />
}
</ul>
<ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
<li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "") /><label for="isreceipt1"> 영수</label></li>
<li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
<li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
</ul>
</div>
<span style="font-size:18px;"><strong>■ 무통장입금 시</strong></span><br />
- 계좌이체로 입금하실 경우 반드시 <span style="color : red;">법인계좌에서</span> 이체가 되어야 합니다. <span style="color : red;"><strong>(타 계좌에서 이체 시 환급불가)</strong></span><br />
- 입금자명은 반드시 <span style="color : red;">소속회사 + 교육생이름</span> 으로 기재해주세요.<br /><br />
&nbsp;&nbsp;예) 현대건설 이지은 인 경우 -> 현대건설이지은<br /><br />
<ul class="clsBtn society">
<li><a href="#" onclick="save()">수강신청</a></li>
<li><a href="/">취소</a></li>
<li><a href="#" id="btnback" style="background-color: #fff;border: solid 1px #0047a7;color:#0047a7;">뒤로가기</a></li>
</ul>
@Html.HiddenFor(m => m.payno)
@Html.HiddenFor(m => m.exno)
@Html.Hidden("pplno", Model.PPLog.pplno)
<input type="hidden" name="cashrcthp" id="cashrcthp" />
<input type="hidden" name="isbill" id="isbill">
<input type="hidden" name="items" value="@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", 0, Model.CM.cmno, 1, ViewBag.SSUserNo, Model.PPLog.isrebate, 0, "")" />
<span style="font-size:16px;"><strong>■ 환급대상자는 <span style="color : red;">계산서 의무 발행</span> 이므로 현금영수증 발행이 불가 합니다.</strong></span><br />
</p>
<!-- Xpay 결제 start -->
<input type="hidden" name="LGD_CLOSEDATE" id="LGD_CLOSEDATE" value="">
<input type="hidden" name="LGD_OID" id="LGD_OID" value="">
<input type="hidden" name="LGD_AMOUNT" id="LGD_AMOUNT" value="">
<input type="hidden" name="LGD_OSTYPE_CHECK" id="LGD_OSTYPE_CHECK" value="">
<input type="hidden" name="LGD_CUSTOM_SWITCHINGTYPE" id="LGD_CUSTOM_SWITCHINGTYPE" value="">
<input type="hidden" name="LGD_VERSION" id="LGD_VERSION" value="">
<input type="hidden" name="LGD_CUSTOM_SKIN" id="LGD_CUSTOM_SKIN" value="">
<input type="hidden" name="CST_WINDOW_TYPE" id="CST_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_PCVIEWYN" id="LGD_PCVIEWYN" value="">
<input type="hidden" name="LGD_CUSTOM_FIRSTPAY" id="LGD_CUSTOM_FIRSTPAY" value="">
<input type="hidden" name="LGD_KVPMISPAUTOAPPYN" id="LGD_KVPMISPAUTOAPPYN" value="">
<input type="hidden" name="LGD_MTRANSFERAUTOAPPYN" id="LGD_MTRANSFERAUTOAPPYN" value="">
<input type="hidden" name="LGD_WINDOW_TYPE" id="LGD_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_CUSTOM_USABLEPAY" id="LGD_CUSTOM_USABLEPAY" value="">
<h4 class="clsTitle">결제방법(신용카드 선택 시 계산서 발급불가)</h4>
<ul class="apyRdo">
@if (Model.CM.infee > 0)
{
<li><input type="radio" name="ptype" id="pay0101" value="1"><label for="pay0101">신용카드</label></li>
<li><input type="radio" name="ptype" id="pay0102" value="3"><label for="pay0102">무통장입금(가상계좌)</label></li>
}
else
{
<li><input type="radio" name="ptype" id="pay0101" value="6" checked><label for="pay0101">무료</label></li>
}
</ul>
<div id="cashbox" style="display:none">
<h4 class="clsTitle">현금영수증 / 계산서 발행여부</h4>
<ul class="apyRdo">
@if ((Model.PPLog.cshape != 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0))
{
<li><input type="radio" name="iscashrct" id="pay0202" value="1"><label for="pay0202">현금영수증 발행</label></li>
}
@if ((Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 1) || (Model.PPLog.cshape == 1 && Model.PPLog.isrebate == 0 && !String.IsNullOrEmpty(Model.PPLog.asname)) || (Model.PPLog.cshape != 1 && !String.IsNullOrEmpty(Model.PPLog.asname)))
{
<li>
<input type="radio" name="iscashrct" id="pay0203" value="2"><label for="pay0203">계산서 발행</label>
</li>
<input type="hidden" name="LGD_BUYER" id="LGD_BUYER" value="@Model.User.username">
<input type="hidden" name="LGD_PRODUCTINFO" id="LGD_PRODUCTINFO" value="@(Model.CM.cname.Replace(",", " "))">
<input type="hidden" name="LGD_BUYEREMAIL" id="LGD_BUYEREMAIL" value="@Model.User.email">
<!-- Xpay 결제 end -->
</form>
}
</ul>
<ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
<li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "") /><label for="isreceipt1"> 영수</label></li>
<li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
<li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
</ul>
</div>
<ul class="clsBtn society">
<li><a href="#" onclick="save()">수강신청</a></li>
<li><a href="/">취소</a></li>
<li><a href="#" id="btnback" style="background-color: #fff;border: solid 1px #0047a7;color:#0047a7;">뒤로가기</a></li>
</ul>
@Html.HiddenFor(m => m.payno)
@Html.HiddenFor(m => m.exno)
@Html.Hidden("pplno", Model.PPLog.pplno)
<input type="hidden" name="cashrcthp" id="cashrcthp" />
<input type="hidden" name="isbill" id="isbill">
<input type="hidden" name="items" value="@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}", 0, Model.CM.cmno, 1, ViewBag.SSUserNo, Model.PPLog.isrebate, 0, "")" />
<!-- Xpay 결제 start -->
<input type="hidden" name="LGD_CLOSEDATE" id="LGD_CLOSEDATE" value="">
<input type="hidden" name="LGD_OID" id="LGD_OID" value="">
<input type="hidden" name="LGD_AMOUNT" id="LGD_AMOUNT" value="">
<input type="hidden" name="LGD_OSTYPE_CHECK" id="LGD_OSTYPE_CHECK" value="">
<input type="hidden" name="LGD_CUSTOM_SWITCHINGTYPE" id="LGD_CUSTOM_SWITCHINGTYPE" value="">
<input type="hidden" name="LGD_VERSION" id="LGD_VERSION" value="">
<input type="hidden" name="LGD_CUSTOM_SKIN" id="LGD_CUSTOM_SKIN" value="">
<input type="hidden" name="CST_WINDOW_TYPE" id="CST_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_PCVIEWYN" id="LGD_PCVIEWYN" value="">
<input type="hidden" name="LGD_CUSTOM_FIRSTPAY" id="LGD_CUSTOM_FIRSTPAY" value="">
<input type="hidden" name="LGD_KVPMISPAUTOAPPYN" id="LGD_KVPMISPAUTOAPPYN" value="">
<input type="hidden" name="LGD_MTRANSFERAUTOAPPYN" id="LGD_MTRANSFERAUTOAPPYN" value="">
<input type="hidden" name="LGD_WINDOW_TYPE" id="LGD_WINDOW_TYPE" value="">
<input type="hidden" name="LGD_CUSTOM_USABLEPAY" id="LGD_CUSTOM_USABLEPAY" value="">
<input type="hidden" name="LGD_BUYER" id="LGD_BUYER" value="@Model.User.username">
<input type="hidden" name="LGD_PRODUCTINFO" id="LGD_PRODUCTINFO" value="@(Model.CM.cname.Replace(",", " "))">
<input type="hidden" name="LGD_BUYEREMAIL" id="LGD_BUYEREMAIL" value="@Model.User.email">
<!-- Xpay 결제 end -->
</form>
@section scriptsHeader{
<style type="text/css">
.hide {

View File

@ -427,7 +427,7 @@
}
// 교육장소 생성하기
if (cshape != 2 && strStudyPlaceTag != '') {
if (/*cshape != 2 &&*/ strStudyPlaceTag != '') {
divPlace.append(strStudyPlaceTag);
divPlace.show();
}
@ -441,12 +441,20 @@
var ulScd = $("#ulScd" + cmno);
ulScd.empty();
//var seq = 0;
if (capResult.obj.length < 1) {
//2022-08-31 cshape == 1 교육장교육일때 cshape == 2 온라인교육일때
if (cshape == 1) {
var li = $("<li />");
li.append("<label> - 선택 가능한 교육일정이 없습니다.</label>");
ulScd.append(li);
}
else if (cshape == 2) {
var li = $("<li />");
li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
ulScd.append(li);
}
$.each(capResult.obj, function (i, d) {
var li = $("<li />");

View File

@ -165,7 +165,7 @@
}
@*<a href="@(d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 1 ? "/CRoom/Index?croomlectno=" + d.longval : d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 0
? "/My/Ready" : d.intval5 != 1 && d.intval4 == 51 ? "/Course/ApplyPay" : d.intval5 != 1 && d.intval4 == 21 ? "/Course/ApplyPay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)" class="gocroom">*@
<a href="/MY/Paies" data-cshape=@d.intval3 class="gocroom">
<a href="/MY/Paies" onClick="alert('감사합니다')" data-cshape=@d.intval3 class="gocroom">
<h5>
<span class="@(d.intval3 == 0 ? "org" : d.intval3 == 1 ? "nav_grn" : "nav_blu")">@(d.intval3 == 0 ? "온라인교육" : d.intval3 == 1 ? "교육장교육" : "온라인교육")</span>
@if (d.studyplace == null)
@ -241,42 +241,46 @@
<ul class="mpgnList" id="mpgl01">
@foreach (var d in Model.Datas.Where(w => w.dtype == 3).OrderBy(o => o.intval))
{
<li>
<div>
<a href="/CRoom/Index?croomlectno=@d.longval" data-cshape=@d.intval3 class="gocroom">
@if (d.intval == 1)
{
<h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 2)
{
<h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6>
<p>일시: @d.strval3</p>
}
else if (d.intval == 3)
{
<h5><span>[시험]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval4 == 0 ? "진행평가" : "최종평가")</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 4)
{
<h5><span>[과제]</span>@d.strval (@(d.intval3)반)</h5>
<h6>과제제출</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 5)
{
<h5><span>[토론]</span>@d.strval (@(d.intval3)반)</h5>
<h6>토론참여</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
</a>
</div>
</li>
if(d.cshape != 1) {
<li>
<div>
@*<a href="/CRoom/Index?croomlectno=@d.longval" data-cshape=@d.intval3 class="gocroom">*@
<a href="/CRoom/Index?croomlectno=@d.longval" data-cshape=@d.cshape class="gocroom">
@if (d.intval == 1)
{
<h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 2)
{
<h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval2)차시</h6>
<p>일시: @d.strval3</p>
}
else if (d.intval == 3)
{
<h5><span>[시험]</span>@d.strval (@(d.intval3)반)</h5>
<h6>@(d.intval4 == 0 ? "진행평가" : "최종평가")</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 4)
{
<h5><span>[과제]</span>@d.strval (@(d.intval3)반)</h5>
<h6>과제제출</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
else if (d.intval == 5)
{
<h5><span>[토론]</span>@d.strval (@(d.intval3)반)</h5>
<h6>토론참여</h6>
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p>
}
</a>
</div>
</li>
}
}
</ul>
@if (Model.Datas.Where(w => w.dtype == 3).Count() < 1)

View File

@ -490,6 +490,10 @@ namespace NP.Model
public class Data : BaseModel
{
/// <summary>
/// 강의유형 0: 온라인, 1: 교육장, 2: 혼합(온+오프)
/// </summary>
public int cshape { get; set; }
/// <summary>
/// 20220804 비교구문 추가
/// </summary>