From cc2211f0ed9e118820d6741a5f1616fae5422574 Mon Sep 17 00:00:00 2001 From: iyak Date: Fri, 4 Apr 2025 07:12:42 +0000 Subject: [PATCH] =?UTF-8?q?6732.=20UI=EB=9E=9C=EB=8D=94=EB=A7=81=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=EB=AC=B8=EC=A0=9C=EB=A1=9C=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FO/Views/My/Index.cshtml | 157 ++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 61 deletions(-) diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index ec8bf7f..76bafd9 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -209,73 +209,108 @@ { string croomLink = string.Format("/CRoom/Index?croomlectno={0}", d.longval); - // 6709. 과제(intval 4)일 경우 링크가 달라야 한다 + // 6709. 과제(intval 4)일 경우 링크가 달라야 한다 switch (d.intval) { - case 4: - // 기존 쿼리에서는 sdno를 가져올 수 없어서 vm.CRoomLectSdInfo 를 추가함 - // => 쿼리조건 기준은 사용자번호를 기준으로 현재 수강중인 강좌기간내의 과제들을 모두 가져와서 들고 있음 - var lectsdInfo = new NP.Model.CRoomLectSdInfo(); - - if (Model.CRoomLectSdInfo != null) - { - lectsdInfo = Model.CRoomLectSdInfo - .Where(x => x.lectno == d.longval) - .SingleOrDefault(); - } - - if (lectsdInfo != null && lectsdInfo.lectno > 0) - { - croomLink = string.Format("/CRoom/EstimationSubject?croomlectno={0}&croomcmno={1}&estno={2}&tabidx=0", d.longval, d.intval7, lectsdInfo.sdno); - } - else - { - croomLink = string.Format("/CRoom/Index?croomlectno={0}", d.longval); - } - + case 1: +
  • +
    + +
    [학습]@d.strval (@(d.intval3)반)
    +
    @(d.intval2)차시
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    +     +
    +
    • break; - - default: - croomLink = string.Format("/CRoom/Index?croomlectno={0}", d.longval); + case 2: +
  • +
    + +
    [출석]@d.strval (@(d.intval3)반)
    +
    @(d.intval2)차시
    +

    일시: @d.strval3

    +     +
    +
    • + break; + case 3: + if (d.studytime == 16) + { +
  • +
    + +
    [시험]@d.strval (@(d.intval3)반)
    +
    @(d.intval4 == 0 ? "진행평가" : "최종평가")
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    +     +
    +
    • + } + break; + case 4: +
  • +
    + +
    [과제]@d.strval (@(d.intval3)반)
    +
    과제제출
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    +     +
    +
    • + break; + case 5: +
  • +
    + +
    [토론]@d.strval (@(d.intval3)반)
    +
    토론참여
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    +     +
    +
    • break; } -
  • -
    - - @if (d.intval == 1) - { -
    [학습]@d.strval (@(d.intval3)반)
    -
    @(d.intval2)차시
    -

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    - } - else if (d.intval == 2) - { -
    [출석]@d.strval (@(d.intval3)반)
    -
    @(d.intval2)차시
    -

    일시: @d.strval3

    - } - else if (d.intval == 3 && d.studytime == 16) - { -
    [시험]@d.strval (@(d.intval3)반)
    -
    @(d.intval4 == 0 ? "진행평가" : "최종평가")
    -

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    - } - else if (d.intval == 4) - { -
    [과제]@d.strval (@(d.intval3)반)
    -
    과제제출
    -

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    - } - else if (d.intval == 5) - { -
    [토론]@d.strval (@(d.intval3)반)
    -
    토론참여
    -

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    - } -     -
    -
    • + + @* + // 이 코드는 롤백을 대비하여 남겨둠 20250404일 이후 문제 없으면 제거한다. +
  • +
    + + @if (d.intval == 1) + { +
    [학습]@d.strval (@(d.intval3)반)
    +
    @(d.intval2)차시
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    + } + else if (d.intval == 2) + { +
    [출석]@d.strval (@(d.intval3)반)
    +
    @(d.intval2)차시
    +

    일시: @d.strval3

    + } + else if (d.intval == 3) + { +
    [시험]@d.strval (@(d.intval3)반)
    +
    @(d.intval4 == 0 ? "진행평가" : "최종평가")
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    + } + else if (d.intval == 4) + { +
    [과제]@d.strval (@(d.intval3)반)
    +
    과제제출
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    + } + else if (d.intval == 5) + { +
    [토론]@d.strval (@(d.intval3)반)
    +
    토론참여
    +

    @d.time.ToString("MM/dd") 00:00 ~ @d.time2.ToString("MM/dd") 23:59

    + } +     +
    +
    • *@ } }