<추가개발>

(주요)작업내용 
BO/Views/croom/payview.cshtml 
결재관리 일정 cshape 조건변경
Dao/MyBatis/Maps/CM.xml
교육종료일 -4 기준 뺌
FO/Views/Course/ApplyEdu.cshtml
FO/Views/Shared/Partial/Select.cshtml
이메일 선택 기능 추가
FO/Views/Course/ApplyPay.cshtml
문구수정

BO/Views/croom/payview.cshtml

@@ -321,7 +321,7 @@
             <a href="#" class="btn btn-primary" onclick="viewlect(this, @Model.Lect.ustatus, @Model.Lect.lectno, @Model.Lect.fileno, '@Model.Lect.fileurl', '@Model.Lect.orgname', @Model.Lect.status, @Model.Lect.pstatus,@Model.Lect.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}:{17}:{18}",Model.Lect.asname??"",Model.Lect.username, Model.Lect.userid??"", Model.Lect.uduty??"", Model.Lect.depart??"", Model.Lect.email, Model.Lect.telno, Model.Lect.mobile,Model.Lect.ckfcfyear,Model.Lect.assignuser,Model.Lect.edus,Model.Lect.sdate==null?"":Model.Lect.sdate.Value.ToString("yyyy-MM-dd"),Model.Lect.edate==null?"":Model.Lect.edate.Value.ToString("yyyy-MM-dd"),Model.Lect.typeman,Model.Lect.typejob,Model.Lect.typeedu,Model.Lect.typegrade,Model.Lect.pplno,Model.Lect.typejobitem)')">수정</a><br />
         </div>
     </section>
-    if (Model.Lect.cshape == 2)
+    if (Model.Lect.cshape == 2 || Model.Lect.cshape == 1)
     {
         <section class="panel panel-default">
             <header class="panel-heading"><strong><i class="fa fa-bars"></i> 교육일정<span class=""></span></strong></header>

Dao/MyBatis/Maps/CM.xml

@@ -1925,7 +1925,7 @@
         ,a.remainPeople
         ,a.isselected
         <!--211220.통합테스트목록(643) 4일부터로 변경-->
-            ,case when a.estart &lt; date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 3 day ),interval -1 second)
+            ,case when a.estart &lt; date_format(now() ,'%Y-%m-%d 00:00:00')
 		    <!--20220803
 			or a.remainPeople &lt;= 0-->
         then 0 else 1 end isend

FO/Views/Course/ApplyEdu.cshtml

@@ -263,6 +263,7 @@
                             <li>@Html.TextBoxFor(x => x.Assign.taxemail1, new { @maxlength = "100" })</li>
                             <li>＠</li>
                             <li>@Html.TextBoxFor(x => x.Assign.taxemail2, new { @maxlength = "30" })</li>
+                            @Html.Partial("./Partial/Select",null,new ViewDataDictionary { { "special","email"},{ "name","taxemail3"},{"df",":직접입력" },{"onchange","emailchange()" } })
                         </ul>
                     </td>
                 </tr>
@@ -736,5 +737,10 @@
         }
         return;
     }
+    function emailchange() {
+        if ($("#taxemail3").val() != "") {
+            $("#Assign_taxemail2").val($("#taxemail3").val());
+        }
+    }
 </script>
 

FO/Views/Course/ApplyPay.cshtml

@@ -102,8 +102,8 @@
         <p class="subTxt">
             <span>■ 카드결제 시</span><br />
             - 반드시 <span style="color : red;">소속 회사의 법인카드로</span> 결제 해 주세요. <span style="color : red;"><strong>(개인카드 결제 시 환급불가)</strong></span><br />
-            - 카드결제 후 <span style="color : red;">결제한 카드 앞면을 복사하여</span> 입교 시 지참해 주세요.<br />
+            - 법인카드결제 후 <span style="color : red;">결제한 법인카드 앞면을 복사하여</span> 입교 시 지참해 주세요.<br />
-            <span>※ 결제 한 카드가 법인명의라는 것을 <span style="color : red;">노동부에 증빙하기 위하여 필요한 서류</span> 이며 회사 명이 잘 보이도록 <span style="color : red;">앞면 만 복사하시면</span> 됩니다.</span><br /><br />
+            <span>※ 결제 한 법인카드가 <span style="color : red;">법인명의</span>라는 것을 증빙하기 위하여 <span style="color : red;">노동부에서 요청하는 서류</span> 이며 회사 명이 잘 보이도록 <span style="color : red;">앞면 만 복사하시면 됩니다.</span></span><br /><br />
         </p>
         <p class="subTxt">
             <span>■ 무통장입금 시</span><br />
