From 3ecb4fca8d31c3b4a24a6091eb2322c11719bac0 Mon Sep 17 00:00:00 2001
From: shjang <shjang  @example.com>
Date: Tue, 26 Jul 2022 06:51:18 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=20:=20=EA=B3=BC=EC=A0=95/=EA=B0=95=EC=A2=8C?=
 =?UTF-8?q?=20=ED=99=98=EA=B8=89=EC=97=AC=EB=B6=80=20=EB=B0=8F=20=EC=98=A4?=
 =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=90=EC=9C=A1=EC=9D=BC?=
 =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80=20=20=20=20=20/BO/Views/cm/cmreg?=
 =?UTF-8?q?.cshtml=20=20=20=20=20/BO/Views/cm/cmregeduschedule.cshtml=20?=
 =?UTF-8?q?=20=20=20=20/BO/Views/cm/cmregest.cshtml=20=20=20=20=20/BO/View?=
 =?UTF-8?q?s/cm/cmreginning.cshtml=20=20=20=20=20/BO/Views/cm/cmregmenu.cs?=
 =?UTF-8?q?html=20=20=20=20=20/Model/CM.cs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Views/cm/cmreg.cshtml            |  10 ++-
 BO/Views/cm/cmregeduschedule.cshtml | 125 ++++++++++++++++++++--------
 BO/Views/cm/cmregest.cshtml         |   4 +-
 BO/Views/cm/cmreginning.cshtml      |   4 +-
 BO/Views/cm/cmregmenu.cshtml        |   4 +-
 Model/CM.cs                         |  14 ++++
 6 files changed, 119 insertions(+), 42 deletions(-)

diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index 25807e6..36631dd 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -3,15 +3,18 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class="@(Model.tabidx == 0 ? "active" : "")" id="tab1"><a href="#" data-toggle="tab">기본정보</a></li>
         <li class="@(Model.tabidx == 1 ? "active" : "")"><a href="#" onclick="@(Model.CM.cmno < 1 ? "gotab()" : "gotab(1)");" data-toggle="tab">회차설정</a></li>
-        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)
+        @*20220725 강좌인경우 교육일정 보이도록 처리
+        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)*@
+        @if (Model.CM.ismaster == 0)
         {
             <li class="@(Model.tabidx == 2 ? "active" : "")"><a href="#" onclick="@(Model.CM.cmno < 1 ? "gotab()" : "gotab(2)");" data-toggle="tab">교육일정</a></li>
         }
+
         @if (!ViewBag.IsSubAdmin96)
         {
             <li class="@(Model.tabidx == 3 ? "active" : "")"><a href="#" onclick="@(Model.CM.cmno < 1 ? "gotab()":"gotab(3)");" data-toggle="tab">평가설정</a></li>
             <li class="@(Model.tabidx == 4 ? "active" : "")"><a href="#" onclick="@(Model.CM.cmno < 1 ? "gotab()":"gotab(4)");" data-toggle="tab">메뉴설정</a></li>
-        } 
+        }
     </ul>
 </div>
 <div class="row mgclear">
@@ -108,9 +111,10 @@
                     <label class="col-sm-4 col-md-2 control-label req">합숙여부</label>
                     <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Radio", Model.CM.isaccommodation, new ViewDataDictionary() { { "valuetext", "1:예;0:아니요" }, { "checked", Model.CM.isaccommodation }, { "name", "CM.isaccommodation" } })</div>
                 </div>
+                @*20220725 환급여부 추가*@
                 <div class="line line-dashed line-lg pull-in isaccommodation"></div><div class="form-group isaccommodation" style="display:none">
                     <label class="col-sm-4 col-md-2 control-label req">환급여부</label>
-                    <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Radio", Model.CM.isaccommodation, new ViewDataDictionary() { { "valuetext", "1:예;0:아니요" }, { "checked", Model.CM.isrefund }, { "name", "CM.isrefund" } })</div>
+                    <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Radio", Model.CM.isrefund, new ViewDataDictionary() { { "valuetext", "1:예;0:아니요" }, { "checked", Model.CM.isrefund }, { "name", "CM.isrefund" } })</div>
                 </div>
                 <div id="divLegalEdu" style="display:none">
                     <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
