From 853aad30a4ceb76fb5119174bbe3b8b53a96de3f Mon Sep 17 00:00:00 2001
From: jity7777 <jity7777  @example.com>
Date: Fri, 23 Sep 2022 07:43:41 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=20pms6712,=20pms6746=202.=20(=EC=A3=BC=EC=9A=94)?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20FO/Views/My/Lectur?=
 =?UTF-8?q?e.cshtml=20=20-=20=EA=B5=90=EC=9C=A1=EC=A2=85=EB=A3=8C=EC=9D=BC?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A7=80=EB=82=9C=20=EA=B3=BC=EC=A0=95=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20=EC=95=8C=EB=A6=BC=EC=B0=BD=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20(2)=20FO/Views/My/LectureOn.cs?=
 =?UTF-8?q?html=20=20-=20=EB=B3=80=EA=B2=BD=ED=8C=9D=EC=97=85=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EA=B5=90=EC=9C=A1=EC=A2=85=EB=A3=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B3=BC=EA=B1=B0=20=EA=B1=B4=EC=9D=80=20=EC=B6=9C=EB=A0=A5=20?=
 =?UTF-8?q?=EC=95=88=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FO/Views/My/Lecture.cshtml   |  2 +-
 FO/Views/My/LectureOn.cshtml | 37 ++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml
index 69e6103..4c6ffdb 100644
--- a/FO/Views/My/Lecture.cshtml
+++ b/FO/Views/My/Lecture.cshtml
@@ -96,7 +96,7 @@
     }
     else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0)
     {
-                <a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno"  data-cshape=@d.cshape class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:55px; height:42px; line-height:2; font-size:20px;">입장</a>
+                <a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno"  data-cshape=@d.cshape @strComplete class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:55px; height:42px; line-height:2; font-size:20px;">입장</a>
     }
     else
     {
diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml
index ad634e0..e30a135 100644
--- a/FO/Views/My/LectureOn.cshtml
+++ b/FO/Views/My/LectureOn.cshtml
@@ -152,11 +152,8 @@
         var ulScd = $("#ulScd" + cmno);
         ulScd.empty();
         //var seq = 0;
-        if (capResult.obj.length < 1) {
-            var li = $("<li />");
-            li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
-            ulScd.append(li);
-        }
+            let displayCnt = 0;
+            let noDisPlay = true;
 
         $.each(capResult.obj, function (i, d) {
             var li = $("<li />");
@@ -171,10 +168,12 @@
                 strStudyPlacename = '[' + d.studyplacename + '교육장]';
             }
 
-            if (d.isEnd == true) {
-                pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
-            }
-            else {
+            //if (d.isEnd == true) {
+            //    pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+            //}
+            if (d.isEnd == false)
+            {
+                ++displayCnt;
                 if (d.quota != 0) {
                     if (d.remainPeople <= 0) {
                         pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
@@ -203,9 +202,27 @@
                 }
             }
 
-            li.append(pData);            
+            //if (capResult.obj.length < 1) {
+            //    var li = $("<li />");
+            //    li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
+            //    ulScd.append(li);
+            //}
+            // 아래 코딩으로 대체
+            if (displayCnt == 0 && noDisPlay) {
+                var li = $("<li />");
+                li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
+                ulScd.append(li);
+                noDisPlay = false;
+            }
+
+            li.append(pData);
             ulScd.append(li);
+
         });
+
+
+
+
     }
 
     function renderScd() {