diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index bb3bc41..d234550 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -751,5 +751,13 @@ namespace NP.FO.Controllers { return PayReturn(vm); } + + public ActionResult SmartSearch(VMCourse vm) + { + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob"); + vm.CMsEtc = Dao.Get("cm.cgetc", new System.Collections.Hashtable() { { "cgcode", "2" } });//cgcode = 기타교육 // 기타교육 cgcode 바뀌면 파라미터도 변경해야함 + vm.CMs = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "typeman", vm.stringval3 }, { "typeedu", vm.stringval4 }, { "typegrade", vm.stringval5 }, { "typejob", vm.stringval6 } }); + return View(vm); + } } } diff --git a/FO/Controllers/HomeController.cs b/FO/Controllers/HomeController.cs index f97ebf8..1799182 100644 --- a/FO/Controllers/HomeController.cs +++ b/FO/Controllers/HomeController.cs @@ -31,7 +31,7 @@ namespace NP.FO.Controllers ViewBag.POPUPXS = CookieGet("popup", ""); ViewBag.IsMain = true; vm.Datas = Dao.Get("site.main", new System.Collections.Hashtable() { {"offcode", OffCode }, { "oncode", OnCode} }); - vm.CMs = Dao.Get("cm.cgetc", new System.Collections.Hashtable() { { "cgcode", "2" } });//cgcode = 기타교육 // 기타교육 cgcode 바뀌면 파라미터도 변경해야함 + vm.CMsEtc = Dao.Get("cm.cgetc", new System.Collections.Hashtable() { { "cgcode", "2" } });//cgcode = 기타교육 // 기타교육 cgcode 바뀌면 파라미터도 변경해야함 ViewBag.OnCode1 = OnCode1; return View(vm); diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 5817ef2..b2d7ba7 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -1,53 +1,84 @@ @model NP.Model.VMCourse -
-
- -
-

스마트검색

-
- -
-
+
+
+ + + @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") + {
  • - + +
  • - + @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"))
  • - + @Html.DropDownListFor(x => x.stringval5, new SelectList(Model.ComCodes.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")) +
    • +
  • 검색
- -
+ } + else if (Model.stringval == "1") + { + +
    +
  • + +
    • +
  • + @Html.DropDownListFor(x => x.stringval3, new SelectList(Model.CMsEtc, "cgcode", "cgname")) +
    • +
  • 검색
    • +
+ } -

본인의 기술인 정보를 모르실 경우에는 아래링크를 클릭하여 정보 확인 후 교육신청을 하여 주시기 바랍니다.

- -
    -
  • + +
+ +

본인의 기술인 정보를 모르실 경우에는 아래링크를 클릭하여 정보 확인 후 교육신청을 하여 주시기 바랍니다.

+ + +
    + @foreach (var item in Model.CMs) + { +
  • +
    +
    @(item.cshape == 0 ? "온라인" : "교육장") @item.cgname
    + @if (item.cshape == 1) //오프라인일경우 + { +

    신청가능강좌 : 부산교육장(10개), 영천교육장(7개), 진주교육장(3개)

    + } + +
    +
    • + } + @*
  • 온라인 건설기술인 기본1교육과정

    신청가능강좌 : 부산교육장(10개), 영천교육장(7개), 진주교육장(3개)

    @@ -103,7 +134,28 @@
  • 조회하기
- + *@ -
-
+ + + diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index c03dc4d..b445e24 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -62,8 +62,14 @@ - - @if (Model.Edutype == 0 || Model.Edutype == null) + + + + + + + + @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") { } - else if(Model.Edutype == 1) + else if (Model.stringval == "1") {
  • 법정교육
    • @@ -166,8 +172,8 @@ @@ -180,7 +186,7 @@
      - @foreach (var t in Model.CMs) + @foreach (var t in Model.CMsEtc) {
    • @t.cgname
      • } @@ -213,16 +219,31 @@ } + diff --git a/FO/css/style.css b/FO/css/style.css index 6dd6a42..ef15b96 100644 --- a/FO/css/style.css +++ b/FO/css/style.css @@ -2514,7 +2514,7 @@ html.lock, body.lock {display:block; width:100%; height:100%; overflow:hidden;} .schCont li { float: left; - width: 25%; + width: 20%; padding-right: 10px; } diff --git a/Model/VMBase.cs b/Model/VMBase.cs index 553ba97..d66953f 100644 --- a/Model/VMBase.cs +++ b/Model/VMBase.cs @@ -184,6 +184,8 @@ namespace NP.Model public bool isfromview { get; set; } public String authkey { get; set; } public int authtype { get; set; } + public int? edutype { get; set; } + } public class UserInfo diff --git a/Model/VMCourse.cs b/Model/VMCourse.cs index 816f4ee..e0d1bb6 100644 --- a/Model/VMCourse.cs +++ b/Model/VMCourse.cs @@ -13,6 +13,7 @@ namespace NP.Model public String cname { get; set; } public CM CM { get; set; } public IList CMs { get; set; } + public IList CMsEtc { get; set; } public CMEV CMEV { get; set; } public IList CMBooks { get; set; } public IList Datas { get; set; } diff --git a/Model/VMHome.cs b/Model/VMHome.cs index bae939b..f22bd74 100644 --- a/Model/VMHome.cs +++ b/Model/VMHome.cs @@ -13,8 +13,8 @@ namespace NP.Model public IList Admins { get; set; } public Data Data { get; set; } public IList CMs { get; set; } + public IList CMsEtc { get; set; } public IList Datas { get; set; } public IList CMInnings { get; set; } - public int? Edutype { get; set; } } }