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

pms: 5723 건 커밋

This commit is contained in:
jity7777 2024-09-04 04:10:55 +00:00
parent 89e5bc2ab1
commit 63791f39ad
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Base/Controller/BaseController.cs
View File

@ -100,7 +100,7 @@ namespace NP.Base
}
else
{
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=1");
}
}
else
@ -137,12 +137,12 @@ namespace NP.Base
if (data.Count() < 1 && SUserInfo.UserNo > 1) // sysadmin 예외
{
CookieClear(null, true);
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=2");
}
else if (data.FirstOrDefault().dtype == 0 && SUserInfo.UserNo > 1) // sysadmin 예외 중복 로그인 차단
{
CookieClear(null, true);
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=3");
}
else
{
@ -190,7 +190,7 @@ namespace NP.Base
if (data.Count() < 1)
{
CookieClear(null, true);
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=4");
}
else if (data.First().intval3 < 1)
{
@ -247,7 +247,7 @@ namespace NP.Base
if (data.Count() < 1)
{
CookieClear(null, true);
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=5");
}
else
{
@ -268,7 +268,10 @@ namespace NP.Base
}
else
{
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true");
if (!Request.Url.AbsolutePath.ToUpper().Equals("/ACCOUNT/INDEX"))
{
filterContext.Result = new RedirectResult("/Account/Index?istimeout=true&k=6");
}
}
}
}
@ -282,11 +285,14 @@ namespace NP.Base
filterContext.Result = new RedirectResult("/Account/Error?_code=9991");
}
else
{
if(!Request.Url.AbsolutePath.ToUpper().Equals("/ACCOUNT/INDEX"))
{
filterContext.Result = new RedirectResult("/Account/Index");
}
}
}
}
base.OnActionExecuting(filterContext);
}
protected DateTime ToDate(String d){return Convert.ToDateTime(d);}

9
FO/Views/CRoom/Estimation.cshtml
View File

@ -28,7 +28,14 @@
<tr>
<th>
<h5><b>@(d.dtype == 0 ? "진행평가":d.dtype==1?"최종평가":d.dtype == 2?"과제":d.dtype==3?"토론":"")</b><span> @d.strval</span></h5>
<p>참여조건 : 진도율 @(d.intval2)% 이상 / 수강 종료일 (@d.time.ToShortDateString()) 이내</p>
@if (d.dtype == 1)
{
<p>※ 집체교육일에 교육장에서 평가진행</p>
}
else if (d.dtype > 1)
{
<p>참여조건 : 진도율 @(d.intval2)% 이상 / 집체교육 참석일 (@d.time.ToShortDateString()) 전 까지</p>
}
</th>
@if (d.dtype == 1 && ViewBag.exCheck == false)
{

5
FO/Views/Course/ApplyAgree.cshtml
View File

@ -243,6 +243,11 @@
</p>
}
}
<h4 class="clsTitle">교육비 환불 조건 안내</h4>
<p class="subTxt" style="margin: 10px;">
교육신청일로부터 <span class="subTxt red">9일이내로</span> 해당 과정의 전체 학습진도율이 <span class="subTxt red">10% 미만일때</span> 환불가능합니다.
</p>
<h4 class="clsTitle">주의사항</h4>
<p class="subTxt" style="border: 3px solid red; padding: 5px; margin: 10px;">
교육생이 이수하여야 할 교육은 소속된 협회에서만 조회가 가능합니다. <br />