From 388cb954e2367a457ddc6b08ae8f2ec5d0690851 Mon Sep 17 00:00:00 2001 From: lch Date: Wed, 30 Jun 2021 04:05:17 +0000 Subject: [PATCH] =?UTF-8?q?"=EB=8F=99=EC=98=81=EC=83=81=20=ED=95=99?= =?UTF-8?q?=EC=8A=B5=20=EC=A0=9C=ED=95=9C=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20-=201=EC=9D=BC=20=EC=8B=A0=EA=B7=9C=20=EB=8F=99?= =?UTF-8?q?=EC=98=81=EC=83=81=20=EA=B0=95=EC=9D=98=EB=A5=BC=208=EC=B0=A8?= =?UTF-8?q?=EC=8B=9C=EB=A1=9C=20=EC=A0=9C=ED=95=9C"=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FO/Controllers/CDMSController.cs | 4 ++-- FO/Controllers/CRoomController.cs | 4 ++-- FO/Views/CRoom/Index.cshtml | 2 +- FO/Views/CRoom/Innings.cshtml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FO/Controllers/CDMSController.cs b/FO/Controllers/CDMSController.cs index 5851c25..965dee8 100644 --- a/FO/Controllers/CDMSController.cs +++ b/FO/Controllers/CDMSController.cs @@ -83,9 +83,9 @@ namespace NP.FO.Controllers //출석 인증 시만 보이게 제한 처리 (intval 회차, intval2 출석인증제외 회원, intval3 출석인증제외 강좌) if (data != null && (data.intval == 1 || data.intval2 == 1 || data.intval3 == 1)) { - var todayLectinningCount = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); + var todayLectinningCount = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.lectno }, { "isfinishtoday", 1 } }).Count(); //1일 신규 동영상 강의를 8차시로 제한 - if (todayLectinningCount < 8) + if (todayLectinningCount < 18) { //이어보기를 위해 페이지관리 //vm.pseq = vm.pseq < 1 ? 1 : vm.pseq; diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index e92946a..08b9443 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -37,7 +37,7 @@ namespace NP.FO.Controllers } vm.Datas = Dao.Get("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy" + (Request.IsLocal ? "x" : ""), 1 },{ "limit", 6} }); - if (vm.LectInnings.Count() > 0 && !string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.FirstOrDefault().isrebate == 1) + if (vm.LectInnings.Count() > 0 && !string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) ) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); } @@ -55,7 +55,7 @@ namespace NP.FO.Controllers { vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); ViewBag.Mobile = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault().mobile; - if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) + if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); } diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index 388e7e8..72666fa 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -141,7 +141,7 @@ @if (d.isonline == 1) { //학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25 - 학습하기 + 학습하기 } diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml index f710d7f..e1be25d 100644 --- a/FO/Views/CRoom/Innings.cshtml +++ b/FO/Views/CRoom/Innings.cshtml @@ -47,7 +47,7 @@ @if (d.isonline == 1) { //학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25 - 학습하기 + 학습하기 }