diff --git a/BO/Views/cm/cmregeduschedule.cshtml b/BO/Views/cm/cmregeduschedule.cshtml
index 09b4460..115e4fc 100644
--- a/BO/Views/cm/cmregeduschedule.cshtml
+++ b/BO/Views/cm/cmregeduschedule.cshtml
@@ -6,7 +6,9 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">기본정보</a></li>
         <li class=""><a href="#" onclick="gotab(1);" data-toggle="tab">회차설정</a></li>
-        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)
+        @*20220725 강좌인경우 교육일정 보이도록 처리
+        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)*@
+        @if (Model.CM.ismaster == 0)
         {
             <li class="active"><a href="#" data-toggle="tab">교육일정</a></li>
         }
@@ -110,7 +112,15 @@
         <colgroup><col style="width:150px;" /><col /></colgroup>
         <tr>
             <th>학습방식</th>
-            <td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:오프라인;1:온라인대체" },{ "checked",0}, { "name", "scdtype" } })</td>
+            @*20220725 교육유형이 오프라인인 경우 학습방식 변경 불가*@
+            @if (Model.CM.cshape == 1)
+            {
+                <td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:오프라인;1:온라인대체" }, { "disabled", "disabled" }, { "checked", 0 }, { "name", "scdtype" } })</td>
+            }
+            else
+            {
+                <td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:오프라인;1:온라인대체" }, { "checked", 0 }, { "name", "scdtype" } })</td>
+            }
         </tr>
         <tr style="display:none;">
             <th class="req">회차(순서)</th>
@@ -134,14 +144,27 @@
         </tr>
         <tr>
             <th class="req">교육종료일</th>
-            <td>
-                @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "idate" } })
-                @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "isth" }, { "start", 0 }, { "end", 23 }, { "textadd", "시" }, { "df", ":-시" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
-                @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "istm" }, { "start", 0 }, { "end", 59 }, { "textadd", "분" }, { "df", ":-분" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
-                <span class="idoff">~</span>
-                @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "ieth" }, { "start", 0 }, { "end", 23 }, { "textadd", "시" }, { "df", ":-시" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
-                @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "ietm" }, { "start", 0 }, { "end", 59 }, { "textadd", "분" }, { "df", ":-분" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
-            </td>
+            @*20220725 교육유형이 오프라인인 경우 From~To 형태로 기재*@
+            @if (Model.CM.cshape == 1)
+            {
+                <td>
+                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "iestart" } })
+                    <span class="idoff">~</span>
+                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "ieend" } })
+                </td>
+            }
+            else
+            {
+                <td>
+                    @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "idate" } })
+                    @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "isth" }, { "start", 0 }, { "end", 23 }, { "textadd", "시" }, { "df", ":-시" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
+                    @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "istm" }, { "start", 0 }, { "end", 59 }, { "textadd", "분" }, { "df", ":-분" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
+                    <span class="idoff">~</span>
+                    @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "ieth" }, { "start", 0 }, { "end", 23 }, { "textadd", "시" }, { "df", ":-시" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
+                    @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "special", "fromto" }, { "name", "ietm" }, { "start", 0 }, { "end", 59 }, { "textadd", "분" }, { "df", ":-분" }, { "class", "disp-init idoff" }, { "style", "width: 80px;" } })
+                </td>
+            }
+
         </tr>
         <tr class="troff">
             <th class="req">교육장소</th>
