From b052aac45bde44143d4179d4a29607b50b89caf0 Mon Sep 17 00:00:00 2001
From: iyak <iyak  @example.com>
Date: Thu, 17 Jul 2025 07:28:51 +0000
Subject: [PATCH] =?UTF-8?q?7095.=20=EC=95=88=EC=A0=84=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EA=B3=84=EC=86=8D=EA=B5=90=EC=9C=A1(16=EC=8B=9C=EA=B0=84)?=
 =?UTF-8?q?=EA=B0=95=EC=9D=98=20=EC=88=98=EA=B0=95=20=EC=8B=9C=20=EC=8B=9C?=
 =?UTF-8?q?=ED=97=98=EC=9D=91=EC=8B=9C=20=EB=AC=B8=EA=B5=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FO/Views/CRoom/Estimation.cshtml        | 12 +++++++++---
 FO/Views/CRoom/EstimationSubject.cshtml | 15 +++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/FO/Views/CRoom/Estimation.cshtml b/FO/Views/CRoom/Estimation.cshtml
index a6a00a9..38effe0 100644
--- a/FO/Views/CRoom/Estimation.cshtml
+++ b/FO/Views/CRoom/Estimation.cshtml
@@ -43,7 +43,7 @@
     <table>
         <tbody>
             @foreach (var d in Model.Datas.Where(w => w.dtype > -1))
-            {                
+            {
                 <tr>
                     <th>
                         @*
@@ -60,11 +60,17 @@
                             <b>@(d.dtype == 0 ? "진행평가" : d.dtype == 1 ? "최종평가" : d.dtype == 2 ? "과제" : d.dtype == 3 ? "토론" : "")</b><span> @d.strval</span>
                         </h5>
 
+                        @{
+
+                            string trainingDateText = d.intval6 != 16 ? string.Format("/ 집체교육 참석일 ({0}) 전 까지", d.time.ToShortDateString()) : "";
+                        }
+
+
                         @if (d.dtype == 1)                           
                         {   // 최종평가                                                                                    
                             if (d.intval6 == 16 || (d.time2 < Convert.ToDateTime("2024-08-19")))
                             {
-                                <p>참여조건 : 진도율 @(d.intval2)% 이상 / 집체교육 참석일 (@d.time.ToShortDateString()) 전 까지</p>
+                                <p>참여조건 : 진도율 @(d.intval2)% 이상 @trainingDateText</p>
                             }
                             else
                             {
@@ -73,7 +79,7 @@
                         }
                         else if (d.dtype > 1)
                         {   // 기타
-                            <p>참여조건 : 진도율 @(d.intval2)% 이상 / 집체교육 참석일 (@d.time.ToShortDateString()) 전 까지</p>
+                            <p>참여조건 : 진도율 @(d.intval2)% 이상 @trainingDateText</p>
                         }
                     </th>
 
diff --git a/FO/Views/CRoom/EstimationSubject.cshtml b/FO/Views/CRoom/EstimationSubject.cshtml
index ba26feb..029ea39 100644
--- a/FO/Views/CRoom/EstimationSubject.cshtml
+++ b/FO/Views/CRoom/EstimationSubject.cshtml
@@ -2,26 +2,28 @@
 @{
 
 }
-<h3 class="lctTitle3">과제 안내</h3>
+<h3 class="lctTitle3">과제 작성방법 안내</h3>
 <dl class="teskCont">
-    <dt>과제내용</dt>
+    @*<dt>과제내용</dt>*@
+    
     <dd>
+        
         <table class="evaDetail">
             <tbody>
-                <tr>
+                @*<tr>
                     <th>과제제목</th>
                     <td>@Model.LectSD.sdname</td>
                 </tr>
                 <tr>
                     <th>제출시간</th>
                     <td>수강 종료일 (@Model.LectSD.edate.Value.ToString("yyyy-MM-dd")) 이내</td>
-                </tr>
+                </tr>*@
                 <tr>
                     <td colspan="2">
                         @Html.Raw((Model.LectSD.sddesc ?? "").Replace(System.Environment.NewLine, "<br/>"))
                     </td>
                 </tr>
-                
+
                 @if (Model.LectSD.sdfgno != null && Model.FileList.Where(w => w.fgno == Model.LectSD.sdfgno).Count() > 0)
                 {
                     <tr>
@@ -33,9 +35,10 @@
                         </td>
                     </tr>
                 }
-                
+
             </tbody>
         </table>
+        
     </dd>
 </dl>
 <form id="sform" method="post" enctype="multipart/form-data">