diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index 45ff4de..79e1d8a 100644 --- a/BO/Controllers/cmController.cs +++ b/BO/Controllers/cmController.cs @@ -59,15 +59,24 @@ namespace NP.BO.Controllers //{ // vm.CGs2 = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "pcgno", vm.stringval },{ "isdel", 0 } }); //} - if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval5)) + if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval12)) { - vm.stringval5 = DateTime.Now.Year.ToString(); + vm.stringval12 = DateTime.Now.Year.ToString(); } + if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval10)) + { + vm.stringval10 = vm.stringval10 ?? DateTime.Now.ToString("yyyy-MM-01"); + } + if (vm.viewidx == 0 && !IsPost() && string.IsNullOrEmpty(vm.stringval11)) + { + vm.stringval11 = vm.stringval11 ?? DateTime.Now.AddMonths(1).ToString("yyyy-MM-01"); + } + + vm.Terms = Dao.Get("cm.terms", new System.Collections.Hashtable() { /*{ "tyear", DateTime.Now.Year }*/ }); var ht = SetHash(vm); ht.Add("pcgno", vm.stringval); - ht.Add("tyear", vm.stringval5); - ht.Add("tseq", vm.stringval6); + ht.Add("cgno", vm.stringval2); ht.Add("cshape", vm.stringval3); @@ -78,6 +87,10 @@ namespace NP.BO.Controllers ht.Add("studyplace", vm.stringval8); ht.Add("cname", vm.stringval9); + ht.Add("sstime", vm.stringval10); + ht.Add("setime", vm.stringval11); + ht.Add("tyear", vm.stringval12); + ht.Add("tseq", vm.stringval13); ht.Add("ismaster", vm.viewidx); ht.Add("listcolumn", 1); vm.CMs = Dao.Get("cm.cms", ht); @@ -104,7 +117,7 @@ namespace NP.BO.Controllers } public ActionResult cmmasterreg(NP.Model.VMCM vm) { - vm.CM = new CM() { isuse = 1, ismaster = 1 , isseq=1 }; + vm.CM = new CM() { isuse = 1, ismaster = 1 , isseq=1 , iscertificate=1}; return cmreg(vm); } diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml index d2a780f..cb03202 100644 --- a/BO/Views/cm/cmreg.cshtml +++ b/BO/Views/cm/cmreg.cshtml @@ -171,6 +171,22 @@ 시간 + @if (Model.CM.ismaster == 0) + { +
+ +
@Html.Partial("./Partial/Radio", Model.CM.iscertificate, new ViewDataDictionary() { { "valuetext", "1:발행;0:미발행" }, { "checked", Model.CM.iscertificate }, { "name", "CM.iscertificate" } })
+
+ } + else + { +
+
+ +
@Html.Partial("./Partial/Radio", Model.CM.iscertificate, new ViewDataDictionary() { { "valuetext", "1:발행;0:미발행" }, { "checked", Model.CM.iscertificate }, { "name", "CM.iscertificate" } })
+
+
+ }
@@ -210,7 +226,7 @@
@Html.Partial("./Partial/DForm", Model, new ViewDataDictionary { { "preform", 1 } })
-@Html.Partial("./Partial/UserBox", "bindUser;강사/담당자 선택;999_1", new ViewDataDictionary { { "assigns", Model.Assigns } ,{"userauths",Model.userauths } }) +@Html.Partial("./Partial/UserBox", "bindUser;강사/담당자 선택;999_1", new ViewDataDictionary { { "assigns", Model.Assigns }, { "userauths", Model.userauths } }) @Html.Partial("./Partial/BookBox", "bindBook;교재선택 선택") @Html.Partial("./Partial/CMBox", "bindCM;과정 선택;1") @Html.Partial("./Partial/NCSBox", "bindNCS;NCS 세분류(직무) 선택;3") diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index dea32b8..714be60 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -1,50 +1,148 @@ @model NP.Model.VMCM
- @Html.Partial("./Partial/SearchCaption") -
-
-
+ @*@Html.Partial("./Partial/SearchCaption")*@ +
+ + + + + + + + + @if (Model.viewidx == 0) { - - + + + + + + } - @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval" }, { "selected", Model.stringval }, { "df", ":-상위분류" } }) - @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval), new ViewDataDictionary { { "name", "stringval2" }, { "selected", Model.stringval2 }, { "df", ":-분류" } }) - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:오프라인;2:혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } }) + + + + + + + + + + + + + + + + + + + @if (Model.viewidx == 1) + { + + + + + + + } + else + { + + + + + - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeman"), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "df", ":-기술인분류" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeedu"), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "df", ":-교육목적" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typegrade"), new ViewDataDictionary { { "name", "stringval6" }, { "selected", Model.stringval6 }, { "df", ":-등급" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "stringval7" }, { "selected", Model.stringval7 }, { "df", ":-직무분야" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval8" }, { "selected", Model.stringval8 }, { "df", ":-교육장구분" } }) - - - @Html.Partial("./Partial/Text", Model.stringval9, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval4", Value = Model.stringval9, PH = Model.viewidxname + "명을 입력하세요.", CssClass = "ff" })) - @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" }) - - + + + + + + } +
년도 +
+ +
+ 		기수 +
+ +
+
과정분류 +
+ @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval" }, { "selected", Model.stringval }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) +
+
+ @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval), new ViewDataDictionary { { "name", "stringval2" }, { "selected", Model.stringval2 }, { "style", "width: 100%;" }, { "df", ":-분류" } }) +
+ 		교육유형 +
+ @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:오프라인;2:혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":-유형선택" } }) +
+
기술인분류 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeman"), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-기술인분류" } }) +
+ 		교육목적 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeedu"), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%" }, { "df", ":-교육목적" } }) +
+
등급 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typegrade"), new ViewDataDictionary { { "name", "stringval6" }, { "selected", Model.stringval6 }, { "style", "width: 100%" }, { "df", ":-등급" } }) +
+ 		직무분야 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "stringval7" }, { "selected", Model.stringval7 }, { "style", "width: 100%" }, { "df", ":-직무분야" } }) +
+
교육장구분 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval8" }, { "selected", Model.stringval8 }, { "style", "width: 100%" }, { "df", ":-교육장구분" } }) +
+ 		@(Model.viewidxname)명 +
+ @Html.Partial("./Partial/Text", Model.stringval9, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval9", Value = Model.stringval9, PH = Model.viewidxname + "명을 입력하세요.", CssClass = "ff" })) +
+
교육장구분 +
+ @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval8" }, { "selected", Model.stringval8 }, { "style", "width: 100%" }, { "df", ":-교육장구분" } }) +
+ 		학습기간 +
+ @Html.Partial("./Partial/Date", Convert.ToDateTime(Model.stringval10), new ViewDataDictionary { { "name", "stringval10" } })~ + @Html.Partial("./Partial/Date", Convert.ToDateTime(Model.stringval11), new ViewDataDictionary { { "name", "stringval11" } }) +
+
@(Model.viewidxname)명 +
+ @Html.Partial("./Partial/Text", Model.stringval9, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval9", Value = Model.stringval9, PH = Model.viewidxname + "명을 입력하세요.", CssClass = "ff" })) +
+
+
+
+ +

@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) @*@if (Model.viewidx == 0) - { - 선택삭제 - }*@ + { + 선택삭제 + }*@ 등록
@@ -53,9 +151,9 @@ @*@if (Model.viewidx == 0) - { - - }*@ + { + + }*@ No @(Model.viewidxname)코드 @Html.Raw(Model.viewidx == 0 ? "기수" : "") @@ -70,44 +168,44 @@ -@if (Model.viewidx == 0) -{ - foreach (var item in Model.CMs) - { - - @*@if (Model.viewidx == 0) + @if (Model.viewidx == 0) + { + foreach (var item in Model.CMs) { - - }*@ - @item.rnorvt - @*@Html.Raw(Model.addstringval.Contains("," + item.cmno + ",") ? "" : string.Format("", item.cmno))*@ - @item.cmno - @item.tmname - @item.pcgname - @item.cgname - @item.cshapename - @item.cname (@item.classno) - @Model.Datas.Where(w => w.intval == item.cmno).Select(w=>w.intval2).FirstOrDefault() - [복제] - - } -} -else -{ - foreach (var item in Model.CMs) - { - - @item.rnorvt - @item.cmno - @item.pcgname - @item.cgname - @item.cshapename - @item.cname - [복제] - [추가] - - } -} + + @*@if (Model.viewidx == 0) + { + + }*@ + @item.rnorvt + @*@Html.Raw(Model.addstringval.Contains("," + item.cmno + ",") ? "" : string.Format("", item.cmno))*@ + @item.cmno + @item.tmname + @item.pcgname + @item.cgname + @item.cshapename + @item.cname (@item.classno) + @Model.Datas.Where(w => w.intval == item.cmno).Select(w => w.intval2).FirstOrDefault() + [복제] + + } + } + else + { + foreach (var item in Model.CMs) + { + + @item.rnorvt + @item.cmno + @item.pcgname + @item.cgname + @item.cshapename + @item.cname + [복제] + [추가] + + } + }
@@ -160,6 +258,7 @@ else
@section scriptsHeader{ + @Html.Partial("./Partial/ScriptDate") } @section scripts{