From 80caa003d51558710b07f42ec3baacbeb13853f5 Mon Sep 17 00:00:00 2001 From: hyunho Date: Tue, 30 Mar 2021 01:10:24 +0000 Subject: [PATCH] --- BO/Views/cm/cmreg.cshtml | 2 +- BO/Views/cm/cmregeduschedule.cshtml | 2 +- BO/Views/cm/cmreginning.cshtml | 8 ++++---- BO/Views/cm/cms.cshtml | 2 +- BO/Views/croom/Documents.cshtml | 2 +- BO/Views/croom/encourageset.cshtml | 2 +- BO/Views/croom/grades.cshtml | 2 +- BO/Views/croom/lectcms.cshtml | 2 +- BO/Views/croom/pay.cshtml | 2 +- BO/Views/croom/payview.cshtml | 2 +- BO/Views/croom/rss.cshtml | 2 +- BO/Views/data/learns.cshtml | 2 +- BO/Views/data/learns1.cshtml | 2 +- Model/CM.cs | 14 +++++++------- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml index 791f57c..3f19f4f 100644 --- a/BO/Views/cm/cmreg.cshtml +++ b/BO/Views/cm/cmreg.cshtml @@ -98,7 +98,7 @@ }
-
@Html.Partial("./Partial/Radio", Model.CM.cshape, new ViewDataDictionary() { { "valuetext", "0:온라인;1:오프라인;2:혼합(온라인+오프라인)" }, { "checked", Model.CM.cshape }, { "name", "CM.cshape" } })
+
@Html.Partial("./Partial/Radio", Model.CM.cshape, new ViewDataDictionary() { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "checked", Model.CM.cshape }, { "name", "CM.cshape" } })
diff --git a/BO/Views/cm/cmreginning.cshtml b/BO/Views/cm/cmreginning.cshtml index 6b842f9..4331ca9 100644 --- a/BO/Views/cm/cmreginning.cshtml +++ b/BO/Views/cm/cmreginning.cshtml @@ -87,18 +87,18 @@ @if (Model.CM.cshape == 0) { - + } @if (Model.CM.cshape == 1) { - + } @if (Model.CM.cshape == 2) { - + } @*@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:온라인;0:오프라인" }, { "checked", 1 }, { "name", "isonline" } })*@ @@ -259,7 +259,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 5e16335..709f633 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -54,7 +54,7 @@ 교육유형
- @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", ":-유형선택" } })
diff --git a/BO/Views/croom/Documents.cshtml b/BO/Views/croom/Documents.cshtml index 923da95..14673ae 100644 --- a/BO/Views/croom/Documents.cshtml +++ b/BO/Views/croom/Documents.cshtml @@ -189,7 +189,7 @@ if (isOK) { educontract(lectnos.substring(1)); } else { - msg("오프라인교육만 조회하실 수 있습니다."); + msg("교육장 교육만 조회하실 수 있습니다."); } } } diff --git a/BO/Views/croom/encourageset.cshtml b/BO/Views/croom/encourageset.cshtml index 8e49eac..4a4b84a 100644 --- a/BO/Views/croom/encourageset.cshtml +++ b/BO/Views/croom/encourageset.cshtml @@ -25,7 +25,7 @@ { 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 59d75ef..f1c2304 100644 --- a/BO/Views/croom/grades.cshtml +++ b/BO/Views/croom/grades.cshtml @@ -19,7 +19,7 @@ } - @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", ":-수료처리여부;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 5d620f5..36f0f70 100644 --- a/BO/Views/croom/lectcms.cshtml +++ b/BO/Views/croom/lectcms.cshtml @@ -19,7 +19,7 @@ } - @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/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 88d8aa6..a7ba797 100644 --- a/BO/Views/croom/pay.cshtml +++ b/BO/Views/croom/pay.cshtml @@ -74,7 +74,7 @@ @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", Model.CGs, new ViewDataDictionary { { "name", "stringval13" }, { "selected", Model.stringval13 }, { "df", ":-과정분류" } })         diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index 9055b07..e94b218 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -205,7 +205,7 @@ else if (p.isunpay == 3) @if (p.isgroup == 1 && pi.Where(w => w.ptype == 0).Count() > 1) {
-
오프라인강의(단과) 단체수강 교육생정보
+
교육장 강의(단과) 단체수강 교육생정보
diff --git a/BO/Views/croom/rss.cshtml b/BO/Views/croom/rss.cshtml index 61313b4..0ea6861 100644 --- a/BO/Views/croom/rss.cshtml +++ b/BO/Views/croom/rss.cshtml @@ -19,7 +19,7 @@ } - @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", ":-유형선택;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 a1c8230..9a9c397 100644 --- a/BO/Views/data/learns.cshtml +++ b/BO/Views/data/learns.cshtml @@ -6,7 +6,7 @@ @*
  • 계열별
    • *@ @*
  • 직급별
    • *@
  • 온라인
    • -
  • 온라인혼합
    • +
  • 온라인 혼합
  • 교육장
  • RawData
    • diff --git a/BO/Views/data/learns1.cshtml b/BO/Views/data/learns1.cshtml index 2f43562..c1137c4 100644 --- a/BO/Views/data/learns1.cshtml +++ b/BO/Views/data/learns1.cshtml @@ -20,7 +20,7 @@ } - @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", 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/Model/CM.cs b/Model/CM.cs index e873b22..8e55d4a 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -275,14 +275,14 @@ namespace NP.Model } } /// - /// 강의유형 0: 온라인, 1: 오프라인, 2: 혼합(온+오프) + /// 강의유형 0: 온라인, 1: 교육장, 2: 혼합(온+오프) /// public int cshape {get;set;} public String cshapename { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "오프라인" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; } } /// @@ -507,7 +507,7 @@ namespace NP.Model /// public int iseq {get;set;} /// - /// 학습방식 0:오프라인,1:온라인 + /// 학습방식 0:교육장,1:온라인 /// public int isonline {get;set;} public String tasteurl { get; set; } @@ -515,7 +515,7 @@ namespace NP.Model { get { - return isonline == 0 ? "오프라인" : "온라인"; + return isonline == 0 ? "교육장" : "온라인"; } } public String isonlinename2 @@ -635,7 +635,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "오프라인" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; } } public Int64 lectno { get; set; } @@ -1113,7 +1113,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; } } public String cshapename2 { get; set; } @@ -2254,7 +2254,7 @@ namespace NP.Model { get { - return cshape == 0 ? "온라인" : cshape == 1 ? "오프라인" : cshape == 2 ? "혼합" : "-"; + return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-"; } } public String cgname { get; set; }
    이름(ID)회사사업장과의관계부서/직위회사전화번호휴대전화번호공정거래업무경력