diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index fba138e..3888066 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -769,23 +769,20 @@ namespace NP.FO.Controllers { vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } }); } + vm.ComCodes2 = GetComCodes("typeman"); + vm.ComCodes3 = GetComCodes("typeedu"); + vm.ComCodes4 = GetComCodes("typegrade"); - if (vm.stringval3 == "50") //기술인분류-발주청기술인일때 최초교육만 노출 + var typeman03 = vm.ComCodes2.Where(x => x.refcode == "03").FirstOrDefault() != null ? vm.ComCodes2.Where(x => x.refcode == "03").FirstOrDefault() : null; + var typeedu07 = vm.ComCodes3.Where(x => x.refcode == "07").FirstOrDefault() != null ? vm.ComCodes3.Where(x => x.refcode == "07").FirstOrDefault() : null; + if (vm.stringval3 == typeman03.ccode.ToString()) //기술인분류-발주청기술인일때 최초교육만 노출 //refcode = 03 =발주청기술인 { - vm.ComCodes2 = GetComCodes("typeedu").Where(x => x.ccode == 53).ToList(); //53 == 최초교육 - } - else - { - vm.ComCodes2 = GetComCodes("typeedu"); + vm.ComCodes3 = GetComCodes("typeedu").Where(x => x.refcode == "02").ToList(); //refcode = 02 = 최초교육 } - if (vm.stringval4 == "58") //교육목적-승급교육일땐 초급등급 삭제 + if (vm.stringval4 == typeedu07.ccode.ToString()) //교육목적-승급교육일땐 초급등급 삭제 { - vm.ComCodes3 = GetComCodes("typegrade").Where(x => x.ccode != 59).ToList(); //59 == 초급교육 - } - else - { - vm.ComCodes3 = GetComCodes("typegrade"); + vm.ComCodes4 = GetComCodes("typegrade").Where(x => x.refcode != "01").ToList(); //refcode = 01 = 초급교육 } return View(vm); diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 3a4a391..1a10788 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -19,15 +19,16 @@
  • - @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"), "ccode", "cname"), "-선택-") + @*typeman는 데이터가 model.comcodes2임, 수정시 주의할것*@ + @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeman"), "ccode", "cname"), "-선택-")
  • - @*typeedu는 데이터가 model.comcodes2임, 수정시 주의할것*@ - @Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeedu"), "ccode", "cname"), "-선택-") + @*typeedu는 데이터가 model.comcodes3임, 수정시 주의할것*@ + @Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes3.Where(w => w.cgroup.ToString() == "typeedu"), "ccode", "cname"), "-선택-")
  • - @*typegrade는 데이터가 model.comcodes3임, 수정시 주의할것*@ - @Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes3.Where(w => w.cgroup.ToString() == "typegrade"), "ccode", "cname"), "-선택-") + @*typegrade는 데이터가 model.comcodes4임, 수정시 주의할것*@ + @Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes4.Where(w => w.cgroup.ToString() == "typegrade"), "ccode", "cname"), "-선택-")
  • @Html.DropDownListFor(x => x.stringval6, new SelectList(Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"), "ccode", "cname"), "-선택-") @@ -136,9 +137,9 @@ $('#liTab1').click(function () { $.when( $("#stringval").val("0"), - $("#stringval7").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman").FirstOrDefault().ccode").attr("selected", "selected"), - $("#stringval8").val("@Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeedu").FirstOrDefault().ccode").attr("selected", "selected"), - $("#stringval9").val("@Model.ComCodes3.Where(w => w.cgroup.ToString() == "typegrade").FirstOrDefault().ccode").attr("selected", "selected"), + $("#stringval7").val("@Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeman").FirstOrDefault().ccode").attr("selected", "selected"), + $("#stringval8").val("@Model.ComCodes3.Where(w => w.cgroup.ToString() == "typeedu").FirstOrDefault().ccode").attr("selected", "selected"), + $("#stringval9").val("@Model.ComCodes4.Where(w => w.cgroup.ToString() == "typegrade").FirstOrDefault().ccode").attr("selected", "selected"), $("#stringval10").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob").FirstOrDefault().ccode").attr("selected", "selected") ).done(function () { $("#smartSearchForm").submit(); diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index a7761ba..e74a806 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -101,7 +101,7 @@ @@ -117,7 +117,7 @@ @@ -133,7 +133,7 @@ @@ -297,29 +297,29 @@ $('#msSel' + (Number(num) + 1) + ' > div').slideDown(300); if (num == 2 && name == "발주청기술인") { - $("#liedu52").hide(); - $("#liedu54").hide(); - $("#liedu55").hide(); - $("#liedu56").hide(); - $("#liedu57").hide(); - $("#liedu58").hide(); + $("#liedu01").hide(); + $("#liedu03").hide(); + $("#liedu04").hide(); + $("#liedu05").hide(); + $("#liedu06").hide(); + $("#liedu07").hide(); } else if (num == 2 && name != "발주청기술인") { - $("#liedu52").show(); - $("#liedu54").show(); - $("#liedu55").show(); - $("#liedu56").show(); - $("#liedu57").show(); - $("#liedu58").show(); + $("#liedu01").show(); + $("#liedu03").show(); + $("#liedu04").show(); + $("#liedu05").show(); + $("#liedu06").show(); + $("#liedu07").show(); } if (num == 3 && name == "승급교육") { $('#msSel4 > span').text("승급가능등급"); - $("#liGrade59").hide(); + $("#liGrade01").hide(); } else if (num == 3 && name != "승급교육") { $('#msSel4 > span').text("현재등급"); - $("#liGrade59").show(); + $("#liGrade01").show(); } } diff --git a/Model/VMBase.cs b/Model/VMBase.cs index 2474069..294ee70 100644 --- a/Model/VMBase.cs +++ b/Model/VMBase.cs @@ -62,6 +62,7 @@ namespace NP.Model public IList ComCodes { get; set; } public IList ComCodes2 { get; set; } public IList ComCodes3 { get; set; } + public IList ComCodes4 { get; set; } public ComCode ComCode { get; set; } public String savedata { get; set; }