diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 15a8c8e..8fc4775 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -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 < 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 diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 5c16393..a833176 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -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 @@
-
신청중인 과정
더보기
-

※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.

+
+
수강중인 과정
+ 더보기 +
+

※ 수료증 출력은 메뉴의 수강과정을 클릭하셔야 합니다.

- @if (Model.Datas.Where(w => w.dtype == 1).Count() < 1) + @if (Model.Datas.Where(w => w.dtype == 2).Count() < 1) { -
신청중인 강좌가 없습니다.
+
수강중인 강좌가 없습니다.
}
- @if (Model.Datas.Where(w => w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0) - { -
- - +
+ }
-
-
수강중인 과정
- 더보기 -
-

※ 수료증 출력은 메뉴의 수강과정을 클릭하셔야 합니다.

+
신청중인 과정
더보기
+

※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.

- @if (Model.Datas.Where(w => w.dtype == 2).Count() < 1) + @if (Model.Datas.Where(w => w.dtype == 1).Count() < 1) { -
수강중인 강좌가 없습니다.
+
신청중인 강좌가 없습니다.
}
+
diff --git a/FO/css/mypage.css b/FO/css/mypage.css index 525426a..c7da651 100644 --- a/FO/css/mypage.css +++ b/FO/css/mypage.css @@ -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;} diff --git a/Model/VMMy.cs b/Model/VMMy.cs index 933ca62..94dc003 100644 --- a/Model/VMMy.cs +++ b/Model/VMMy.cs @@ -12,6 +12,7 @@ namespace NP.Model public Assign Assign { get; set; } public IList Datas { get; set; } public IList Datas2 { get; set; } + public IList Datas3 { get; set; } public IList Boards { get; set; } public IList PIs { get; set; } public IList Lects { get; set; }