From 35e065ba4f89b91e0063ded68e9af0969d056276 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Thu, 1 Jul 2021 01:48:25 +0000
Subject: [PATCH] =?UTF-8?q?"=ED=95=B4=EB=8B=B9=EA=B0=95=EC=A2=8C=EC=9C=A0?=
 =?UTF-8?q?=ED=98=95:=20=EC=98=A8=EB=9D=BC=EC=9D=B8=20=ED=95=B4=EB=8B=B9?=
 =?UTF-8?q?=ED=9A=8C=EC=B0=A8:=20=EC=A7=91=EC=B2=B4=EA=B5=90=EC=9C=A1=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD:=20=EC=B6=9C=EC=84=9D?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80,=20=EC=A7=91=EC=B2=B4=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EC=9D=BC=EC=A0=95,=20=EC=9E=A5=EC=86=8C=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=20=EC=88=A8=EA=B9=80=EC=B2=98=EB=A6=AC=20=20=EC=98=88)=20?=
 =?UTF-8?q?=EA=B2=B0=EC=84=9D=EC=A7=91=EC=B2=B4=EA=B5=90=EC=9C=A1=20:=2007?=
 =?UTF-8?q?-01=EC=9E=A5=EC=86=8C=20:=20=EB=B6=80=EC=82=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 나중에 다시 출력 예정입니다. 삭제 말고 숨김으로 부탁드립니다.
 - 코로나로 인해 집체교육이 실행되지 못하는데 날짜가 나오고 있어서 혼동이 있을 수 있다고 합니다"
---
 FO/Views/CRoom/Index.cshtml   | 35 +++++++++++++++++++++--------------
 FO/Views/CRoom/Innings.cshtml | 35 +++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml
index dba96f3..116df0e 100644
--- a/FO/Views/CRoom/Index.cshtml
+++ b/FO/Views/CRoom/Index.cshtml
@@ -105,25 +105,32 @@
             <tbody>
                 @foreach (var d in Model.LectInnings)
                 {
-                    <tr @(d.cshape == 2 && d.isonline == 0 ? "style=display:none;" : "")>
+                    <tr>
                         <th style="display:none"><em style="background:url(@(d.isonline == 0 ? "/img/lecture/week_thumb02.jpg" : (string.IsNullOrEmpty(d.tasteurl)?"/img/lecture/week_thumb01.jpg":(Model.Files + d.tasteurl))))no-repeat center center"></em></th>
                         <td>
                             <h5>[@(d.iseq)회] @d.ititle</h5>
-                            <dl>
-                                <dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
-                                <dd><span>@(d.isonline == 0 ? (d.cshape !=2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd>
-                                @if (d.isonline == 0)
-                                {
-                                    if (d.cshape != 2)
+                            @if (d.cshape == 2 && d.isonline == 0)
+                            {
+                                <dl></dl>
+                            }
+                            else
+                            {
+                                <dl>
+                                    <dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
+                                    <dd><span>@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd>
+                                    @if (d.isonline == 0)
                                     {
-                                        <dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
+                                        if (d.cshape != 2)
+                                        {
+                                            <dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
+                                        }
+                                        else
+                                        {
+                                            <dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
+                                        }
                                     }
-                                    else
-                                    {
-                                        <dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
-                                    }
-                                }
-                            </dl>
+                                </dl>
+                            }
                         </td>
                         <td>
                             <ul>
diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml
index 445210c..935f8b9 100644
--- a/FO/Views/CRoom/Innings.cshtml
+++ b/FO/Views/CRoom/Innings.cshtml
@@ -11,25 +11,32 @@
         <tbody>
             @foreach (var d in Model.LectInnings)
             {
-                <tr @(d.cshape == 2 && d.isonline == 0 ? "style=display:none;" : "")>
+                <tr>
                     <th style="display:none;"><em style="background:url(@(d.isonline == 0 ? "/img/lecture/week_thumb02.jpg" : (string.IsNullOrEmpty(d.tasteurl)?"/img/lecture/week_thumb01.jpg":(Model.Files + d.tasteurl))))no-repeat center center"></em></th>
                     <td>
                         <h5>[@(d.iseq)회] @d.ititle</h5>
-                        <dl>
-                            <dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
-                            <dd><span>@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd>
-                            @if (d.isonline == 0)
-                            {
-                                if (d.cshape != 2)
+                        @if (d.cshape == 2 && d.isonline == 0)
+                        {
+                            <dl></dl>
+                        }
+                        else
+                        {
+                            <dl>
+                                <dt>@(d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
+                                <dd><span>@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "강의기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dd>
+                                @if (d.isonline == 0)
                                 {
-                                    <dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
+                                    if (d.cshape != 2)
+                                    {
+                                        <dd style="margin-left:10px;"><span style="color:#222">강의실</span> : @(d.icontent ?? "-")</dd>
+                                    }
+                                    else
+                                    {
+                                        <dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
+                                    }
                                 }
-                                else
-                                {
-                                    <dd style="margin-left:10px;"><span style="color:#222">장소</span> : @(d.cname ?? "-")</dd>
-                                }
-                            }
-                        </dl>
+                            </dl>
+                        }
                     </td>
                     <td>
                         <ul>