From 0367455c0e25bd520145f478edb7daf1c6558b9a Mon Sep 17 00:00:00 2001 From: devnet Date: Thu, 10 Oct 2024 02:12:23 +0000 Subject: [PATCH] =?UTF-8?q?<=EC=8B=A0=EA=B7=9C=EA=B0=9C=EB=B0=9C>=20(?= =?UTF-8?q?=EC=A3=BC=EC=9A=94)=EC=9E=91=EC=97=85=EB=82=B4=EC=9A=A9=20:=20?= =?UTF-8?q?=EC=84=B1=EC=A0=81=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=9D=BC?= =?UTF-8?q?=EA=B4=84=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 1 + BO/Views/Shared/Partial/PageRow.cshtml | 3 ++- BO/Views/croom/gradeall2.cshtml | 3 ++- Base/Controller/ACommon.cs | 20 +++++++++----------- Dao/MyBatis/Maps/Lect.xml | 5 +++++ Model/CM.cs | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 8f8eee2..c06530c 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -859,6 +859,7 @@ namespace NP.BO.Controllers { ht.Add("extype", vm.tabidx == 2 ? 0 : 1); ht.Add("estate", vm.addstringval2); + ht.Add("isbyadmin", vm.addstringval3); vm.LectEXes = Dao.Get("lect.lectexes.all", ht); if (vm.isexceldown == 1) { diff --git a/BO/Views/Shared/Partial/PageRow.cshtml b/BO/Views/Shared/Partial/PageRow.cshtml index f2c7aa4..ec3b722 100644 --- a/BO/Views/Shared/Partial/PageRow.cshtml +++ b/BO/Views/Shared/Partial/PageRow.cshtml @@ -4,8 +4,9 @@ var searchmethod = (ViewData["searchmethod"] ?? "").ToString(); var pageSize = (int)(ViewData["pagesize"] ?? 0); var isright = (int)(ViewData["right"] ?? 0); + var style = (ViewData["style"] ?? "vertical-align: middle;").ToString(); } - @* *@ diff --git a/BO/Views/croom/gradeall2.cshtml b/BO/Views/croom/gradeall2.cshtml index 50de06c..f0082cc 100644 --- a/BO/Views/croom/gradeall2.cshtml +++ b/BO/Views/croom/gradeall2.cshtml @@ -7,7 +7,8 @@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;2:응시완료;1:응시중;0:미응시" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "submit()" } }) - @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-점수종류;0:수강생응시;1:관리자등록;-1:미응시" }, { "name", "addstringval3" }, { "selected", Model.addstringval3 }, { "onchange", "submit()" } }) + @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount }, { "style", ""} }) @*엑셀다운로드*@ 엑셀다운로드 @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1;1" : "0;0;0") + ";1;right;평가안내") diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index 6bda21b..6f99760 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -1933,22 +1933,20 @@ namespace NP.Base.Controllers { var lectexs = Dao.Get("lect.lectex.forgradeupload", new Hashtable() { { "userno", lect.userno }, { "stime", lect.stime } }); if (lectexs.Count == 1) - { + { var lectex = lectexs.First(); + lect.cmno = lectex.cmno; + lect.cname = lectex.cname; + lect.lectno = lectex.lectno; + lect.cmino = lectex.cmino; + lect.iscomplete = lectex.iscomplete; + lect.exno = lectex.exno; + lect.exname = lectex.exname; + if (lectex.tpoint < lect.tpoint) { lect.value += ",평가점수오입력(초과)"; } - else - { - lect.cmno = lectex.cmno; - lect.cname = lectex.cname; - lect.lectno = lectex.lectno; - lect.cmino = lectex.cmino; - lect.iscomplete = lectex.iscomplete; - lect.exno = lectex.exno; - lect.exname = lectex.exname; - } } else { diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 209a4bf..34d26df 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1135,6 +1135,11 @@ ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 0 + + (c.isbyadmin = 0 or c.isbyadmin is null) and c.estart is null + c.isbyadmin = 0 and c.estart is not null + c.isbyadmin = 1 + ) a order by a.rno diff --git a/Model/CM.cs b/Model/CM.cs index 85042a8..d790076 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -3687,7 +3687,7 @@ namespace NP.Model { get { - return isbyadmin == 1 ? "관리자등록" : "수강생응시"; + return isbyadmin == 1 ? "관리자등록" : estart == null ? "미응시" : "수강생응시"; } } }