From 2b6a4036c335a7a114383c377d36f615c2a75562 Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 20 Oct 2020 06:42:40 +0000 Subject: [PATCH] --- BO/Controllers/cmController.cs | 12 +++- BO/Views/cm/cmreg.cshtml | 115 +++++++++++++-------------------- BO/Views/cm/cmreginning.cshtml | 5 ++ BO/Views/cm/cms.cshtml | 42 +++++++----- Base/Controller/ACommon.cs | 4 +- Dao/MyBatis/Maps/CM.xml | 17 ++++- Model/CM.cs | 5 ++ 7 files changed, 108 insertions(+), 92 deletions(-) diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index b6a06c5..45ff4de 100644 --- a/BO/Controllers/cmController.cs +++ b/BO/Controllers/cmController.cs @@ -53,6 +53,7 @@ namespace NP.BO.Controllers vm.listviewname = vm.listviewname ?? "cms"; vm.CMs = InitM(); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); //vm.CGs2 = new List() { }; //if (!string.IsNullOrEmpty(vm.stringval)) //{ @@ -69,7 +70,14 @@ namespace NP.BO.Controllers ht.Add("tseq", vm.stringval6); ht.Add("cgno", vm.stringval2); ht.Add("cshape", vm.stringval3); - ht.Add("cname", vm.stringval4); + + ht.Add("typeman", vm.stringval4); + ht.Add("typeedu", vm.stringval5); + ht.Add("typegrade", vm.stringval6); + ht.Add("typejob", vm.stringval7); + ht.Add("studyplace", vm.stringval8); + + ht.Add("cname", vm.stringval9); ht.Add("ismaster", vm.viewidx); ht.Add("listcolumn", 1); vm.CMs = Dao.Get("cm.cms", ht); @@ -128,7 +136,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,studyplace"); + vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace"); vm.userauths = Dao.Get("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } }); return View("cmreg", vm); } diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml index 5844487..d2a780f 100644 --- a/BO/Views/cm/cmreg.cshtml +++ b/BO/Views/cm/cmreg.cshtml @@ -34,7 +34,7 @@ -
+
@@ -62,7 +62,7 @@
@Html.TextBoxFor(m => m.CM.cname, new { @class = "form-control disp-init ff", @style = "width: 50%", @maxlength = "100", @placeholder = Model.viewidxname + "명을 입력하세요." })
-
+
@@ -73,9 +73,40 @@
}
- +
@Html.Partial("./Partial/Radio", Model.CM.cshape, new ViewDataDictionary() { { "valuetext", "0:온라인;1:오프라인;2:혼합(온라인+오프라인)" }, { "checked", Model.CM.cshape }, { "name", "CM.cshape" } })
+ +
@@ -140,72 +171,6 @@ 시간
-
- -
- @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "cert"), new ViewDataDictionary { { "special", "reg" }, { "name", "CM.certcc" }, { "selected", Model.CM.certcc }, { "df", ":-자격증선택" }, { "class", "disp-init" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "certgrade"), new ViewDataDictionary { { "special", "reg" }, { "name", "CM.certgradecc" }, { "selected", Model.CM.certgradecc }, { "df", ":-급수선택" }, { "class", "disp-init" } }) - * 자격증/급수 선택시 운영자 승인이 있어야 결제 가능 -
-
-
- -
- @Html.HiddenFor(m => m.CM.jobcc) - @Html.Partial("./Partial/Checkbox", Model.ComCodes.Where(w => w.cgroup == "job"), new ViewDataDictionary { { "name", "jobcc" }, {"autobind", "CM_jobcc" }, { "checked", Model.CM.jobcc }@*, { "fixwidth", "100px" }*@ }) -
-
-
- -
- @Html.HiddenFor(m => m.CM.jobpositiongrade) - @Html.Partial("./Partial/Checkbox", null, new ViewDataDictionary { { "valuetext", "0:사원;1:대리급;2:과차장급;3:부장;4:임원" }, { "name", "jobpositiongrade" }, { "autobind", "CM_jobpositiongrade" }, { "checked", Model.CM.jobpositiongrade } }) -
-
-
- -
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:입문;1:기초;2:중급;3:고급" }, { "checked", Model.CM.difficulty }, { "name", "CM.difficulty" } })
-
-
- -
- -
    - @foreach (var d in Model.Datas.Where(w => w.dtype == 3 && w.intval2 == 1)) - { -
  • X
    • - } -
-
-
-
- -
- -
    - @foreach (var d in Model.Datas.Where(w => w.dtype == 3 && w.intval2 == 0)) - { -
  • X
    • - } -
-
-
-
- -
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:예;0:아니오" }, { "checked", Model.CM.isrefund }, { "name", "CM.isrefund" } })
-
-
- -
- -
    - @foreach (var d in Model.Datas.Where(w => w.dtype == 4)) - { -
  • X
    • - } -
-
-
@@ -326,6 +291,7 @@ if ($(this).val() != "") { capp("/acommon/cgget", { pcgno: $(this).val() }, "cbcgget"); } + loadlegal(); }); if ('@Model.CM.isrefund' == '0') { $(".ncsconbox").hide(); @@ -339,10 +305,19 @@ if ('@(Model.CM.ismaster)' == '0') { $("#pcgno,#CM_cgno").hide(); } + loadlegal(); }); + function loadlegal() { + if ($("#pcgno option:checked").text() == "법정교육") { + $("#divLegalEdu").show(); + } + else { + $("#divLegalEdu").hide(); + } + } function cbcgget() { binddatacheck("CM_cgno"); - if ($("#pcgno").val() == "@(Model.CGs.Where(w=>w.cgcode==ViewBag.OffCode).Select(w=>w.cgno).First())") { + if ($("#pcgno").val() == "@(Model.CGs.Where(w=>w.cgcode==ViewBag.OffCode).Select(w=>w.cgno).FirstOrDefault())") { $("#keyword").attr("style", ""); } else { $("#keyword").attr("style", "display:none;"); diff --git a/BO/Views/cm/cmreginning.cshtml b/BO/Views/cm/cmreginning.cshtml index 0122def..84513d7 100644 --- a/BO/Views/cm/cmreginning.cshtml +++ b/BO/Views/cm/cmreginning.cshtml @@ -166,6 +166,7 @@