diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 72b33cc..fba138e 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -758,7 +758,7 @@ namespace NP.FO.Controllers public ActionResult SmartSearch(VMCourse vm) { - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); + vm.ComCodes = GetComCodes("typeman,typejob,studyplace"); vm.CMsEtc = Dao.Get("cm.cgetc", new System.Collections.Hashtable() { { "cgcode", "2" } });//cgcode = 기타교육 // 기타교육 cgcode 바뀌면 파라미터도 변경해야함 if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval)) @@ -769,6 +769,25 @@ namespace NP.FO.Controllers { vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "cgno", vm.stringval3 } }); } + + if (vm.stringval3 == "50") //기술인분류-발주청기술인일때 최초교육만 노출 + { + vm.ComCodes2 = GetComCodes("typeedu").Where(x => x.ccode == 53).ToList(); //53 == 최초교육 + } + else + { + vm.ComCodes2 = GetComCodes("typeedu"); + } + + if (vm.stringval4 == "58") //교육목적-승급교육일땐 초급등급 삭제 + { + vm.ComCodes3 = GetComCodes("typegrade").Where(x => x.ccode != 59).ToList(); //59 == 초급교육 + } + else + { + vm.ComCodes3 = GetComCodes("typegrade"); + } + return View(vm); } diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 6d4de4a..3a4a391 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -22,10 +22,12 @@ @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"), "ccode", "cname"), "-선택-")
  • - @Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu"), "ccode", "cname"), "-선택-") + @*typeedu는 데이터가 model.comcodes2임, 수정시 주의할것*@ + @Html.DropDownListFor(x => x.stringval4, new SelectList(Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeedu"), "ccode", "cname"), "-선택-")
  • - @Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade"), "ccode", "cname"), "-선택-") + @*typegrade는 데이터가 model.comcodes3임, 수정시 주의할것*@ + @Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes3.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"), "-선택-") @@ -135,8 +137,8 @@ $.when( $("#stringval").val("0"), $("#stringval7").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman").FirstOrDefault().ccode").attr("selected", "selected"), - $("#stringval8").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu").FirstOrDefault().ccode").attr("selected", "selected"), - $("#stringval9").val("@Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade").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"), $("#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 f740a50..a7761ba 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -101,7 +101,7 @@
      @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman")) { -
    • @t.cname
    • +
    • @t.cname
    • }
    @@ -117,7 +117,7 @@
      @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu")) { -
    • @t.cname
    • +
    • @t.cname
    • }
    @@ -296,12 +296,29 @@ $('#msSel' + (Number(num) + 1)).addClass('active'); $('#msSel' + (Number(num) + 1) + ' > div').slideDown(300); + if (num == 2 && name == "발주청기술인") { + $("#liedu52").hide(); + $("#liedu54").hide(); + $("#liedu55").hide(); + $("#liedu56").hide(); + $("#liedu57").hide(); + $("#liedu58").hide(); + } + else if (num == 2 && name != "발주청기술인") { + $("#liedu52").show(); + $("#liedu54").show(); + $("#liedu55").show(); + $("#liedu56").show(); + $("#liedu57").show(); + $("#liedu58").show(); + } + if (num == 3 && name == "승급교육") { $('#msSel4 > span').text("승급가능등급"); $("#liGrade59").hide(); } else if (num == 3 && name != "승급교육") { - $('#msSel4 > span').text("등급"); + $('#msSel4 > span').text("현재등급"); $("#liGrade59").show(); } } @@ -311,7 +328,7 @@ { $('#msSel2 > span').text("기술인분류"); $('#msSel3 > span').text("교육목적"); - $('#msSel4 > span').text("등급"); + $('#msSel4 > span').text("현재등급"); $('#msSel5 > span').text("직무분야"); } else if ($("#liTab1").hasClass("current")) diff --git a/Model/VMBase.cs b/Model/VMBase.cs index 734057f..2474069 100644 --- a/Model/VMBase.cs +++ b/Model/VMBase.cs @@ -61,6 +61,7 @@ namespace NP.Model public IList ComCodes { get; set; } public IList ComCodes2 { get; set; } + public IList ComCodes3 { get; set; } public ComCode ComCode { get; set; } public String savedata { get; set; }