From b7156f14942b2950b4665969bf6da3783cbba3d5 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Thu, 3 Jun 2021 01:43:16 +0000 Subject: [PATCH] --- BO/Controllers/dataController.cs | 2 +- BO/Views/cm/cmreginning.cshtml | 2 +- BO/Views/cm/cms.cshtml | 3 ++- BO/Views/croom/encourageset.cshtml | 5 +++-- BO/Views/croom/grades.cshtml | 3 ++- BO/Views/croom/lectcms.cshtml | 3 ++- BO/Views/croom/pay.cshtml | 3 ++- BO/Views/croom/rss.cshtml | 3 ++- BO/Views/data/learns.cshtml | 6 +++--- BO/Views/data/learns1.cshtml | 3 ++- Dao/MyBatis/Maps/System.xml | 4 ++-- FO/Controllers/FOBaseController.cs | 11 +++++++++-- FO/Views/CRoom/Index.cshtml | 4 ++-- FO/Views/CRoom/Innings.cshtml | 4 ++-- FO/Views/Course/ApplyAgree.cshtml | 2 +- FO/Views/Course/OffList.cshtml | 2 +- FO/Views/Course/SmartSearch.cshtml | 10 +++++----- FO/Views/Home/Index.cshtml | 8 ++++---- FO/Views/My/Lecture.cshtml | 4 ++-- FO/Views/My/Ready.cshtml | 2 +- FO/Views/Shared/Partial/PayReturn.cshtml | 2 +- Model/CM.cs | 6 +++--- Model/Pay.cs | 6 +++--- 23 files changed, 56 insertions(+), 42 deletions(-) diff --git a/BO/Controllers/dataController.cs b/BO/Controllers/dataController.cs index ed95e8c..60807c3 100644 --- a/BO/Controllers/dataController.cs +++ b/BO/Controllers/dataController.cs @@ -164,9 +164,9 @@ namespace NP.BO.Controllers vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); vm.stringval = vm.stringval ?? DateTime.Now.Year.ToString(); + if (vm.tabidx == 0) { vm.tabidx = 6; } if (vm.tabidx == 0) { - vm.Datas = Dao.Get("cm.data.lect.byc", new System.Collections.Hashtable() { { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", 0 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 } }); diff --git a/BO/Views/cm/cmreginning.cshtml b/BO/Views/cm/cmreginning.cshtml index cc2737a..65ee2e2 100644 --- a/BO/Views/cm/cmreginning.cshtml +++ b/BO/Views/cm/cmreginning.cshtml @@ -262,7 +262,7 @@ capp("/acommon/cminningsave", { cmino: _cmino, cmno: @Model.CM.cmno, isonline: getrv("isonline"), ititle: getv("ititle"), ctno: $("#contentdatabox li").attr("data-no"), istaste: getrv("istaste"), sttime: getint(val("sttime")), atime: getint(val("atime")), mstime: getint(val("mstime")), metime: getint(val("metime")), userno: val("userno"), iseq: val("iseq") }, "cbcminningsave", null, null,null,true); } else { if (@Model.CM.cshape == 2) { - msg2("온라인 혼합 교육시 교육장 회차는 등록 할 수 없습니다."); + msg2("온라인 교육시 교육장 회차는 등록 할 수 없습니다."); return; } var data = new FormData(); diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index 781c57c..29209e5 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -54,7 +54,8 @@ 교육유형
- @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "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", null, new ViewDataDictionary { { "valuetext", "1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
diff --git a/BO/Views/croom/encourageset.cshtml b/BO/Views/croom/encourageset.cshtml index 4a4b84a..d84fe64 100644 --- a/BO/Views/croom/encourageset.cshtml +++ b/BO/Views/croom/encourageset.cshtml @@ -21,11 +21,12 @@ - @for (var i = 0; i < 9; i++) + @*@for (var i = 0; i < 9; i++)*@ + @for (var i = 0; i < 8; i++) { var scdlect = Model.SCDLects.Where(w => w.scdno == i + 1).FirstOrDefault() ?? new NP.Model.SCDLect(); - 작업@(i+1). @(i == 7 ? "교육장" : i == 8 ? "자격검정" : "온라인 혼합") + 작업@(i+1). @(i == 7 ? "교육장" : i == 8 ? "자격검정" : "온라인교육") @(i < 2 || i > 6 ? "출석" : i == 2 ? "진행평가" : i == 3 ? "최종평가" : i == 4 ? "과제" : i == 5 ? "토론" : i == 6 ? "강의평가" : "-") @(i < 2 ? "진도율 80% 미만" : i == 2 || i == 3 ? "미응시자 대상" : i == 4 || i == 5 ? "미제출자 대상" : i == 6 ? "미참여자 대상" : i == 7 ? "교육일" : i == 8 ? "시험일" : "") @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "special", "fromto" }, { "start", 1 }, { "end", 10 }, { "name", "dday" }, { "selected", scdlect.dday } }) 일 남음 diff --git a/BO/Views/croom/grades.cshtml b/BO/Views/croom/grades.cshtml index f1c2304..c767853 100644 --- a/BO/Views/croom/grades.cshtml +++ b/BO/Views/croom/grades.cshtml @@ -19,7 +19,8 @@ } - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) + @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@ + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-수료처리여부;3:수료처리;4:수료 미처리" }, { "name", "stringval4" }, { "selected", Model.stringval4 } }) @Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "강좌명을 입력하세요.", CssClass = "ff" })) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" }) diff --git a/BO/Views/croom/lectcms.cshtml b/BO/Views/croom/lectcms.cshtml index 36f0f70..2b47eb0 100644 --- a/BO/Views/croom/lectcms.cshtml +++ b/BO/Views/croom/lectcms.cshtml @@ -19,7 +19,8 @@ } - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) + @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@ + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })

교육기간 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval5) ? (DateTime?)null : Convert.ToDateTime(Model.stringval5), new ViewDataDictionary { { "name", "stringval5" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) @Html.Partial("./Partial/Text", Model.stringval4, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval4", Value = Model.stringval4, PH = "강좌명을 입력하세요.", CssClass = "ff" })) diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml index 6fe41e9..3077382 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -85,7 +85,8 @@ @Html.HiddenFor(m => m.stringval14) @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품구분;0:강좌;1:패키지;2:교재;3:시험;4:자격증강좌" }, { "name", "stringval11" }, { "selected", Model.stringval11 } })*@ - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval12" }, { "selected", Model.stringval12 } }) + @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval12" }, { "selected", Model.stringval12 } })*@ + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;1:교육장교육;2:온라인교육" }, { "name", "stringval12" }, { "selected", Model.stringval12 } }) @Html.Partial("./Partial/Select", Model.CGs, new ViewDataDictionary { { "name", "stringval13" }, { "selected", Model.stringval13 }, { "df", ":-과정분류" } })         diff --git a/BO/Views/croom/rss.cshtml b/BO/Views/croom/rss.cshtml index 0ea6861..fa7390b 100644 --- a/BO/Views/croom/rss.cshtml +++ b/BO/Views/croom/rss.cshtml @@ -19,7 +19,8 @@ } - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) + @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@ + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:강의평가;1:사전설문" }, { "name", "stringval4" }, { "selected", Model.stringval4 } }) @Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "강좌명을 입력하세요.", CssClass = "ff" })) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" }) diff --git a/BO/Views/data/learns.cshtml b/BO/Views/data/learns.cshtml index 9a9c397..51a3e98 100644 --- a/BO/Views/data/learns.cshtml +++ b/BO/Views/data/learns.cshtml @@ -5,9 +5,9 @@
  • 강좌별
    • *@ @*
  • 계열별
    • *@ @*
  • 직급별
    • *@ -
  • 온라인
    • -
  • 온라인 혼합
    • -
  • 교육장
    • + @*
  • 온라인
    • *@ +
  • 온라인교육
    • +
  • 교육장교육
  • RawData
    • diff --git a/BO/Views/data/learns1.cshtml b/BO/Views/data/learns1.cshtml index c1137c4..58e2851 100644 --- a/BO/Views/data/learns1.cshtml +++ b/BO/Views/data/learns1.cshtml @@ -20,7 +20,8 @@ } - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } }) + @*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } })*@ + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } }) @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } }) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) diff --git a/Dao/MyBatis/Maps/System.xml b/Dao/MyBatis/Maps/System.xml index f1ecf15..8c4bfad 100644 --- a/Dao/MyBatis/Maps/System.xml +++ b/Dao/MyBatis/Maps/System.xml @@ -882,7 +882,7 @@ - + @**@ - +
  • @@ -45,9 +45,9 @@
    • @@ -72,7 +72,7 @@ {
    • -
      @(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장" : "혼합") @item.cname
      +
      @(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장교육" : "온라인교육") @item.cname
      diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index 3c3eed9..87ea1db 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -48,9 +48,9 @@ @@ -137,9 +137,9 @@ diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index d40e31e..443a81c 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -24,8 +24,8 @@ @*

      *@ 전체 |  교육장교육 |  - 온라인(혼합)교육 |  - 온라인교육 + 온라인교육 |  + @*온라인교육*@ diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml index 60fa23d..0ce3e45 100644 --- a/FO/Views/My/Ready.cshtml +++ b/FO/Views/My/Ready.cshtml @@ -44,7 +44,7 @@ @*수강기간 : @d.sdate.ToString("yy-MM-dd") ~ @d.edate.ToString("yy-MM-dd")*@ @if (d.cshape == 2) { - @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.ToString("yy-MM-dd")))) + @:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.Value.ToString("yy-MM-dd")))) } diff --git a/FO/Views/Shared/Partial/PayReturn.cshtml b/FO/Views/Shared/Partial/PayReturn.cshtml index 8e87748..416881b 100644 --- a/FO/Views/Shared/Partial/PayReturn.cshtml +++ b/FO/Views/Shared/Partial/PayReturn.cshtml @@ -14,7 +14,7 @@
      강좌 - @(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합") + @(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "ON") @if (d.isrebate == 1) { 환급 diff --git a/Model/CM.cs b/Model/CM.cs index 6007424..f0bc653 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -639,7 +639,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-"; } } public Int64 lectno { get; set; } @@ -1117,7 +1117,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-"; } } public String cshapename2 { get; set; } @@ -2279,7 +2279,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-"; } } public String cgname { get; set; } diff --git a/Model/Pay.cs b/Model/Pay.cs index 3960eb3..3bc9980 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -46,7 +46,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : "온라인"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : "온라인교육"; } } /// @@ -406,7 +406,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-"; } } public String cname { get; set; } @@ -704,7 +704,7 @@ namespace NP.Model { get { - return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "ON" : "-"; } } public DateTime sstime { get; set; }