diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm index 63ce9b8..40a507b 100644 --- a/BO/Content/homeDepth2.htm +++ b/BO/Content/homeDepth2.htm @@ -56,16 +56,17 @@
@@ -107,7 +108,7 @@
  • 화약류관리
  • 건설안전
  • 교통
  • -
  • 철도신호.
  • +
  • 철도신호
  • 건설 마케팅
  • 수질관리
  • 광산보안
  • diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 19161eb..364ee19 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -15,7 +15,8 @@ namespace NP.BO.Controllers { public ActionResult lectreg(NP.Model.VMCM vm) { - 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); vm.IsAdmin = SUserInfo.IsAdmin; vm.IsSiteAdmin = SUserInfo.IsSiteAdmin; return View(vm); diff --git a/BO/Views/Shared/Partial/CMBox2.cshtml b/BO/Views/Shared/Partial/CMBox2.cshtml index 6f6e36d..8411a4b 100644 --- a/BO/Views/Shared/Partial/CMBox2.cshtml +++ b/BO/Views/Shared/Partial/CMBox2.cshtml @@ -101,7 +101,7 @@ + r.typeedu + ":" + r.typegrade + ":" + r.typejob + ":" - + r.typejob + ":" + + r.typejobitem + ":" + r.isaccommodation + ":" + r.sssetermname + ":" + getint(r.accommofee) diff --git a/BO/Views/croom/lectreg.cshtml b/BO/Views/croom/lectreg.cshtml index 1849878..df29d11 100644 --- a/BO/Views/croom/lectreg.cshtml +++ b/BO/Views/croom/lectreg.cshtml @@ -1,4 +1,7 @@ @model NP.Model.VMCM + @{ + string[] jobItems = ViewBag.JobTypeItems.ToString().Split(','); + }
    개별등록
    @@ -24,7 +27,7 @@
    -
    +
    @@ -45,12 +48,18 @@
    +
    +
    + +
    +
    +
    @@ -59,9 +68,9 @@
    - @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:환급;0:비환급" }, { "name", "isrebate" }, { "checked", 1} }) + @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:환급;0:비환급" }, { "name", "isrebate" }, { "checked", 1 } })
    -
    +
    @@ -108,12 +117,12 @@
    -
    - -
    - @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:개인;1:업체" }, { "name", "iscompany" }, { "checked", 0} }) -
    +
    + +
    + @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:개인;1:업체" }, { "name", "iscompany" }, { "checked", 0 } })
    +
    @@ -185,15 +194,20 @@