From 249e02d7d4745ae01cd6562c82b5eef9a84819fb Mon Sep 17 00:00:00 2001 From: jity7777 Date: Thu, 27 Jan 2022 09:11:34 +0000 Subject: [PATCH] =?UTF-8?q?<=EC=86=94=EB=A3=A8=EC=85=98=EA=B0=9C=EC=84=A0-?= =?UTF-8?q?=EA=B0=9C=EC=84=A0>=201.=20=EC=9E=91=EC=97=85=EB=AA=85=20:=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?2.=20=EC=9E=91=EC=97=85=EC=9A=94=EC=B2=ADNO=20:=203.=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88NO=20:=204.=20=EC=9E=91=EC=97=85=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=20-=20BO/Controllers/croomController.cs=20=20(1)?= =?UTF-8?q?=20=EC=84=B1=EC=A0=81=EC=B2=98=EB=A6=AC>=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EB=AA=A9=EB=A1=9D=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - BO/Views/croom/payview.cshtml (1) 계산서확인 문구 p.taxtype 값에 따른 분기 처리 - BO/Views/data/learns.cshtml (1) 공통으로 되어있는부분 제거(페이징) - BO/Views/data/learns4.cshtml - BO/Views/data/learns6.cshtml - BO/Views/data/learns7.cshtml (1) pager, pagerow 코드 추가 - BO/Views/Shared/Partial/DForm.cshtml (1) name 잘못 표기된것 수정 - Dao/MyBatis/Maps/Lect.xml (1) "lect.users"에서 countlect 부분에 정상회원만 출력되게 수정 - Dao/MyBatis/Maps/System.xml (1) "cm.data.lect.raw" pagetotalcount에 over() 추가 - FO/Views/CRoom/Innings.cshtml (1) 문구 수정 --- BO/Controllers/croomController.cs | 38 +++++++++++++++++++++++++--- BO/Views/Shared/Partial/DForm.cshtml | 14 +++++----- BO/Views/croom/payview.cshtml | 9 ++++++- BO/Views/data/learns.cshtml | 5 +--- BO/Views/data/learns4.cshtml | 3 +++ BO/Views/data/learns6.cshtml | 3 +++ BO/Views/data/learns7.cshtml | 3 +++ Dao/MyBatis/Maps/Lect.xml | 11 ++++---- Dao/MyBatis/Maps/System.xml | 2 +- FO/Views/CRoom/Innings.cshtml | 4 +-- 10 files changed, 68 insertions(+), 24 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index c425b45..e9e4739 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -500,6 +500,8 @@ namespace NP.BO.Controllers } public ActionResult grades(NP.Model.VMCM vm) { + vm.IsAdmin = SUserInfo.IsAdmin; + var ht = SetHash(vm, false); ht.Add("tyear", !string.IsNullOrEmpty(vm.stringval2) ? null : vm.stringval); ht.Add("tmno", vm.stringval2); @@ -523,9 +525,6 @@ namespace NP.BO.Controllers ht.Add("cnamelike", vm.stringval5); - - - vm.IsAdmin = SUserInfo.IsAdmin; if (SUserInfo.IsTeacher) { ht.Add("profno", SUserInfo.UserNo); @@ -533,6 +532,7 @@ namespace NP.BO.Controllers ht.Add("status", 1); vm.CMs = Dao.Get("lect.cms", ht); vm.pagetotalcount = GetCount(vm.CMs.FirstOrDefault()); + vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); vm.IsProf = SUserInfo.IsTeacher; return View(vm); @@ -559,7 +559,37 @@ namespace NP.BO.Controllers { vm.CMEV = new CMEV() { }; } - vm.Lects = Dao.Get("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval },{"iscomplete",vm.addstringval2 },{"cmisno",vm.addstringval3 },{ "ispasss", vm.addstringval4 },{"ispassa",vm.addstringval5 },{"ispassex",vm.addstringval6 },{"usernameid",vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); + + bool searchCheck = false; + string tempStr = Request == null ? "" : (Request.UrlReferrer == null ? "" : Request.UrlReferrer.ToString()) ; + string[] tempArr = { "" }; + + try + { + if (tempStr.IndexOf("/croom/") > -1) + { + tempArr = tempStr.Split('.'); + tempArr = tempArr[tempArr.Length - 1].Split('/'); + if (tempArr[tempArr.Length - 1] == "grade") + { + searchCheck = true; + } + } + } + catch + { + searchCheck = false; + } + + if (searchCheck) + { + vm.Lects = Dao.Get("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); + } + else + { + vm.Lects = new List(); + } + vm.CMInnings = new List() { }; vm.CMinningscds = new List() { }; if(vm.CMEV.cshape ==2) diff --git a/BO/Views/Shared/Partial/DForm.cshtml b/BO/Views/Shared/Partial/DForm.cshtml index f2408f4..722450b 100644 --- a/BO/Views/Shared/Partial/DForm.cshtml +++ b/BO/Views/Shared/Partial/DForm.cshtml @@ -19,13 +19,13 @@ - - - - - - - + + + + + + + diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index e6ce71c..7d66716 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -159,7 +159,14 @@ 계산서확인 - @p.ischeckname + @if (p.taxtype == 3) + { + @p.ischeckname + } + else + { + - + } diff --git a/BO/Views/data/learns.cshtml b/BO/Views/data/learns.cshtml index bc533c1..f2ea7d7 100644 --- a/BO/Views/data/learns.cshtml +++ b/BO/Views/data/learns.cshtml @@ -11,11 +11,8 @@
  • RawData
    • -
    - @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) -
    + @{Html.RenderPartial("learns" + Model.tabidx, Model);} -@Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
    @Html.HiddenFor(m => m.tabidx)
    diff --git a/BO/Views/data/learns4.cshtml b/BO/Views/data/learns4.cshtml index 256b9ed..1b500fa 100644 --- a/BO/Views/data/learns4.cshtml +++ b/BO/Views/data/learns4.cshtml @@ -26,6 +26,7 @@
    + @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) 엑셀다운로드
    @@ -86,6 +87,8 @@
    @Html.HiddenFor(m => m.tabidx) + + @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)