From 4675f187c97996f5424ce71d5d030be635e25170 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 12 Jul 2021 08:04:25 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B0=95=EC=9D=98=EC=8B=A4>=EC=8B=9C=ED=97=98>?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"(오류) 변경된 수강기간에 맞춰 시험 응시를 진행할 수 있도록 요청
케이스 작석중
ID: teststudent5
강좌: 교육기간 ~7/1
초기값: 교육기간 ~7/1 로 설정 및 수강신청
교육생 교육기간 변경 : 교육운영>수강신청>교육생정보
변경일자: ~7/30
현상 : 응시기간이 아니라며 시험응시가 불가능함
 -> 변경된 날짜 7/30까지 응시가 가능하도록 변경"

"응시기간 문구변경
기존 : 21-01-01 00:00 ~ 21-07-01 23:59
변경 : 수강 종료일 (2021-07-01) 이내
* 교육운영>수강신청>교육생정보 에서 변경한 종료일이 출력될 수 있도록 수정요청"
---
 Dao/MyBatis/Maps/CRoom.xml           | 4 ++--
 FO/Views/CRoom/EstimationExam.cshtml | 4 ++--
 Model/CM.cs                          | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 4d53977..f583058 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -487,7 +487,7 @@
             order by a.dtype,a.rno
         </select>
         <select id="cr.lectex" parameterClass="hashtable" resultClass="lectex">
-            select a.lectno,a.attrate,a.iscomplete
+            select a.lectno,a.attrate,a.iscomplete,a.sdate,a.edate
             ,b.sstime,b.setime
             ,c.exno,c.exname,c.extype,c.edesc,c.econdition,c.etime,c.evtype,c.eqtype,c.israndq,c.israndqi,c.qcount,c.isblur,c.tpoint,ifnull(c.relaylimit,999) relaylimit,c.isusebackup,c.isseq,c.isreexamable,c.isresultopen
             ,d.lectno exlectno,d.estart,d.eend,d.tpoint,d.recount,d.rechecktime,ifnull(d.entercount,0) entercount,d.cblock
@@ -516,7 +516,7 @@
             inner join lectexq c on c.lectno=b.lectno and c.exno=b.exno
             inner join cmexq d on d.eqno=c.eqno
             inner join question e on e.qno=d.qno
-            where a.exno=#exno# and now() between a3.sstime and a3.setime
+            where a.exno=#exno# and now() between a2.sdate and a2.edate
             order by c.qseq;
 
             update lectex a
diff --git a/FO/Views/CRoom/EstimationExam.cshtml b/FO/Views/CRoom/EstimationExam.cshtml
index 5320933..e5d016a 100644
--- a/FO/Views/CRoom/EstimationExam.cshtml
+++ b/FO/Views/CRoom/EstimationExam.cshtml
@@ -8,7 +8,7 @@
     <tr><th>시험제목</th><td>@Model.LectEX.exname</td></tr>
     <tr><th>시험내용</th><td>@Html.Raw((Model.LectEX.edesc??"").Replace(System.Environment.NewLine, "<br />"))</td></tr>
     <tr><th>제한시간</th><td>@(Model.LectEX.etime == 0 ? "제한없음" : string.Format("{0} 분", Model.LectEX.etime))</td></tr>
-    <tr><th>응시시간</th><td>@Model.LectEX.sstime.ToString("yy-MM-dd") 00:00 ~ @Model.LectEX.setime.ToString("yy-MM-dd") 23:59</td></tr>
+    <tr><th>응시시간</th><td>수강 종료일 (@Model.LectEX.edate.Value.ToString("yyyy-MM-dd")) 이내</td></tr>
     <tr><th>재응시여부</th><td>@(Model.LectEX.isreexamable == 0 ? "불가능" : "가능")</td></tr>
     <tr><th>응시상태</th><td>@(Model.LectEX.estart == null ? ("응시전"+(Model.LectEX.recount > 0 ? string.Format(" (재응시승인 {0}회)", Model.LectEX.recount):"")) : Model.LectEX.eend != null ? "응시완료" : Model.LectEX.rtime < 1 ? "응시시간초과":("응시시작 (남은시간 " + Model.LectEX.rtime + "분)" +(Model.LectEX.relaylimit.Value <= Model.LectEX.entercount?", [이어보기 초과]":"")))</td></tr>
     @if (Model.LectEX.estart != null)
@@ -40,7 +40,7 @@
         var openedexam = false;
         function goexam() {
             if (@(Model.LectEX.eend == null && (Model.LectEX.estart == null || Model.LectEX.relaylimit.Value >= Model.LectEX.entercount) ? 1 : 0) == 1) {
-                if (@(Model.LectEX.sstime > DateTime.Now || Convert.ToDateTime(Model.LectEX.setime.ToString("yyyy-MM-dd")).AddDays(1).AddSeconds(-1) < DateTime.Now?0:1)== 0) {
+                if (@(Model.LectEX.sdate.Value > DateTime.Now || Convert.ToDateTime(Model.LectEX.edate.Value.ToString("yyyy-MM-dd")).AddDays(1).AddSeconds(-1) < DateTime.Now?0:1)== 0) {
                     msg("응시기간이 아닙니다.");
                 } else if (@Model.LectEX.rtime < 1 && @Model.LectEX.etime > 0) {
                     msg("응시시간이 초과되었습니다.");
diff --git a/Model/CM.cs b/Model/CM.cs
index f9b5543..f9144cd 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -3180,6 +3180,14 @@ namespace NP.Model
         public IList<LectEXQ> UED { get; set; }
         public int issubmit { get; set; }
         public int? iscomplete { get; set; }
+        /// <summary>
+        /// 온라인강좌 수강시작일
+        /// </summary>
+        public DateTime? sdate { get; set; }
+        /// <summary>
+        /// 온라인강좌 수강종료일
+        /// </summary>
+        public DateTime? edate { get; set; }
     }
     [Serializable]
     public class LectEXQ : LectEX