This commit is contained in:
kdh0120 2020-11-04 00:26:33 +00:00
parent 384cf418c5
commit 1c840433cb
6 changed files with 171 additions and 161 deletions

View File

@ -280,6 +280,7 @@ namespace NP.FO.Controllers
System.Text.StringBuilder sbmauth = new System.Text.StringBuilder(""); System.Text.StringBuilder sbmauth = new System.Text.StringBuilder("");
var tops = ""; var tops = "";
var topsauth = ""; var topsauth = "";
sbmauth.Append("<li><a class=\"mlink\" href=\"/My/Index\">Home</a></li>");
foreach (var m in GetMENUPAGES.Where(w => w.pdepth == 0 && w.isopen == 1)) foreach (var m in GetMENUPAGES.Where(w => w.pdepth == 0 && w.isopen == 1))
{ {
var mp = m.pagetype == 0 ? GetMENUPAGES.Where(w => w.pagetype > 0 && (w.m0 == m.pno || w.m1 == m.pno || w.m2 == m.pno || w.m3 == m.pno || w.m4 == m.pno)).FirstOrDefault() ?? new Model.MenuPage() { } : m; var mp = m.pagetype == 0 ? GetMENUPAGES.Where(w => w.pagetype > 0 && (w.m0 == m.pno || w.m1 == m.pno || w.m2 == m.pno || w.m3 == m.pno || w.m4 == m.pno)).FirstOrDefault() ?? new Model.MenuPage() { } : m;
@ -302,7 +303,6 @@ namespace NP.FO.Controllers
} }
sb2.Append("</ul></li>"); sb2.Append("</ul></li>");
sb2auth.Append("</ul></li>"); sb2auth.Append("</ul></li>");
sbmauth.Append("<li><a class=\"mlink\" href=\"/My/Index\">Home</a></li>");
sbmauth.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a>{0}</a><span></span><ul>", m.pagename, m.pno)); sbmauth.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a>{0}</a><span></span><ul>", m.pagename, m.pno));
if (m.usertype == 0) if (m.usertype == 0)
{ {

View File

@ -32,6 +32,7 @@ namespace NP.FO.Controllers
public ActionResult Index(VMMy vm) public ActionResult Index(VMMy vm)
{ {
ViewBag.mpgContclass = ""; ViewBag.mpgContclass = "";
vm.Assign = Dao.Get<Assign>("users.users.assign", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault();
//신청중,수강중,나의할일,나의알림 //신청중,수강중,나의할일,나의알림
vm.Datas = Dao.Get<Data>("lect.mydata", SUserInfo.UserNo); vm.Datas = Dao.Get<Data>("lect.mydata", SUserInfo.UserNo);
var sd = Request.Url.Host.Split('.')[0]; var sd = Request.Url.Host.Split('.')[0];

View File

@ -26,183 +26,192 @@
</div> </div>
} }
} }
<div class="mpgClass"> <div class="mpgCont">
<div class="mpgcCont"> <div class="mpgDsc">
<div class="mpgTitle"><h5>신청중인 과정</h5><a href="/My/Ready">더보기</a></div> <ul>
<p class="mpgDesc">※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.</p> <li><b>회사명 : </b>@Model.Assign.asname</li>
<ul class="mpgcList"> <li><b>연락처(이메일) : </b>@(Model.Assign.mphone) @(Model.Assign.taxemail == null ? "" : "("+Model.Assign.taxemail+")")</li>
@foreach (var d in Model.Datas.Where(w => w.dtype == 1))
{
<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>
}
@*@if (Model.Datas.Where(w=>w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
{
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> </ul>
@if (Model.Datas.Where(w => w.dtype == 1).Count() < 1) <p>※ 정보가 변경되었을 경우 정보 수정페이지로 이동하여 정확한 정보를 변경하여 주시기 바랍니다 <a href="/My/MyAssInfo">정보수정</a></p>
{
<div style="padding: 30px; text-align: center;">신청중인 강좌가 없습니다.</div>
}
</div> </div>
@if (Model.Datas.Where(w => w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0) <div class="mpgClass">
{ <div class="mpgcCont">
<div class="mpgcCont"> <div class="mpgTitle"><h5>신청중인 과정</h5><a href="/My/Ready">더보기</a></div>
<div class="mpgcEmpty"><a style="cursor:default">@(ViewBag.SSUserName)님, 이런 강의는 어떠세요?</a></div> <p class="mpgDesc">※ 신청취소는 신청기간에만 가능하며, 메뉴의 신청과정을 클릭하셔야 합니다.</p>
<ul class="mpgcList empty"> <ul class="mpgcList">
@foreach (var d in Model.CMs) @foreach (var d in Model.Datas.Where(w => w.dtype == 1))
{ {
<li> <li>
<a href="/Course/@d.cgcode.Replace("Test", "Cert")Detail?cmno=@d.cmno"> <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> <h5>
<em>@(d.tyear)-@(d.tseq)기</em> <em>@d.intval-@(d.intval2)기</em>
<span class="nav">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합")</span> <span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>
@Html.Raw(d.isrefund == 1 ? "<span class=\"grn\">환급</span>" : "") @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
<b>@d.cname</b> <b>@d.strval</b>
</h5> </h5>
<dl> <dl>
<dt class="mpglSta3">추천강좌</dt> <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.rstime.Value.ToString("yy/MM/dd") ~ @d.retime.Value.ToString("yy/MM/dd")</dd> <dd>신청기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
</dl> </dl>
</a> </a>
</li> </li>
} }
</ul> @*@if (Model.Datas.Where(w=>w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
</div> {
} foreach (var d in Model.CMs)
<div class="mpgcCont"> {
<div class="mpgTitle"> <li>
<h5>수강중인 과정</h5> <a href="/Course/@d.cgcode.Replace("Test", "Cert")Detail?cmno=@d.cmno">
<a href="/My/Lecture">더보기</a> <h5>
</div><!-- mpgTitle --> <em>@(d.tyear)-@(d.tseq)기</em>
<p class="mpgDesc">※ 수료증 출력은 메뉴의 수강과정을 클릭하셔야 합니다.</p> <span class="nav">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합")</span>
<ul class="mpgcList"> @Html.Raw(d.isrefund == 1 ? "<span class=\"grn\">환급</span>" : "")
@foreach (var d in Model.Datas.Where(w => w.dtype == 2)) <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>
@if (Model.Datas.Where(w => w.dtype == 1).Count() < 1)
{ {
<li> <div style="padding: 30px; text-align: center;">신청중인 강좌가 없습니다.</div>
<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">
<div class="mpgTitle">
<h5>나의 할일</h5>
<span id="mpgb01"></span>
</div> </div>
<ul class="mpgnList" id="mpgl01"> @if (Model.Datas.Where(w => w.dtype == 1).Count() < 1 && Model.CMs.Count() > 0)
@foreach (var d in Model.Datas.Where(w => w.dtype == 3).OrderBy(o => o.intval)) {
{ <div class="mpgcCont">
<li> <div class="mpgcEmpty"><a style="cursor:default">@(ViewBag.SSUserName)님, 이런 강의는 어떠세요?</a></div>
<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"> <a href="/CRoom/Index?croomlectno=@d.longval">
@if (d.intval == 1) <h5>
{ <em>@d.intval-@(d.intval2)기</em>
<h5><span>[학습]</span>@d.strval (@(d.intval3)반)</h5> <span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>
<h6>@(d.intval2)차시</h6> @Html.Raw(d.intval6 == 1 ? "<span class=\"grn\">환급</span>" : "")
<p>@d.time.ToString("MM/dd") 00:00 ~ <span style="color:#ff0000;">@d.time2.ToString("MM/dd") 23:59</span></p> <b>@d.strval</b>
} </h5>
else if (d.intval == 2) <dl>
{ <dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<h5><span>[출석]</span>@d.strval (@(d.intval3)반)</h5> <dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
<h6>@(d.intval2)차시</h6> </dl>
<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> </a>
</div> </li>
</li> }
</ul>
@if (Model.Datas.Where(w => w.dtype == 2).Count() < 1)
{
<div style="padding: 30px; text-align: center;">수강중인 강좌가 없습니다.</div>
} }
</ul> </div>
@if (Model.Datas.Where(w => w.dtype == 3).Count() < 1)
{
<div style="padding: 30px; text-align: center;">나의 할 일이 없습니다.</div>
}
</div> </div>
<div class="mpgnCont"> <div class="mpgNoti">
<div class="mpgTitle"><h5>나의 알림</h5><span id="mpgb02"></span></div> <div class="mpgnCont">
<ul class="mpgnList" id="mpgl02"> <div class="mpgTitle">
@foreach (var d in Model.Datas.Where(w => w.dtype == 4)) <h5>나의 할일</h5>
<span id="mpgb01"></span>
</div>
<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">
@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)
{ {
<li> <div style="padding: 30px; text-align: center;">나의 할 일이 없습니다.</div>
<div>
<a href="/CRoom/Index?croomlectno=@d.longval">
<h5>@d.strval (@(d.intval3)반)</h5>
<h6>@string.Format((d.intval < 3 ? "출석마감일이" : d.intval == 3 ? "진행평가마감일이" : d.intval == 4 ? "최종평가마감일이" : d.intval == 5 ? "과제마감일이" : d.intval == 6 ? "토론마감일이" : d.intval == 7 ? "강의평가마감일이" : d.intval == 8 ? "교육일이" : d.intval == 9 ? "시험일이" : "") + " {0}일 남았습니다.", d.intval2)</h6>
<p>(@d.time.ToString("MM/dd HH:mm"))</p>
</a>
<span class="mpgnClose" onclick="delalaram(@d.longval2, this)">닫기</span>
</div>
</li>
} }
</ul> </div>
@if (Model.Datas.Where(w => w.dtype == 4).Count() < 1) <div class="mpgnCont">
{ <div class="mpgTitle"><h5>나의 알림</h5><span id="mpgb02"></span></div>
<div style="padding: 30px; text-align: center;">나의 알림이 없습니다.</div> <ul class="mpgnList" id="mpgl02">
} @foreach (var d in Model.Datas.Where(w => w.dtype == 4))
{
<li>
<div>
<a href="/CRoom/Index?croomlectno=@d.longval">
<h5>@d.strval (@(d.intval3)반)</h5>
<h6>@string.Format((d.intval < 3 ? "출석마감일이" : d.intval == 3 ? "진행평가마감일이" : d.intval == 4 ? "최종평가마감일이" : d.intval == 5 ? "과제마감일이" : d.intval == 6 ? "토론마감일이" : d.intval == 7 ? "강의평가마감일이" : d.intval == 8 ? "교육일이" : d.intval == 9 ? "시험일이" : "") + " {0}일 남았습니다.", d.intval2)</h6>
<p>(@d.time.ToString("MM/dd HH:mm"))</p>
</a>
<span class="mpgnClose" onclick="delalaram(@d.longval2, this)">닫기</span>
</div>
</li>
}
</ul>
@if (Model.Datas.Where(w => w.dtype == 4).Count() < 1)
{
<div style="padding: 30px; text-align: center;">나의 알림이 없습니다.</div>
}
</div>
</div> </div>
</div> </div>
@section scriptsHeader{ @section scriptsHeader{

View File

@ -6,7 +6,7 @@
var mainprivate = (menus.Where(w => w.refcode == "main.private").FirstOrDefault() ?? em); var mainprivate = (menus.Where(w => w.refcode == "main.private").FirstOrDefault() ?? em);
var mainagree = (menus.Where(w => w.refcode == "main.agree").FirstOrDefault() ?? em); var mainagree = (menus.Where(w => w.refcode == "main.agree").FirstOrDefault() ?? em);
} }
<div id="footer"> <div id="footer" class="@(Request.Url.AbsolutePath == "/" ? "main" : "") ">
<div class="container"> <div class="container">
<div class="ftMenu"> <div class="ftMenu">
<ul> <ul>

View File

@ -16,7 +16,7 @@
} }
<div id="mypage" class="@ViewBag.mypageleftmenutoggle"> <div id="mypage" class="@ViewBag.mypageleftmenutoggle">
<div id="mpgTop"> <div id="mpgTop">
<h1 id="gnbLogo" style="background-size:auto 28px;"><a href="/">Logo</a></h1> <h1 id="gnbLogo" style="background:url('../img/lecture/top_logo.png')no-repeat center center;"><a href="/">Logo</a></h1>
<h2><a href="/My/Index">마이페이지</a></h2> <h2><a href="/My/Index">마이페이지</a></h2>
<div id="mpgtmbBtn"> <div id="mpgtmbBtn">
<span class="slice1"></span> <span class="slice1"></span>

View File

@ -1,4 +1,4 @@
@charset "utf-8"; @charset "utf-8";
@import url('https://fonts.googleapis.com/css?family=Noto+Sans+KR:100,300,400,500,700,900|Rajdhani:300,400,500,600,700&display=swap&subset=korean'); @import url('https://fonts.googleapis.com/css?family=Noto+Sans+KR:100,300,400,500,700,900|Rajdhani:300,400,500,600,700&display=swap&subset=korean');