@@ -155,7 +155,8 @@
         <ul class="apyRdo" id="taxinvoice_option" style="display:none;margin-top:-1px">
             <li><input type="radio" name="isreceipt" id="isreceipt1" value="1" @(Model.PPLog.isreceipt == null ? "checked" : Model.PPLog.isreceipt == 1 ? "checked" : "") /><label for="isreceipt1"> 영수</label></li>
             <li><input type="radio" name="isreceipt" id="isreceipt0" value="0" @(Model.PPLog.isreceipt == 0 ? "checked" : "") /><label for="isreceipt0"> 청구</label></li>
-            <li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>
+            <li><p class="subTxt"><span style="color : red;">※ 계산서는 교육수료일에 발행됩니다.</span></p></li>
+            @*<li style="vertical-align:sub;">계산서날짜 : <input type="text" name="taxdatereq" id="taxdatereq" data-date-format="yyyy-mm-dd" class="datepicker-input" value="@(Model.PPLog.taxdatereq == null ? "" : Model.PPLog.taxdatereq.Value.ToString("yyyy-MM-dd"))" autocomplete="off" /></li>*@
         </ul>
     </div>
 

FO/Views/Shared/Partial/Select.cshtml

@@ -0,0 +1,145 @@
+@model dynamic
+@{
+    var selected = (ViewData["selected"] ?? "").ToString();
+    var name = (ViewData["name"] ?? "").ToString();
+    var id = (ViewData["name"] ?? "").ToString().Replace(".", "_");
+    var df = (ViewData["df"] ?? "").ToString();
+    var cssclass = (ViewData["class"] ?? "").ToString();
+    var onchange = (ViewData["onchange"] ?? "").ToString();
+    var special = (ViewData["special"] ?? "").ToString();
+    var start = Convert.ToInt32((ViewData["start"] ?? "0").ToString());
+    var end = Convert.ToInt32((ViewData["end"] ?? "0").ToString());
+    var textadd = (ViewData["textadd"] ?? "").ToString();
+    var disabled = (ViewData["disabled"] ?? "").ToString() == "" ? "" : "disabled";
+    var valuetext = (ViewData["valuetext"] ?? "").ToString() == "" ? new string[] { } : (ViewData["valuetext"] ?? "").ToString().Split(';');
+    var style = (ViewData["style"] ?? "").ToString();
+    var formgroupstyle = (ViewData["formgroupstyle"] ?? "").ToString();
+}
+@if (name == "PageRowCount")
+{
+    var rc = (int)Model;
+    @:전체: @rc.ToString("#,0") 건
+    <select @disabled id="@(id)" name="@(name)" style="min-width: initial; @style">
+        <option value="10" @(selected == "10" ? "selected" : "")>10개</option>
+        <option value="20" @(selected == "20" ? "selected" : "")>20개</option>
+        <option value="30" @(selected == "30" ? "selected" : "")>30개</option>
+        <option value="50" @(selected == "50" ? "selected" : "")>50개</option>
+        <option value="100" @(selected == "100" ? "selected" : "")>100개</option>
+        <option value="1000" @(selected == "1000" ? "selected" : "")>1000개</option>
+    </select>
+}
+else if (special.ToLower() == "fromto")
+{
+    <select @disabled id="@(id)" name="@(name)" style="min-width: initial; @style" class="form-control dev @(cssclass)" onchange="@(onchange)">
+        @if (df != "")
+        {
+            <option value="@df.Split(':')[0]">@df.Split(':')[1]</option>
+        }
+        @for (int i = start; i <= end; i++)
+        {
+            <option class="deletable" value="@(i)" @(selected == i.ToString() ? "selected" : "")>@i@(textadd)</option>
+        }
+    </select>
+}
+else if (special == "fromtodesc")
+{
+    <select @disabled id="@(id)" name="@(name)" style="min-width: initial; @style" class="form-control dev @(cssclass)" onchange="@(onchange)">
+        @if (df != "")
+        {
+            <option value="@df.Split(':')[0]">@df.Split(':')[1]</option>
+        }
+        @for (int i = end; i >= start; i--)
+        {
+            <option class="deletable" value="@(i)" @(selected == i.ToString() ? "selected" : "")>@i@(textadd)</option>
+        }
+    </select>
+}
+else if (special == "Hour")
+{
+    <select @disabled id="@(id)" name="@(name)" style="min-width: initial; @style" class="form-control dev @(cssclass)" onchange="@(onchange)">
+        @if (df != "")
+        {
+            <option value="@df.Split(':')[0]">@df.Split(':')[1]</option>
+        }
+        @for (int i = 0; i <= 23; i++)
+        {
+            <option class="deletable" value="@(i.ToString("00"))" @(selected == i.ToString() ? "selected" : "")>@i 시</option>
+        }
+    </select>
+}
+else if (special == "Minute")
+{
+    <select id="@(id)" name="@(name)" style="min-width: initial; @style" class="form-control dev @(cssclass)" onchange="@(onchange)">
+        @if (df != "")
+        {
+            <option value="@df.Split(':')[0]">@df.Split(':')[1]</option>
+        }
+        @for (int i = 0; i <= 59; i++)
+        {
+            <option class="deletable" value="@(i.ToString("00"))" @(selected == i.ToString() ? "selected" : "")>@i 분</option>
+        }
+    </select>
+}
+else if (special == "reg" || name == "SearchType")
+{
+    <select @disabled id="@(name.Replace(".", "_"))" name="@(name)" onchange="@(onchange != "" ? onchange : "")" class="form-control dev @(cssclass)" style=" @style">
+        @if (df != "")
+        {
+            <option value="@(df.Contains(":") ? df.Split(':')[0] : "")" data-classgrade="0">@(df.Contains(":") ? df.Split(':')[1] : df)</option>
+        }
+        @if (valuetext.Length > 0)
+        {
+            foreach (var item in valuetext)
+            {
+                <option value="@(item.Split(':')[0])" @(item.Split(':')[0] == selected ? "selected" : "")>@(item.Split(':')[1])</option>
+            }
+        }
+        else if (Model != null){
+            foreach (var item in Model)
+            {
+                <option value="@(item.value)" data-refcode="@item.refcode" @(item.value == selected ? "selected" : "")>@item.text</option>
+            }
+        }</select>
+}
+else if (special == "email")
+{
+    <select @disabled id="@(name.Replace(".", "_"))" name="@(name)" onchange="@(onchange != "" ? onchange : "")" class="form-control dev @(cssclass)" style=" @style">
+        @if (df != "")
+        {
+            <option value="@(df.Contains(":") ? df.Split(':')[0] : "")" data-classgrade="0">@(df.Contains(":") ? df.Split(':')[1] : df)</option>
+        }
+        <option value="hanmail.com" @("hanmail.com" == selected ? "selected" : "")>hanmail.com</option>
+        <option value="yahoo.co.kr" @("yahoo.co.kr" == selected ? "selected" : "")>yahoo.co.kr</option>
+        <option value="naver.com" @("naver.com" == selected ? "selected" : "")>naver.com</option>
+        <option value="empal.com" @("empal.com" == selected ? "selected" : "")>empal.com</option>
+        <option value="hotmail.com" @("hotmail.com" == selected ? "selected" : "")>hotmail.com</option>
+        <option value="dreamwiz.com" @("dreamwiz.com" == selected ? "selected" : "")>dreamwiz.com</option>
+        <option value="hanafos.com" @("hanafos.com" == selected ? "selected" : "")>hanafos.com</option>
+    </select>
+}
+else if (valuetext.Length > 0)
+{
+    <select @disabled id="@(name.Replace(".", "_"))" name="@(name)" onchange="@(onchange != "" ? onchange : "")" class="form-control dev @(cssclass)" style=" @style">
+        @if (df != "")
+        {
+            <option value="@(df.Contains(":") ? df.Split(':')[0] : "")" data-classgrade="0">@(df.Contains(":") ? df.Split(':')[1] : df)</option>
+        }
+        @foreach (var item in valuetext)
+        {
+            <option value="@(item.Split(':')[0])" @(item.Split(':')[0] == selected ? "selected" : "")>@(item.Split(':')[1])</option>
+        }</select>
+}
+else
+{
+    <div class="form-group" style="@formgroupstyle">
+        <select @disabled id="@(name.Replace(".", "_"))" name="@(name)" onchange="@(onchange != "" ? onchange : "")" class="form-control dev @(cssclass)" style=" @style">
+            @if (df != "")
+            {
+                <option value="@(df.Contains(":") ? df.Split(':')[0] : "")" data-classgrade="0">@(df.Contains(":") ? df.Split(':')[1] : df)</option>
+            }
+            @foreach (var item in Model)
+            {
+                <option value="@(item.value)" data-refcode="@item.refcode" @(item.value == selected ? "selected" : "")>@item.text</option>
+            }</select>
+    </div>
+}