diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index a96f837..9a8b91b 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -907,6 +907,7 @@ namespace NP.FO.Controllers ViewBag.IsMain = true; Base.Controllers.FOCommonController fOCommonController = new Base.Controllers.FOCommonController(); fOCommonController.Dao = new Dao.CommonDao(); + ViewBag.rslt = fOCommonController.CheckUserLect(vm.stringval3, vm.stringval21, vm.stringval4, vm.stringval5, int.Parse(vm.stringval17), int.Parse(vm.stringval18), SUserInfo.UserNo); //vm.ComCodes = GetComCodes("studyplace"); @@ -923,6 +924,7 @@ namespace NP.FO.Controllers vm.CMInningscds= Dao.Get("cm.cminningscds.applyedu" , hsData); vm.SelectCMInningscd = vm.CMInningscds.Where(c => c.cmisno == long.Parse(vm.stringval20) && c.cmino == long.Parse(vm.stringval19)).First(); vm.intval = Dao.Get("lect.count.user4", new Hashtable { { "userno", SUserInfo.UserNo }, { "pcmno", long.Parse(vm.stringval18) } }).FirstOrDefault(); + vm.intval2 = Dao.Get("cm.lectcheckuser", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cmno", vm.stringval17 } }).First(); /* * diff --git a/FO/Views/CRoom/Estimation.cshtml b/FO/Views/CRoom/Estimation.cshtml index 33c7948..31bef8c 100644 --- a/FO/Views/CRoom/Estimation.cshtml +++ b/FO/Views/CRoom/Estimation.cshtml @@ -16,7 +16,7 @@ @{ - List allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683".Split(','), long.Parse).ToList(); + List allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683,104419".Split(','), long.Parse).ToList(); } @foreach (var d in Model.Datas.Where(w=>w.dtype > -1)) diff --git a/FO/Views/Course/SmartSearchResult.cshtml b/FO/Views/Course/SmartSearchResult.cshtml index db478b1..2dc0842 100644 --- a/FO/Views/Course/SmartSearchResult.cshtml +++ b/FO/Views/Course/SmartSearchResult.cshtml @@ -46,7 +46,7 @@ @{ - bool lectAbleChk = (ViewBag.rslt == 0 && Model.intval == 0) ? true : false; + bool lectAbleChk = (ViewBag.rslt == 0 && Model.intval == 0 && Model.intval2 == 0) ? true : false; }
@if (!lectAbleChk) @@ -92,7 +92,11 @@ string edu = Model.ComCodes3.Where(c => c.value == Model.stringval4).First().cname; string grade = Model.ComCodes4.Where(c => c.value == Model.stringval5).First().cname; string typejob = Model.ComCodes5.Where(c => c.value == Model.stringval6).First().cname; - string typejobItem = Model.ComCodes6.Where(c => c.value == Model.stringval7).First().cname; + string typejobItem = ""; + if(!string.IsNullOrWhiteSpace(Model.stringval7)) + { + typejobItem = Model.ComCodes6.Where(c => c.value == Model.stringval7).First().cname; + } }
@@ -121,10 +125,13 @@ - - - - + @if (!string.IsNullOrWhiteSpace(Model.stringval7)) + { + + + + + }
직무분야 @typejob
전문분야@typejobItem
전문분야@typejobItem
과정명 diff --git a/FO/Web.config b/FO/Web.config index fa14f2c..c25dae0 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -40,9 +40,9 @@ - + - +