From e36fe50aad76efd3d17b98d16bb3ca4c50e6d6ac Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Wed, 9 Jun 2021 07:37:24 +0000
Subject: [PATCH] =?UTF-8?q?"=EB=B3=B5=EC=8A=B5=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84=20-=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=20=EC=A2=85=EB=A3=8C=EC=9D=BC=EB=A1=9C=EB=B6=80?=
 =?UTF-8?q?=ED=84=B0=201=EB=85=84=EA=B9=8C=EC=A7=80=20=EB=B3=B5=EC=8A=B5?=
 =?UTF-8?q?=EB=A7=8C=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EA=B5=AC=ED=98=84"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Controller/FOCommon.cs      |   4 +-
 Dao/MyBatis/Maps/CRoom.xml       |   5 +-
 FO/Controllers/CDMSController.cs | 106 ++++++++++++++++++-------------
 FO/Views/CDMS/Contents.cshtml    |  70 +++++++-------------
 FO/Views/CRoom/Index.cshtml      |   2 +-
 FO/Views/CRoom/Innings.cshtml    |   2 +-
 6 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs
index bd4704e..9efc879 100644
--- a/Base/Controller/FOCommon.cs
+++ b/Base/Controller/FOCommon.cs
@@ -353,10 +353,10 @@ namespace NP.Base.Controllers
                 {
                     return JsonBack(new JsonRtn() { code = 1000, obj = -2 });
                 }
