diff --git a/BO/BO.csproj b/BO/BO.csproj index 12bbb99..a95a4bc 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -213,6 +213,8 @@ + + diff --git a/BO/Content/homeDepth1.htm b/BO/Content/homeDepth1.htm new file mode 100644 index 0000000..d89a598 --- /dev/null +++ b/BO/Content/homeDepth1.htm @@ -0,0 +1,15 @@ +
  • + SKILL +
    + 교육유형 +
    +
    + +
    +
    +
    +
    • \ No newline at end of file diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm new file mode 100644 index 0000000..63ce9b8 --- /dev/null +++ b/BO/Content/homeDepth2.htm @@ -0,0 +1,133 @@ +
  • + JOB + +
    • +
  • + OBJECT + +
    • +
  • + GRADE +
    + 현재등급 +
    +
    + +
    +
    +
    +
    • +
  • + TYPE +
    + 직무분야 + +
    +
    • +
  • + TYPE2 + +
    • +
  • 검색/교육신청
    • diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index c857cb4..2c97767 100644 --- a/BO/Controllers/cmController.cs +++ b/BO/Controllers/cmController.cs @@ -149,7 +149,7 @@ namespace NP.BO.Controllers vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } }); } vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } }); - vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace"); + vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83"); vm.userauths = Dao.Get("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } }); return View("cmreg", vm); } diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index e9e4739..19161eb 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -203,7 +203,8 @@ namespace NP.BO.Controllers vm.Lects = Dao.Get("lect.lects", ht); } - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob"); + ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83"; + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems); return View(vm); } public ActionResult asrpop(VMCM vm) @@ -906,12 +907,16 @@ namespace NP.BO.Controllers else { vm.Pay = Dao.Get("cr.pay1", vm.payno).First(); - vm.PayItems = Dao.Get("cr.pay2", vm.payno); - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); + vm.PayItems = Dao.Get("cr.pay2", vm.payno); vm.Lect = Dao.Get("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault(); + ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83"; + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); + + vm.Lect.typemanname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeman" && w.ccode == vm.Lect.typeman).FirstOrDefault()?.cname; vm.Lect.typeeduname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeedu" && w.ccode == vm.Lect.typeedu).FirstOrDefault()?.cname; vm.Lect.typegradename = vm.ComCodes.Where(w => w.cgroup.ToString() == "typegrade" && w.ccode == vm.Lect.typegrade).FirstOrDefault()?.cname; + vm.Lect.typejobitemname = vm.ComCodes.Where(w => w.ccode == vm.Lect.typejobitem).FirstOrDefault()?.cname; vm.Lect.typejobname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == vm.Lect.typejob).FirstOrDefault()?.cname; if(!string.IsNullOrEmpty(vm.Lect.studyplace)) vm.Lect.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == int.Parse(vm.Lect.studyplace)).FirstOrDefault()?.cname; ViewBag.TestCode = TestCode; @@ -1241,7 +1246,8 @@ namespace NP.BO.Controllers { vm.Completions = InitM(); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); + ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83"; + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); var ht = SetHash(vm); ht.Add("tyear", vm.stringval); diff --git a/BO/Views/MM/Config0.cshtml b/BO/Views/MM/Config0.cshtml index 06a61af..7f18f9c 100644 --- a/BO/Views/MM/Config0.cshtml +++ b/BO/Views/MM/Config0.cshtml @@ -3,7 +3,8 @@
    -
    상위코드
    #상위코드를 클릭하면 하위코드목록이 표시됩니다.
    +
    상위코드
    #상위코드를 클릭하면 하위코드목록이 표시됩니다. +
    • No
      • diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml index 1ab0a8d..463b737 100644 --- a/BO/Views/cm/cmreg.cshtml +++ b/BO/Views/cm/cmreg.cshtml @@ -108,36 +108,85 @@
      @Html.Partial("./Partial/Radio", Model.CM.isaccommodation, new ViewDataDictionary() { { "valuetext", "1:예;0:아니요" }, { "checked", Model.CM.isaccommodation }, { "name", "CM.isaccommodation" } })
    - +
    @@ -447,8 +496,41 @@ $("#gtime").show(); $("#CM_cshape1").prop("disabled", false); } - }); + }); + $("[name='typejob']").on("click", function () { + if ($(this).is(":checked")) { + $("#typejob" + $(this).val() + "items").css("display", "") + } + else { + $("#typejob" + $(this).val() + "items").css("display", "none") + $("#typejob" + $(this).val() + "items input:checkbox").prop("checked", false) + $($("#typejob" + $(this).val() + "items input:checkbox")[0]).trigger("click") + $($("#typejob" + $(this).val() + "items input:checkbox")[0]).trigger("click") // 두번 입력인 이유는 클릭해제 이벤트 발생을 위해서 + } + }) + + beginSetJobTypeCheckbox();// 최초 열릴때 해당 체크 박스 활성화 + + $("[name='typeJobItems']").on("click", function () { + $("#CM_typejobItem").val("") + let nos = ""; + $("[name='typeJobItems']").each(function () { + if ($(this).is(":checked")) { + nos += (nos == "" ? "" : ",") + $(this).val(); + } + }) + + $("#CM_typejobItem").val(nos) + }) }); + + function beginSetJobTypeCheckbox() { + $("[name='typejob']").each(function () { + if ($(this).is(":checked")) { + $("#typejob" + $(this).val() + "items").css("display", "") + } + }) + } function loadlegal(cgno) { capp("/acommon/cgget", { cgno: cgno }, "renderlegal"); } diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml index 60b3256..efc700e 100644 --- a/BO/Views/croom/cmlects.cshtml +++ b/BO/Views/croom/cmlects.cshtml @@ -97,7 +97,7 @@ @d.rnorvt @d.asname @(d.cnoname)(@d.cnoid) - @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) + @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) @d.cdtymd @d.statusname @d.pstatusname @@ -192,6 +192,21 @@ + + 전문분야 + + + + 교육목적 @@ -276,6 +291,15 @@ var selectedLectno; var selectedCmisno; $(document).ready(function () { + $("#selTypejob").on("change", function () { + $(".jobTypeItems").css("display", "none") + let seltypeJobGroup = "typejob" + $(this).val(); + + $("[name='" + seltypeJobGroup + "']").each(function () { + $(this).css("display", "") + }) + + }) $("#addstringval5").on("keydown", function (e) { if (e.keyCode == 13) { submit(); @@ -349,7 +373,13 @@ $("#selTypejob").val(ds[14]).attr("selected", "selected"); $("#selTypeedu").val(ds[15]).attr("selected", "selected"); $("#selTypegrade").val(ds[16]).attr("selected", "selected"); + $("#selTypejobItem").val(ds[18]) $("#hidpplno").val(ds[17]); + + $(".jobTypeItems").css("display", "none"); + $("[name='typejob" + $("#selTypejob").val() + "']").each(function () { + $(this).css("display", ""); + }) } } function change() { @@ -443,7 +473,8 @@ typeman: $("#selTypeman").val(), typejob: $("#selTypejob").val(), typeedu: $("#selTypeedu").val(), - typegrade: $("#selTypegrade").val() + typegrade: $("#selTypegrade").val(), + typejobitem: $("#selTypejobItem").val() }, "afterUpdateType"); } } diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml index f3bb218..e7e924b 100644 --- a/BO/Views/croom/completions.cshtml +++ b/BO/Views/croom/completions.cshtml @@ -268,20 +268,33 @@ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "completion.typejob" }, { "style", "width: 100%" }, { "df", ":-직무분야" } }) + 전문분야 * + + + 교육목적 * @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeedu"), new ViewDataDictionary { { "name", "completion.typeedu" }, { "style", "width: 100%" }, { "df", ":-교육목적" } }) + + 등급 * @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typegrade"), new ViewDataDictionary { { "name", "completion.typegrade" }, { "style", "width: 100%" }, { "df", ":-등급" } }) - - 결제금액 - 교육구분 - + 교육구분 + 수료여부 * - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:미수료;1:수료" }, { "name", "completion.iscomplete" }, { "style", "width: 100%" } }) + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:미수료;1:수료" }, { "name", "completion.iscomplete" }, { "style", "width: 100%" } })
    ㆍ환급정보
    @@ -405,6 +418,15 @@ findcmscdshow(cmno); } }); + $("#completion_typejob").on("change", function () { + $(".jobTypeItems").css("display", "none") + let seltypeJobGroup = "typejob" + $(this).val(); + + $("[name='" + seltypeJobGroup + "']").each(function () { + $(this).css("display", "") + }) + + }) }); function bindCMScd(data) { $("#completion_cmisno").val(data.value); @@ -456,6 +478,12 @@ $("#completion_" + key).val(capResult.obj[key]); } } + + $("#completion_typejobItem").val(capResult.obj.typejobitem) + $(".jobTypeItems").css("display", "none"); + $("[name='typejob" + $("#completion_typejob").val() + "']").each(function () { + $(this).css("display", ""); + }) if (capResult.obj.cshape == 2) { $("#trcshape1").hide(); $("#trcshape2").show(); diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index 7d66716..5dac144 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -304,6 +304,7 @@ 교육기간 기술인분류 직무분야 + 전문분야 교육목적 등급 @@ -311,12 +312,13 @@ @(Model.Lect.sdate != null ? Model.Lect.sdate.Value.ToString("yyyy-MM-dd") : "") ~ @(Model.Lect.edate != null ? Model.Lect.edate.Value.ToString("yyyy-MM-dd") : "") @Model.Lect.typemanname @Model.Lect.typejobname + @Model.Lect.typejobitemname @Model.Lect.typeeduname @Model.Lect.typegradename
    if (Model.Lect.cshape == 2) @@ -367,13 +369,56 @@ 직무분야 + + 전문분야 + + + + 교육목적 @@ -437,7 +482,15 @@ @section scripts{