KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<기능개선> 

1. PMS NO : 추가 개발건 외 smartSearch 수강신청시 잇슈 처리
2. (주요)작업내용
This commit is contained in:
jity7777 2022-09-22 05:21:44 +00:00
parent 2a536ea6fb
commit 3f87b1e096
17 changed files with 582 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Views/cm/cmregest.cshtml
View File

@ -58,7 +58,7 @@
<td style="display:none;"><input type="text" class="form-control int nocomma" maxlength="100" name="etccut" id="etccut" value="@Model.CMEV.etccut" /></td>
<td><input type="text" class="form-control int nocomma" maxlength="100" name="cut" id="cut" value="@Model.CMEV.cut" /></td>
</tr>
<tr class="auto" id="trestrfd" style="@(Model.CM.isrefund == 1?"":"display:none;")">
@* <tr class="auto" id="trestrfd" style="@(Model.CM.isrefund == 1?"":"display:none;")">
<th rowspan="2" style="display:none;">환급</th>
<th>비율(점수)</th>
<td><input type="text" class="form-control int nocomma" maxlength="100" name="attendrfd" id="attendrfd" value="@Model.CMEV.attendrfd" /></td>
@ -78,7 +78,7 @@
<td style="display:none;"><input type="text" class="form-control int nocomma" maxlength="100" name="discusscutrfd" id="discusscutrfd" value="@Model.CMEV.discusscutrfd" /></td>
<td style="display:none;"><input type="text" class="form-control int nocomma" maxlength="100" name="etccutrfd" id="etccutrfd" value="@Model.CMEV.etccutrfd" /></td>
<td><input type="text" class="form-control int nocomma" maxlength="100" name="cutrfd" id="cutrfd" value="@Model.CMEV.cutrfd" /></td>
</tr>
</tr>*@
</table>
</section>
@if (Model.CM.cshape == 2)//혼합유형

4
BO/Views/croom/gradeall0.cshtml
View File