@@ -172,7 +195,7 @@
     @Html.Partial("./Partial/ScriptDate")
 }
 @section scripts{
-<script>
+    <script>
     var _cmino = 0;
     var _cmisno = 0;
     var _isonline = @(Model.CMInnings.Count()>0 ? Model.CMInnings.FirstOrDefault().scdtype == 1 ? "true" : "false" : "false");
@@ -220,23 +243,39 @@
     }
 
     function savescd() {
-        if (val("sseq") == "") { focus("sseq"); msg2("운영기수를 입력해주세요."); }
-        else if (@Model.CM.ismaster == 0 && check("idate", null, "학습일자를 입력해주세요.", true)) { }
-        //오프라인일때만 체크
-        else if (!_isonline && val("isth") == "") { focus("isth"); msg2("학습시간을 확인해주세요."); }
-        else if (!_isonline && val("istm") == "") { focus("istm"); msg2("학습시간을 확인해주세요."); }
-        else if (!_isonline && val("ieth") == "") { focus("ieth"); msg2("학습시간을 확인해주세요."); }
-        else if (!_isonline && val("ietm") == "") { focus("ietm"); msg2("학습시간을 확인해주세요."); }
-        else if (!_isonline && getint(val("isth")) > getint(val("ieth"))) { focus("ieth"); msg2("학습시간을 확인해주세요(종료시간이 더 빠름)"); }
-        else if (!_isonline && getint(val("isth")) == getint(val("ieth")) && getint(val("istm")) > getint(val("ietm"))) { focus("ieth"); msg2("학습시간을 확인해주세요(종료시간이 더 빠름)"); }
-        else if (confirm("저장하시겠습니까?")) {
+        var estart = "";
+        var eend = "";
+        if (val("sseq") == "") {
+            focus("sseq"); msg2("운영기수를 입력해주세요.");
+            return;
+        }
+
+        if (@Model.CM.cshape == 1) {//20220726 오프라인100%
+            if (check("iestart", null, "교육종료일(시작)을 입력해주세요.", true)) { return; }
+            else if (check("ieend", null, "교육종료일(종료)을 입력해주세요.", true)) { return; }
+            else if (val("iestart") > val("ieend")) { focus("ieend"); msg2("교육종료일(종료)을 확인해주세요(종료일이 더 빠름)"); return; }
+
+            estart = (getv("iestart") + " 00:00:00").toString();
+            eend = (getv("ieend") + " 23:59:59").toString();
+        } else if (@Model.CM.cshape == 2) {//20220726 온라인
+            if (check("idate", null, "교육종료일을 입력해주세요.", true)) { return;}
+            else {
+                if (!_isonline) { // 혼합교육
+                    if (val("isth") == "") { focus("isth"); msg2("교육종료시간을 확인해주세요."); return; }
+                    else if (val("istm") == "") { focus("istm"); msg2("교육종료시간을 확인해주세요."); return; }
+                    else if (val("ieth") == "") { focus("ieth"); msg2("교육종료시간을 확인해주세요."); return;}
+                    else if (val("ietm") == "") { focus("ietm"); msg2("교육종료시간을 확인해주세요."); return; }
+                    else if (getint(val("isth")) > getint(val("ieth"))) { focus("ieth"); msg2("교육종료시간을 확인해주세요(종료시간이 더 빠름)"); return;}
+                    else if (getint(val("isth")) == getint(val("ieth")) && getint(val("istm")) > getint(val("ietm"))) { focus("ieth"); msg2("교육종료시간을 확인해주세요(종료시간이 더 빠름)"); return;}
+                }
+            }
+
             var date = getv("idate");
             var isth = getv("isth");
             var istm = getv("istm");
             var ieth = getv("ieth");
             var ietm = getv("ietm");
-            var estart = "";
-            var eend = "";
+
             if (!_isonline) {
                 estart = (date + " " + fillzero(isth, true, 2) + ":" + fillzero(istm, true, 2) + ":00").toString();
                 eend = (date + " " + fillzero(ieth, true, 2) + ":" + fillzero(ietm, true, 2) + ":59").toString();
@@ -244,14 +283,22 @@
                 estart = (date + " 00:00:00").toString();
                 eend = (date + " 23:59:59").toString();
             }
+        }
+
+        if (!_isonline && !$.isNumeric(getv("iquota"))) {
+            focus("iquota"); msg2("모집인원을 입력해주세요.");
+            return;
+        }
+
+        if (confirm("저장하시겠습니까?")) {
             capp("/acommon/cminningscdsave", {
-                cmisno: _cmisno,
-                cmino: @(Model.CMInnings.Count() > 0 ? Model.CMInnings[0].cmino : 0),
-                estart2: estart,
-                eend2: eend,
-                quota: _isonline ? 99999 : getv("iquota"),
-                sseq : getv("sseq"),
-                studyplace: _isonline ? null : $(":input:radio[name=istudyplace]:checked").val()
+            cmisno: _cmisno,
+            cmino: @(Model.CMInnings.Count() > 0 ? Model.CMInnings[0].cmino : 0),
+            estart2: estart,
+            eend2: eend,
+            quota: _isonline ? 99999 : getv("iquota"),
+            sseq : getv("sseq"),
+            studyplace: _isonline ? null : $(":input:radio[name=istudyplace]:checked").val()
             }, "cbcminningscdsave", null, null, null, true);
         }
     }
@@ -348,12 +395,18 @@
             var startSec = start.split(':')[1];
             var endMinute = end.split(':')[0];
             var endSec = end.split(':')[1];
+            if (@Model.CM.cshape == 1) { //20220726 오프라인100%
+                setv("iestart", d.estartShortDateString);
+                setv("ieend", d.eendShortDateString);
+            }
+            else {
+                setv("idate", date);
+                setv("isth", getint(startMinute));
+                setv("istm", getint(startSec));
+                setv("ieth", getint(endMinute));
+                setv("ietm", getint(endSec));
+            }
 
-            setv("idate", date);
-            setv("isth", getint(startMinute));
-            setv("istm", getint(startSec));
-            setv("ieth", getint(endMinute));
-            setv("ietm", getint(endSec));
             setv("iquota", getint(d.quota));
             setv("sseq", getint(d.sseq));
             if (d.studyplace != null) {
@@ -431,5 +484,5 @@
             }
         }
     }
