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)