@ -69,11 +69,11 @@
<td>@d.userid</td>
<td>@d.mobile</td>
<td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if (d.cshape == 2)
@if (d.cshape > 0)
{
if (d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno,@d.cshape);">@d.eend.ToShortDateString()</a></td>
}
else
{

18
BO/Web.config
View File

@ -55,8 +55,8 @@
<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
<!--<add key="configpath" value="Product" />-->
<add key="configpath" value="ProductDev" />
<!--<add key="configpath" value="staging" />-->
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="staging" />
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />
@ -267,7 +267,7 @@
</iBATIS>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="Logs\log.txt" />
<file value="D:\log\ynicte\log.txt" />
<param name="MaxSizeRollBackups" value="2" />
<param name="MaximumFileSize" value="1024KB" />
<param name="RollingStyle" value="Size" />
@ -283,7 +283,7 @@
</layout>
</appender>
<appender name="DebugAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\debug.txt" />
<param name="File" value="D:\log\ynicte\debug.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -294,7 +294,7 @@
</layout>
</appender>
<appender name="DeleteAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\delete.txt" />
<param name="File" value="D:\log\ynicte\delete.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -305,7 +305,7 @@
</layout>
</appender>
<appender name="WarnAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\warn.txt" />
<param name="File" value="D:\log\ynicte\warn.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -316,7 +316,7 @@
</layout>
</appender>
<appender name="QueryAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\query.txt" />
<param name="File" value="D:\log\ynicte\query.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -327,7 +327,7 @@
</layout>
</appender>
<appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\error.txt" />
<param name="File" value="D:\log\ynicte\error.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -338,7 +338,7 @@
</layout>
</appender>
<appender name="TryErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\tryerror.txt" />
<param name="File" value="D:\log\ynicte\tryerror.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />

16
Base/Controller/FCommon.cs
View File

@ -295,13 +295,23 @@ namespace NP.Base.Controllers
#endregion
#region 소속선택
var isCompany = !string.IsNullOrEmpty(Request["isCompany1"]) ? Convert.ToInt32(Request["isCompany1"]) : (int?)null;
if (isCompany == 0) //개인
int isCompany = 0;
if (!string.IsNullOrEmpty(Request["isCompany"]))
{
string[] strValue = Request["isCompany"].Split(',');
if(strValue[0] == "1")
{
isCompany = 1;
}
}
//var isCompany = !string.IsNullOrEmpty(Request["isCompany1"]) ? Convert.ToInt32(Request["isCompany1"]) : (int?)null;
if (isCompany == 0 && pplog.isrebate != 1) //개인
{
pplog.asno = null;
vm.Assign = null;
}
else if (isCompany == 1) //업체
else if (isCompany == 1 || (isCompany == 0 && pplog.isrebate == 1)) //업체
{
//업체인데 회사정보가 안넘어오면 에러처리
if (vm.Assign == null)

14
Dao/MyBatis/Maps/CM.xml
View File

@ -1890,7 +1890,7 @@
select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
,a.remainPeople
,a.isselected
,a.isselected,
,case when a.remainPeople &lt;= 0 then 0 else 1 end isend
from
(
@ -1920,8 +1920,8 @@
select a.*
from (
select
a.cmno,a.pcmno,
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
a.cmno,a.pcmno,a.cgcode
,a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
,a.remainPeople
,a.isselected
<!--211220.통합테스트목록(643) 4일부터로 변경-->
@ -1937,11 +1937,12 @@
,a.studyplace,case when c.scdtype =1 then '온라인' else e.cname end studyplacename
,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected
,c.scdtype
,d.cmno,d.pcmno
,d.cmno,d.pcmno,cg.cgcode
,d.cshape
from cminningscd a
left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno
left outer join cg cg on d.cgno = cg.cgno
left outer join comcode e on e.ccode = a.studyplace
<dynamic prepend="where">
<isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
@ -1964,7 +1965,7 @@
select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
,a.studyplace, a.studyplacename,a.remainPeople
,a.isselected
,a.isselected, a.cmno,a.pcmno,a.cgcode
<!--211220.통합테스트목록(644) 이미지난 교육종료일 변경불가-->
,case when a.estart &lt; date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second)
<!--20220803
@ -1975,10 +1976,11 @@
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0)) remainPeople
,a.studyplace, e.cname studyplacename
,case when f.cmisno = a.cmisno then 1 else 0 end isselected
,case when f.cmisno = a.cmisno then 1 else 0 end isselected, ,d.cmno,d.pcmno,cg.cgcode
from cminningscd a
left outer join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno
left outer join cg cg on d.cgno = cg.cgno
left outer join comcode e on e.ccode = a.studyplace
left outer join lect f on f.lectno = #lectno#
<dynamic prepend="where">

11
FO/Views/Course/ApplyComplete.cshtml
View File

@ -62,7 +62,7 @@ else
{
<span style="font-size:22px"><label><span class="blu">[@strStudyPlaceTmp]</span><span>@strStudyPlaceTmp2 </span></label></span><br />
}
<p><label>@Html.Raw(strEduInfo)</label></p>
<p><label>@Html.Raw(strEduInfo)</label></p>
</p>
</li>
</ul>
@ -80,11 +80,12 @@ else
</ul>
<p class="subTxt">
<br />
<h4 class="clsTitle">교육비 입금기한 안내</h4>
- 온라인교육 : 신청일로 부터 한 달 이내<br />
- 교육장교육 : 교육시작일로 부터 7일 전까지 (단, 교육시작일이 7일 이내 인 경우 교육시작일 전 까지)<br />
<p class="subTxt">
<span>- 온라인교육 : 신청일로 부터 한 달 이내<br /></span>
<span> - 교육장교육 : 교육시작일로 부터 7일 전까지 (단, 교육시작일이 7일 이내 인 경우 교육시작일 전 까지)<br /></span>
</p>
@ -121,7 +122,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>

4
FO/Views/Course/ApplyEdu.cshtml
View File

@ -26,6 +26,7 @@
<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="isCompany" value="@Model.isCompany" />-->@*업체/개인 선택*@
<input type="hidden" name="cmisno" id="cmisno" />
<input type="hidden" name="applicableCM" id="applicableCM" />
<input type="hidden" name="cshape" id="cshape" value="@Model.CM.cshape" />
@ -253,6 +254,7 @@
<li>-</li>
<li>@Html.TextBoxFor(x => x.Assign.mphone3, new { @maxlength = "4" })</li>
</ul>
</td>
</tr>
<tr>
<th class="onreq offreq">계산서받을 이메일</th>
@ -390,7 +392,7 @@
<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">

41
FO/Views/Course/ApplyPay.cshtml
View File

@ -16,9 +16,11 @@
<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" />
</form><input type="hidden" name="CM.cshape" id="cshape" value="@Model.CM.cshape" />
<input type="hidden" name="CM.cshape" id="cshape" value="@Model.CM.cshape" />
<input type="hidden" name="isrebate" id="isrebate" />
</form>
<form id="mform" name="mform" method="post" action="/Course/XpayREQ">
<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" /> @*법정교육/기타교육*@
@ -94,22 +96,23 @@
</div>
</li>
</ul>
<p class="subTxt">
<br />
@if (Model.PPLog.cshape != 2) {
<h4 class="clsTitle">교육비 환급대상자의 입금방법(중요)</h4>
<span style="font-size:18px;"><strong>■ 카드결제 시</strong></span><br />
<p class="subTxt">
<span>■ 카드결제 시</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 />
<span style="font-size:18px;"><strong>■ 무통장입금 시</strong></span><br />
<span>※ 결제 한 카드가 법인명의라는 것을 <span style="color : red;">노동부에 증빙하기 위하여 필요한 서류</span> 이며 회사 명이 잘 보이도록 <span style="color : red;">앞면 만 복사하시면</span> 됩니다.</span><br /><br />
</p>
<p class="subTxt">
<span>■ 무통장입금 시</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 />
<span style="font-size:16px;"><strong>■ 환급대상자는 <span style="color : red;">계산서 의무 발행</span> 이므로 현금영수증 발행이 불가 합니다.</strong></span><br />
<span><strong>■ 환급대상자는 <span style="color : red;">계산서 의무 발행</span> 이므로 현금영수증 발행이 불가 합니다.</strong></span><br />
</p>
}
<h4 class="clsTitle">결제방법(신용카드 선택 시 계산서 발급불가)</h4>
<ul class="apyRdo">
@ -130,7 +133,9 @@
{
<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)))
@* @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)))*@
@* @if ((Model.PPLog.cshape == 1 || Model.PPLog.cshape != 1)@*&& Model.PPLog.isrebate == 1 && Model.isCompany == 1)*@
@if(Model.isCompany == 1 || Model.PPLog.isrebate == 1 )
{
<li>
<input type="radio" name="iscashrct" id="pay0203" value="2"><label for="pay0203">계산서 발행</label>
@ -178,17 +183,17 @@
<input type="hidden" name="LGD_BUYEREMAIL" id="LGD_BUYEREMAIL" value="@Model.User.email">
<!-- Xpay 결제 end -->
</form>
@section scriptsHeader{
@section scriptsHeader{
<style type="text/css">
.hide {
display: none;
}
</style>
@Html.Partial("./Partial/ScriptDate")
}
<script type="text/javascript">
}
<script type="text/javascript">
var model = {};
model.pplog = @Html.Raw(Json.Encode(new List<NP.Model.PPLog>() { ( Model.PPLog != null ? Model.PPLog : new NP.Model.PPLog {}) }.Select(s => new { s.asname, s.brno, s.ceoname, s.post, s.address1, s.address2, s.bkind, s.btype, s.taxemail }).First()));;
model.pplog = @Html.Raw(Json.Encode(new List<NP.Model.PPLog>() { ( Model.PPLog != null ? Model.PPLog : new NP.Model.PPLog {}) }.Select(s => new { s.asname, s.brno, s.ceoname, s.post, s.address1, s.address2, s.rbankacc, s.bkind, s.btype, s.taxemail}).First()));;
$(document).ready(function () {
$("input[name='ptype']").on("change", function () {
@ -216,10 +221,12 @@
function save() {
var isCompanyInfo = true;
$.each(model.pplog, function (key, value) {
if (!value && key != "address2") {
if (key == "rbankacc") {
if (value == "") {
isCompanyInfo = false;
return;
}
}
});
$("#cashrcthp").val("");
@ -306,4 +313,4 @@
return "N";
}
}
</script>
</script>

38
FO/Views/Course/SmartSearch.cshtml
View File

@ -94,7 +94,7 @@
</h5>
<ul class="smtlBtn">
<li>
<a onclick="javascript: openIntro(362);" class="smtlChkBtn smtlChk01" style="right:130px;">강좌소개</a>
<a onclick="javascript: openIntro(@item.cmno);" class="smtlChkBtn smtlChk01" style="right:130px;">강좌소개</a>
</li>
@*<li style="font-size:18px;"><a href="#" class="smtlBtn02" id="btnIntro" onclick="javascript: openIntro(@item.cmno)">강좌소개</a></li>*@
<li>
@ -164,7 +164,7 @@
<div class="gry">
<p>교육분류 : <span id="spnCmKind"></span></p>
<p>인정시간 : <span class="sky"><span id="spnCmStudyHour"></span></span>시간</p>
<p style="display-none" id="completeStd">수료기준 : 진도 <span id="spnCmAttend"></span>% 이상, 시험 <span id="spnCmFinal"></span>점 이상, 과제 <span id="spnCmSubject"></span>점 이상</p>
<p style="display:none;" id="completeStd">수료기준 : 진도 <span id="spnCmAttend"></span>% 이상, 시험 <span id="spnCmFinal"></span>점 이상, 과제 <span id="spnCmSubject"></span>점 이상</p>
@*@if (Model.CM.cshape != 1)
{
<p id="completeStd">수료기준 : 진도 <span id="spnCmAttend"></span>% 이상, 시험 <span id="spnCmFinal"></span>점 이상, 과제 <span id="spnCmSubject"></span>점 이상</p>
@ -292,10 +292,10 @@
$.each(capResult.obj, function (i, d) {
//20220729 온라인인경우 수료기준을 보여준다.
if (d.cshape == 1) {
if (@(Model.stringval2) == 1) {
$("#completeStd").hide();
}
else {
else if (@(Model.stringval2) == 2) {
$("#completeStd").show();
}
@ -444,10 +444,15 @@
//var seq = 0;
if (capResult.obj.length < 1) {
var li = $("<li />");
if (cshape == 1) {
li.append("<label> - 선택 가능한 교육일정이 없습니다.</label>");
} else if (cshape == 2) {
li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
}
ulScd.append(li);
}
$.each(capResult.obj, function (i, d) {
var li = $("<li />");
var pData = $("<p />");
@ -470,7 +475,7 @@
if (d.remainPeople <= 0) {
spanApplyClassN.text("수강신청");
aApplyClass.append(spanApplyClassN);
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </span>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
pData.append(spanApplyClassN);
}
else {
@ -483,22 +488,37 @@
else {
spanApplyClass.text("수강신청");
aApplyClass.append(spanApplyClass);
pData.html("<label>" + "<span style='color:blue'>"+strStudyPlacename+"</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + "'> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span> " + "</span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + "'> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span> " + "</span>");
pData.append(aApplyClass);
}
}
}
else {
if (d.isselected == 1) {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
if (d.remainPeople <= 0) {
spanApplyClassN.text("수강신청");
aApplyClass.append(spanApplyClassN);
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </span>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
pData.append(spanApplyClassN);
}
else {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
if (d.isselected == 1) {
spanApplyClass.text("수강신청");
aApplyClass.append(spanApplyClass);
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
pData.append(spanApplyClass);
}
else {
spanApplyClass.text("수강신청");
aApplyClass.append(spanApplyClass);
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
pData.append(aApplyClass);
}
}
}
}
li.append(pData);
li.append('<input type="hidden" id="pcmno_'+d.pcmno+'_cgcode" name="pcmno_cgcodes" value="' + d.cgcode + '")" />');
ulScd.append(li);
});
}

2
FO/Views/Home/Index.cshtml
View File

@ -330,7 +330,7 @@
}
if ($("#msSel2 > span").text() != "품질관리기술인" && $("#sch6").val() == "") {
msg("전문분야을 입력하세요."); $("#stringval2").focus(); return;
@*msg("전문분야을 입력하세요.");*@ $("#stringval2").focus(); return;
}

3
FO/Views/My/Document.cshtml
View File

@ -144,7 +144,8 @@
</div>
</th>
<td class="ltaBtn" data-th="위탁계약서 : ">
@if ((item.pstatus == 1 || item.pstatus == 22)&& item.isrebate == 1 && (item.status == 1 || item.status == 2))
@* @if ((item.pstatus == 1 || item.pstatus == 22) && item.isrebate == 1 && (item.status == 1 || item.status == 2))*@
@if (item.cshape == 1)
{
<a href="#" onclick="javascript: educontract(@(item.lectno));"><img src="~/img/mypage/print.png"><br />인쇄</a>
}

2
FO/Views/My/Index.cshtml
View File

@ -54,7 +54,7 @@
@foreach (var d in Model.Datas.Where(w => w.dtype == 2))
{
if (status0CNT < 3)
if (status0CNT < 3 || (d.intval3 == 1 && d.intval4 == 1))
{
<li>
<a href="/CRoom/Index?croomlectno=@d.longval" data-cshape=@d.intval3 class="gocroom">

2
FO/Views/My/Lecture.cshtml
View File

@ -96,7 +96,7 @@
}
else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0)
{
<a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno" data-cshape=@d.cshape class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:40px;">입장</a>
<a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno" data-cshape=@d.cshape class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:55px; height:42px; line-height:2; font-size:20px;">입장</a>
}
else
{

4
FO/Views/My/PayInfo.cshtml
View File

@ -60,11 +60,11 @@
{
if (Convert.ToDateTime(Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) >= Convert.ToDateTime(Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm")))
{
<td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "")</td>
<td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @*@(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.PayItem.retime.Value.ToString("yyyy-MM-dd HH:mm"))) : "")*@</td>
}
else
{
<td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")</td>
<td>@Model.Pay.cdt.ToString("yyyy-MM-dd HH:mm") @*@(Model.Pay.ptype == 3 ? string.Format("(만료일 : {0})", (Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))) : "")*@</td>
}
}
else

2
FO/Views/Shared/Partial/PayReturn.cshtml
View File

@ -178,7 +178,7 @@
</table>
<ul class="bskBtn col1">
<li><a href="/My/Paies" class="bk">결제현황 이동</a></li>
<li><a href="/My/Paies" class="bk">결제관리 이동</a></li>
@if (pay.ptype != 6)
{
<li><a href="#" onclick="calltax(@(pay.ptype == 1 ? 1 : 0))" class="bk">계산서요청</a></li>

14
FO/Web.config
View File

@ -315,7 +315,7 @@
</iBATIS>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="Logs\log.txt" />
<file value="D:\log\ynicte\log.txt" />
<param name="MaxSizeRollBackups" value="2" />
<param name="MaximumFileSize" value="1024KB" />
<param name="RollingStyle" value="Size" />
@ -331,7 +331,7 @@
</layout>
</appender>
<appender name="DebugAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\debug.txt" />
<param name="File" value="Logs/debug.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -342,7 +342,7 @@
</layout>
</appender>
<appender name="DeleteAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\delete.txt" />
<param name="File" value="Logs/delete.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -353,7 +353,7 @@
</layout>
</appender>
<appender name="WarnAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\warn.txt" />
<param name="File" value="Logs/warn.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -364,7 +364,7 @@
</layout>
</appender>
<appender name="QueryAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\query.txt" />
<param name="File" value="D:\log\ynicte\query.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -375,7 +375,7 @@
</layout>
</appender>
<appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\error.txt" />
<param name="File" value="Logs/error.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -386,7 +386,7 @@
</layout>
</appender>
<appender name="TryErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="Logs\tryerror.txt" />
<param name="File" value="Logs/tryerror.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />

1
Model/CM.cs
View File

@ -4105,6 +4105,7 @@ namespace NP.Model
/// 과정키
/// </summary>
public Int64 pcmno { get; set; }
public Int64 cgcode { get; set; }
}
/// <summary>