This commit is contained in:
hyunho 2020-11-10 05:34:17 +00:00
parent 35ba942282
commit aa73da07e3
4 changed files with 90 additions and 59 deletions

View File

@ -931,6 +931,7 @@
,a.longval,a.longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3 ,null time4
,a.rno
from(
select 1 dtype
@ -954,6 +955,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,a.time3,a.time4
,a.rno
from (
select 2 dtype
@ -961,10 +963,12 @@
,a.lectno longval,0 longval2
,b.cname strval,null strval2,null strval3
,b.sstime time,b.setime time2
,d.estart time3,d.eend time4
,row_number() over(order by b.setime desc) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include>
inner join term c on c.tmno=b.tmno
left outer join cminningscd d on a.cmisno = d.cmisno
where a.userno=#userno# and a.status=1 and a.ischanged=0
order by case when time2 > now() then 1 else 0 end desc , time2 desc
) a
@ -973,6 +977,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 3 dtype
@ -994,6 +999,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 3 dtype
@ -1016,6 +1022,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 3 dtype
@ -1038,6 +1045,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 3 dtype
@ -1060,6 +1068,7 @@
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 3 dtype
@ -1082,6 +1091,7 @@
,a.longval,a.longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,null time3, null time4
,a.rno
from (
select 4 dtype

View File

@ -1,6 +1,8 @@
@model NP.Model.VMMy
@{
ViewBag.ismypageindex = true;
int status0CNT = 0;
int status1CNT = 0;
}
@section mybanner{
@if (ViewBag.ismain)
@ -36,13 +38,19 @@
</div>
<div class="mpgClass">
<div class="mpgcCont">
<div class="mpgTitle"><h5>신청중인 과정</h5><a href="/My/Ready">더보기</a></div>
<p class="mpgDesc">※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.</p>
<div class="mpgTitle">
<h5>수강중인 과정</h5>
<a href="/My/Lecture">더보기</a>
</div><!-- mpgTitle -->
<p class="mpgDesc">※ 수료증 출력은 메뉴의 수강과정을 클릭하셔야 합니다.</p>
<ul class="mpgcList">
@foreach (var d in Model.Datas.Where(w => w.dtype == 1))
@foreach (var d in Model.Datas.Where(w => w.dtype == 2))
{
if (status0CNT < 3)
{
<li>
<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?"/My/Ready" : d.intval5 !=1 && d.intval4 == 21? "/My/Readypay?payno="+d.longval2 : "/My/PayInfo?payno="+d.longval2)">
<a href="/CRoom/Index?croomlectno=@d.longval">
<h5>
<em>@d.intval-@(d.intval2)기</em>
<span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>
@ -50,11 +58,77 @@
<b>@d.strval</b>
</h5>
<dl>
<dt class="mpglSta@(d.intval5==0 && d.intval4==1?3:1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : "")</dt>
<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
@if (d.intval3 == 2)
{
<dt class="mpglSta3">&nbsp;&nbsp;&nbsp;</dt>
<dd> 집체교육 : @d.time3.ToString("yy/MM/dd") ~ @d.time4.ToString("yy/MM/dd")</dd>
}
</dl>
</a>
</li>
status0CNT++;
}
}
</ul>
@if (Model.Datas.Where(w => w.dtype == 2).Count() < 1)
{
<div style="padding: 30px; text-align: center;">수강중인 강좌가 없습니다.</div>
}
</div>
@if (Model.Datas.Where(w => w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
{
<div class="mpgcCont">
<div class="mpgcEmpty"><a style="cursor:default">@(ViewBag.SSUserName)님, 이런 강의는 어떠세요?</a></div>
<ul class="mpgcList empty">
@foreach (var d in Model.CMs)
{
<li>
<a href="/Course/@d.cgcode.Replace("Test", "Cert")Detail?cmno=@d.cmno">
<h5>
<em>@(d.tyear)-@(d.tseq)기</em>
<span class="nav">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합")</span>
@Html.Raw(d.isrefund == 1 ? "<span class=\"grn\">환급</span>" : "")
<b>@d.cname</b>
</h5>
<dl>
<dt class="mpglSta3">추천강좌</dt>
<dd>신청기간 : @d.rstime.Value.ToString("yy/MM/dd") ~ @d.retime.Value.ToString("yy/MM/dd")</dd>
</dl>
</a>
</li>
}
</ul>
</div>
}
<div class="mpgcCont">
<div class="mpgTitle"><h5>신청중인 과정</h5><a href="/My/Ready">더보기</a></div>
<p class="mpgDesc">※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.</p>
<ul class="mpgcList">
@foreach (var d in Model.Datas.Where(w => w.dtype == 1))
{
if (status1CNT < 3)
{
<li>
<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 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 21 ? "/My/Readypay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)">
<h5>
<em>@d.intval-@(d.intval2)기</em>
<span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>
@Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
<b>@d.strval</b>
</h5>
<dl>
<dt class="mpglSta@(d.intval5 == 0 && d.intval4 == 1 ? 3 : 1)">@(d.intval5 == 1 ? "환불요청" : d.intval4 == 1 ? "결제완료" : d.intval4 == 21 ? "결제대기" : d.intval4 == 22 ? "입금대기" : d.intval4 == 51 ? "심사중" : "")</dt>
<dd>신청기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
</dl>
</a>
</li>
status1CNT++;
}
}
@*@if (Model.Datas.Where(w=>w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
{
@ -82,61 +156,7 @@
<div style="padding: 30px; text-align: center;">신청중인 강좌가 없습니다.</div>
}
</div>
@if (Model.Datas.Where(w => w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
{
<div class="mpgcCont">
<div class="mpgcEmpty"><a style="cursor:default">@(ViewBag.SSUserName)님, 이런 강의는 어떠세요?</a></div>
<ul class="mpgcList empty">
@foreach (var d in Model.CMs)
{
<li>
<a href="/Course/@d.cgcode.Replace("Test", "Cert")Detail?cmno=@d.cmno">
<h5>
<em>@(d.tyear)-@(d.tseq)기</em>
<span class="nav">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합")</span>
@Html.Raw(d.isrefund == 1 ? "<span class=\"grn\">환급</span>" : "")
<b>@d.cname</b>
</h5>
<dl>
<dt class="mpglSta3">추천강좌</dt>
<dd>신청기간 : @d.rstime.Value.ToString("yy/MM/dd") ~ @d.retime.Value.ToString("yy/MM/dd")</dd>
</dl>
</a>
</li>
}
</ul>
</div>
}
<div class="mpgcCont">
<div class="mpgTitle">
<h5>수강중인 과정</h5>
<a href="/My/Lecture">더보기</a>
</div><!-- mpgTitle -->
<p class="mpgDesc">※ 수료증 출력은 메뉴의 수강과정을 클릭하셔야 합니다.</p>
<ul class="mpgcList">
@foreach (var d in Model.Datas.Where(w => w.dtype == 2))
{
<li>
<a href="/CRoom/Index?croomlectno=@d.longval">
<h5>
<em>@d.intval-@(d.intval2)기</em>
<span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>
@Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
<b>@d.strval</b>
</h5>
<dl>
<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
</dl>
</a>
</li>
}
</ul>
@if (Model.Datas.Where(w => w.dtype == 2).Count() < 1)
{
<div style="padding: 30px; text-align: center;">수강중인 강좌가 없습니다.</div>
}
</div>
</div>
<div class="mpgNoti">
<div class="mpgnCont">

View File

@ -86,7 +86,7 @@
.mpgcList li a h5 b {display:block; height:20px; line-height:20px; float:left;}
.mpgcList li a h5 span.inline {display: inline-block; float: none; vertical-align: middle; margin-top: -3px;}
.mpgcList li a h5 em {font-size:14pt; color:#238dfa; margin-right:10px; font-style:normal;}
.mpgcList li a h5 span {padding:0 10px; color:#fff; margin-right:5px; font-weight:300; font-size:10pt;}
.mpgcList li a h5 span {padding: 0 10px;color: #fff;margin-right: 5px;font-weight: 300;font-size: 10pt;background-color: #333583}
.mpgcList li a h5 span.mpglLable1 {background:#333583;}
.mpgcList li a h5 span.mpglLable2 {background:#77b743;}
.mpgcList li a h5 b {font-size:14pt; font-weight:400;}

View File

@ -12,6 +12,7 @@ namespace NP.Model
public Assign Assign { get; set; }
public IList<Data> Datas { get; set; }
public IList<Data> Datas2 { get; set; }
public IList<Data> Datas3 { get; set; }
public IList<Board> Boards { get; set; }
public IList<PayItem> PIs { get; set; }
public IList<Lect> Lects { get; set; }