-</script>
+    </script>
 }
diff --git a/BO/Views/cm/cmregest.cshtml b/BO/Views/cm/cmregest.cshtml
index 98b5e66..f207321 100644
--- a/BO/Views/cm/cmregest.cshtml
+++ b/BO/Views/cm/cmregest.cshtml
@@ -3,7 +3,9 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">기본정보</a></li>
         <li class=""><a href="#" onclick="gotab(1);" data-toggle="tab">회차설정</a></li>
-        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)
+        @*20220725 강좌인경우 교육일정 보이도록 처리
+        @if(Model.CM.ismaster == 0 && Model.CM.cshape == 2) *@
+        @if (Model.CM.ismaster == 0)
         {
             <li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">교육일정</a></li>
         }
diff --git a/BO/Views/cm/cmreginning.cshtml b/BO/Views/cm/cmreginning.cshtml
index 803c55a..e8da03a 100644
--- a/BO/Views/cm/cmreginning.cshtml
+++ b/BO/Views/cm/cmreginning.cshtml
@@ -3,7 +3,9 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">기본정보</a></li>
         <li class="active"><a href="#" data-toggle="tab">회차설정</a></li>
-        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)
+        @*20220725 강좌인경우 교육일정 보이도록 처리
+        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)*@
+        @if (Model.CM.ismaster == 0)
         {
             <li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">교육일정</a></li>
         }
diff --git a/BO/Views/cm/cmregmenu.cshtml b/BO/Views/cm/cmregmenu.cshtml
index 80a0ce4..00d1175 100644
--- a/BO/Views/cm/cmregmenu.cshtml
+++ b/BO/Views/cm/cmregmenu.cshtml
@@ -3,7 +3,9 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">기본정보</a></li>
         <li class=""><a href="#" onclick="gotab(1);" data-toggle="tab">회차설정</a></li>
-        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)
+        @*20220725 강좌인경우 교육일정 보이도록 처리
+        @if (Model.CM.ismaster == 0 && Model.CM.cshape == 2)*@
+        @if (Model.CM.ismaster == 0)
         {
             <li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">교육일정</a></li>
         }
diff --git a/Model/CM.cs b/Model/CM.cs
index 96edb16..38f1bbe 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -4003,6 +4003,7 @@ namespace NP.Model
                 return estart.ToShortDateString();
             }
         }
+
         public int estartday
         {
             get {
@@ -4016,6 +4017,19 @@ namespace NP.Model
         /// </summary>
         public DateTime eend { get; set; }
         public string eend2 { get; set; }
+
+        /// <summary>
+        /// 종료일
+        /// 20220726
+        /// </summary>
+        public string eendShortDateString
+        {
+            get
+            {
+                return eend.ToShortDateString();
+            }
+        }
+
         /// <summary>
         /// 0:오프라인,1:온라인대체
         /// </summary>