-                else if (cmi.isrebate == 1)
+                else  
                 {
                     var intval = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", lectno }, { "isfinishtoday", 1 } }).Count();
-                    if (intval > 5 && cmi.istatus < 2)
+                    if (intval > 7 && cmi.istatus < 2)
                     {
                         return JsonBack(new JsonRtn() { code = 1000, obj = -3 });
                     }
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index f22fa8c..8318b83 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -251,9 +251,8 @@
                 <isGreaterThan property="pseq" compareValue="0">and p.pseq=#pseq#</isGreaterThan>
                 <isGreaterThan property="cpno" compareValue="0">and p.cpno=#cpno#</isGreaterThan>
                 <isGreaterThan property="isrelay" compareValue="0">and p.pseq=li.pseq</isGreaterThan>
-            inner join lect b on b.lectno=#lectno# and b.userno=#userno# and b.cmno=a.cmno and b.status=1 and b.ischanged=0 and b.sdate &lt; now()
-            <!--inner join cm c on c.cmno=b.cmno and c.sstime &lt; now() and c.setime &gt; now()-->
-            where a.cmino=#cmino#
+            inner join lect b on b.lectno=#lectno# and b.userno=#userno# and b.cmno=a.cmno and b.status=1 and b.ischanged=0             
+            where a.cmino=#cmino# and  b.sdate &lt; now() and b.edate &gt; now()
             <selectKey type="post" property="logno" resultClass="long">SELECT  last_insert_id()</selectKey>
         </insert>
         <select id="cr.ctps" parameterClass="hashtable" resultClass="ctp">
diff --git a/FO/Controllers/CDMSController.cs b/FO/Controllers/CDMSController.cs
index d9576eb..7caa00c 100644
--- a/FO/Controllers/CDMSController.cs
+++ b/FO/Controllers/CDMSController.cs
@@ -83,51 +83,71 @@ namespace NP.FO.Controllers
                 //출석 인증 시만 보이게 제한 처리 (intval 회차, intval2 출석인증제외 회원, intval3 출석인증제외 강좌)
                 if (data != null && (data.intval == 1 || data.intval2 == 1 || data.intval3 == 1))
                 {
-                    //이어보기를 위해 페이지관리
-                    //vm.pseq = vm.pseq < 1 ? 1 : vm.pseq;
-                    vm.pseq = 0;
-                    //학습로그생성
-                    String ua = "";
-                    try
+                    var todayLectinningCount = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count();
+                    //1일 신규 동영상 강의를 8차시로 제한
+                    if (todayLectinningCount < 8)
                     {
-                        ua = (Request.UserAgent ?? "").ToLower();
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error("ExamStart Get UserAgent Info Error" + ex.StackTrace);
-                    }
-                    vm.lip = new LectInningPage()
-                    {
-                        lectno = vm.lectno,
-                        cmino = vm.cmino,
-                        pseq = vm.pseq,
-                        userno = SUserInfo.UserNo,
-                        isrelay = 1,
-                        uno = SUserInfo.UserNo,
-                        uip = GetUserIP(),
-                        ispc = vm.ismobile == 1 ? 0 : 1,
-                        webkitinfo = ua.Length > 500 ? ua.Substring(0, 500) : ua
-                    };
-                    Dao.Insert("cr.lectinningpage.in", vm.lip);
-                    if (vm.lip.logno > 0)
-                    {
-                        vm.status = 1;
-                        vm.Pages = Dao.Get<LectInningPage, CTPage>("cr.ctps", vm.lip);
-                        vm.pseq = vm.Pages.First().lastpseq;
-                        vm.Page = vm.Pages.Where(w => w.pseq == vm.pseq).First();
-                        vm.CMInning = new CMInning() { isokmid = vm.Page.isokmid, ismenu = vm.Page.ismenu, iseq = vm.Page.iseq, ititle = vm.Page.ititle, ctype = vm.Page.ctype, ccode = vm.Page.ccode, isoversize = vm.Page.isoversize, mstime = vm.Page.mstime, metime = vm.Page.metime };
-                        if (vm.CMInning.isokmid == 0 && vm.CMInning.metime > 0)
+                        //이어보기를 위해 페이지관리
+                        //vm.pseq = vm.pseq < 1 ? 1 : vm.pseq;
+                        vm.pseq = 0;
+                        //학습로그생성
+                        String ua = "";
+                        try
                         {
-                            //if (Request.IsLocal || GetConfig("isdevtest")=="1")
-                            //{
-                            //    vm.CMInning.mtime = 10;
-                            //}
-                            //else
-                            //{
-                            Random r = new Random();
-                            vm.CMInning.mtime = r.Next(vm.CMInning.mstime * 60, vm.CMInning.metime * 60);
-                            vm.CMInning.mtime = vm.CMInning.mtime < 10 ? 15 : vm.CMInning.mtime;
-                            //}
+                            ua = (Request.UserAgent ?? "").ToLower();
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Error("ExamStart Get UserAgent Info Error" + ex.StackTrace);
+                        }
+                        vm.lip = new LectInningPage()
+                        {
+                            lectno = vm.lectno,
+                            cmino = vm.cmino,
+                            pseq = vm.pseq,
+                            userno = SUserInfo.UserNo,
+                            isrelay = 1,
+                            uno = SUserInfo.UserNo,
+                            uip = GetUserIP(),
+                            ispc = vm.ismobile == 1 ? 0 : 1,
+                            webkitinfo = ua.Length > 500 ? ua.Substring(0, 500) : ua
+                        };
+                        Dao.Insert("cr.lectinningpage.in", vm.lip);
+                        if (vm.lip.logno > 0)
+                        {
+                            vm.status = 1;
+                            vm.Pages = Dao.Get<LectInningPage, CTPage>("cr.ctps", vm.lip);
+                            vm.pseq = vm.Pages.First().lastpseq;
+                            vm.Page = vm.Pages.Where(w => w.pseq == vm.pseq).First();
+                            vm.CMInning = new CMInning() { isokmid = vm.Page.isokmid, ismenu = vm.Page.ismenu, iseq = vm.Page.iseq, ititle = vm.Page.ititle, ctype = vm.Page.ctype, ccode = vm.Page.ccode, isoversize = vm.Page.isoversize, mstime = vm.Page.mstime, metime = vm.Page.metime };
+                            if (vm.CMInning.isokmid == 0 && vm.CMInning.metime > 0)
+                            {
+                                //if (Request.IsLocal || GetConfig("isdevtest")=="1")
+                                //{
+                                //    vm.CMInning.mtime = 10;
+                                //}
+                                //else
+                                //{
+                                Random r = new Random();
+                                vm.CMInning.mtime = r.Next(vm.CMInning.mstime * 60, vm.CMInning.metime * 60);
+                                vm.CMInning.mtime = vm.CMInning.mtime < 10 ? 15 : vm.CMInning.mtime;
+                                //}
+                            }
+                        }
+                        else
+                        {
+                            #region 복습처리(학습종료일 ~ 1년)                     
+                            vm.LectInnings = Dao.Get<LectInning>("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.lectno }, { "userno", SUserInfo.UserNo }, { "limit", 1 } });
+                            if (vm.LectInnings.Count() > 0 && vm.LectInnings.First().sdate < DateTime.Now && vm.LectInnings.First().edate.AddYears(1) > DateTime.Now)
+                            {
+                                vm.istaste = 1;
+                                vm.status = 1;
+                                vm.Pages = Dao.Get<LectInningPage, CTPage>("cr.ctps", vm.lip);
+                                vm.pseq = vm.Pages.First().lastpseq;
+                                vm.Page = vm.Pages.Where(w => w.pseq == vm.pseq).First();
+                                vm.CMInning = new CMInning() { lectno = vm.lectno, cmino = vm.cmino, isokmid = vm.Page.isokmid, ismenu = vm.Page.ismenu, iseq = vm.Page.iseq, ititle = vm.Page.ititle, ctype = vm.Page.ctype, ccode = vm.Page.ccode, isoversize = vm.Page.isoversize, mstime = vm.Page.mstime, metime = vm.Page.metime };
+                            }
+                            #endregion
                         }
                     }
                 }                
diff --git a/FO/Views/CDMS/Contents.cshtml b/FO/Views/CDMS/Contents.cshtml
index 02ea6af..ffd078e 100644
--- a/FO/Views/CDMS/Contents.cshtml
+++ b/FO/Views/CDMS/Contents.cshtml
@@ -353,30 +353,14 @@
         //}
     }
     function golog(ispaging, isunload, isinning) {
-        var checklectdate = -1;
-        if (@Model.istaste == 1) {
-            checklectdate = 1;
-        } else {
-            $.ajax({
-                   type: "post",
-                   url: "/focommon/checklectdate",
-                   async: false,
-                   data: { lectno: @Model.lip.lectno},
-                   success: function (res) {
-                       checklectdate = res.result;
-                   }, error: function (e) {
-                       alert("error");
-                }
-            });
-        }
-
+        
         ispaging = ispaging || false;
         isunload = isunload || false;
         isinning = isinning || false;
         _tsec++;
         if (!ispaging && !isunload && !isinning) {
             _sec++;
-        }
+        }        
         if (_mtimesec > 0) {
             _mtimesec++;
             if (_mtimesec > 10) {
@@ -395,38 +379,32 @@
                     _psecond = getint($("#video1")[0].currentTime);
                 }
             } catch (e) { }
-            if (checklectdate > 0) {
-                capp("/focommon/studylog", { logno: _logno, lectno: @Model.lip.lectno, cmino: @Model.lip.cmino, cpno: _cpno, studysec: _sec, ispc: ismobile() ? 0 : 1, nextcpno: ispaging ? _nextcpno : 0, getiframe: @(Model.CMInning.ismenu == 1 && Model.CMInning.ctype == 2 ? 1 : 0), issample: @Model.istaste, psec: _psecond }, "cbstudylog" + (ispaging ? "page" : "") + (isunload ? "unload" : "") + (isinning ? "inning" : ""), null, null, true, null, true);
-            }
+            capp("/focommon/studylog", { logno: _logno, lectno: @Model.lip.lectno, cmino: @Model.lip.cmino, cpno: _cpno, studysec: _sec, ispc: ismobile() ? 0 : 1, nextcpno: ispaging ? _nextcpno : 0, getiframe: @(Model.CMInning.ismenu == 1 && Model.CMInning.ctype == 2 ? 1 : 0), issample: @Model.istaste, psec: _psecond }, "cbstudylog" + (ispaging ? "page" : "") + (isunload ? "unload" : "") + (isinning ? "inning" : ""), null, null, true, null, true);
         } else if (_mtime > 0 && !_okmid && _tsec >= _mtime && _mtimesec < 1) {
-
-            if (checklectdate > 0) {
-                //alert(checklectdate);
-                //clearInterval(_timerlog);
-                _mtimesec = 1;
-                $("#playerbox").addClass("hidecontent");
-                if (_ctype == 0 && navigator.userAgent.match(/iPhone|iPod/i)) {
-                    var vid = document.getElementById('video1');
-                    vid.webkitExitFullscreen();
-                } else {
+            //clearInterval(_timerlog);
+            _mtimesec = 1;
+            $("#playerbox").addClass("hidecontent");
+            if (_ctype == 0 && navigator.userAgent.match(/iPhone|iPod/i)) {
+                var vid = document.getElementById('video1');
+                vid.webkitExitFullscreen();
+            } else {
+                try {
+                    if (navigator.userAgent.match(/iPhone|iPod/i)) {
+                        alert('10초안에 중간출석을 확인해주세요.');
+                    }
+                    else if (typeof (document.msExitFullscreen) == "function") {
+                        document.msExitFullscreen();
+                    } else if (typeof (document.webkitExitFullscreen) == "function") {
+                        document.webkitExitFullscreen();
+                    }
+                } catch (e) {
                     try {
-                        if (navigator.userAgent.match(/iPhone|iPod/i)) {
-                            alert('10초안에 중간출석을 확인해주세요.');
-                        }
-                        else if (typeof (document.msExitFullscreen) == "function") {
-                            document.msExitFullscreen();
-                        } else if (typeof (document.webkitExitFullscreen) == "function") {
-                            document.webkitExitFullscreen();
-                        }
-                    } catch (e) {
-                        try {
-                            document.webkitExitFullscreen();
-                        } catch (e2) {
-                        }
+                        document.webkitExitFullscreen();
+                    } catch (e2) {
                     }
                 }
-                msg("중간출석 확인 메시지입니다. 10초안에 확인을 눌러주세요.", null, null, null, "okmid()");
             }
+            msg("중간출석 확인 메시지입니다. 10초안에 확인을 눌러주세요.", null, null, null, "okmid()");             
         }
     }
     function okmid() {
@@ -585,7 +563,7 @@
                 msg("현재차시를 학습완료해야 다음차시를 학습할 수 있습니다.");
             } else if (capResult.obj == -3) {
                 _timerlog = setInterval(golog, 1000);
-                msg("일일 최대 학습회차는 6차시입니다.");
+                msg("일일 최대 학습회차는 8차시입니다.");
             } else {
                 //학습로그 & 차시이동
                 _prenextcmino = capResult.obj;
diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml
index da26534..62d4273 100644
--- a/FO/Views/CRoom/Index.cshtml
+++ b/FO/Views/CRoom/Index.cshtml
@@ -141,7 +141,7 @@
                                     @if (d.isonline == 1)
                                     {
                                         //학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
-                                        <a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.edate > DateTime.Now*@ ? 1 : 0), @(d.isseq == 1 &&d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
+                                        <a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(d.isseq == 1 &&d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 ? 0 : 1));" class="lctcStdy">학습하기</a>
                                     }
                                 </li>
                             </ul>
diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml
index 6f93928..75519f8 100644
--- a/FO/Views/CRoom/Innings.cshtml
+++ b/FO/Views/CRoom/Innings.cshtml
@@ -47,7 +47,7 @@
                                 @if (d.isonline == 1)
                                 {
                                     //학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
-                                    <a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.setime > DateTime.Now *@ ? 1 : 0), @(d.isseq == 1 && d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
+                                    <a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(d.isseq == 1 && d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 ? 0 : 1));" class="lctcStdy">학습하기</a>
                                 }
                             </li>
                         </ul>