From 9aa9339ca4d363ae58eb33724c9c2ab422190f46 Mon Sep 17 00:00:00 2001 From: lch Date: Mon, 28 Jun 2021 09:21:58 +0000 Subject: [PATCH] =?UTF-8?q?=ED=99=88=ED=99=94=EB=A9=B4=EC=9D=98=20?= =?UTF-8?q?=EC=88=98=EA=B0=95=EC=A4=91=EC=9D=B8=EA=B3=BC=EC=A0=95/?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=A4=91=EC=9D=B8=EA=B3=BC=EC=A0=95/?= =?UTF-8?q?=EB=82=98=EC=9D=98=ED=95=A0=EC=9D=BC=20=ED=81=B4=EB=A6=AD?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EA=B0=95=EC=9D=98=EC=8B=A4=20=EC=9E=85?= =?UTF-8?q?=EC=9E=A5=20=EC=8B=9C=20'=EA=B0=95=EC=9D=98=EC=9E=A5=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9E=85=EC=9E=A5=ED=95=A9=EB=8B=88=EB=8B=A4'=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=B0=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FO/Views/My/Alarm.cshtml | 2 +- FO/Views/My/Index.cshtml | 8 ++++---- FO/Views/My/Lecture.cshtml | 6 +++--- FO/js/mypage.js | 9 +++++++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/FO/Views/My/Alarm.cshtml b/FO/Views/My/Alarm.cshtml index 764d4e5..45bd766 100644 --- a/FO/Views/My/Alarm.cshtml +++ b/FO/Views/My/Alarm.cshtml @@ -6,7 +6,7 @@ @foreach (var d in Model.Datas.Where(w => w.dtype == 4)) {
  • -
    +
    @d.strval (@(d.intval3)반) @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)
    @d.time.ToString("MM/dd HH:mm") diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 0278001..3d86648 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -56,7 +56,7 @@ if (status0CNT < 3) {
  • - +
    @d.intval-@(d.intval2)기 @(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인") @@ -120,7 +120,7 @@ if (status1CNT < 3) {
  • - +
    @d.intval-@(d.intval2)기 @(d.intval3 == 0 ? "온라인" : d.intval3 == 1 ? "교육장" : "온라인") @@ -175,7 +175,7 @@ {
  • - +
    @d.strval (@(d.intval3)반)
    @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)

    (@d.time.ToString("MM/dd HH:mm"))

    diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index 04465d3..3a1dac4 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -44,7 +44,7 @@
    - w.payno == d.payno && w.userno==ViewBag.SSUserNo).First().lectno, d.cmno) : "#")"> + w.payno == d.payno && w.userno==ViewBag.SSUserNo).First().lectno, d.cmno) : "#")" class="gocroom">
    @d.tyear-@(d.tseq)기 @d.cshapename @@ -76,11 +76,11 @@ @if (d.isgroup == 0) { - 입장 + 입장 } else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0) { - 입장 + 입장 } else { diff --git a/FO/js/mypage.js b/FO/js/mypage.js index a26562f..f8510fc 100644 --- a/FO/js/mypage.js +++ b/FO/js/mypage.js @@ -57,4 +57,13 @@ $(document).ready(function () { $('#mpgtmbBtn').removeClass('on'); $('html, body').removeClass('lock'); }); + + $(".gocroom").on("click", function () { + var href = $(this).data("href") || this.href; + if (href != undefined && href != null && href.toLowerCase().indexOf("croom/index?croomlectno=") != -1) { + msg("강의장으로 입장합니다.", null, null, null, "location.href='" + href + "'"); + return false; + } + return true; + }); }); \ No newline at end of file