BO/Controllers/croomController.cs

@@ -418,6 +418,7 @@ namespace NP.BO.Controllers
                 case 0:
                     {
                         ViewBag.fronturl = GetConfig("fronturl");
+                        ViewBag.reporturl = GetConfig("reporturl");
                         if (Dao.Get<CMEV>("cm.cmev", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno } }).Count > 0)
                         {
                             vm.CMEV = Dao.Get<CMEV>("cm.cmev", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno } }).First();

BO/Views/croom/grade.cshtml

@@ -23,6 +23,7 @@
 @section scriptsHeader{
     @Html.Partial("./Partial/semscript")
     @Html.Partial("./Partial/FileScript")   
+        @Html.Partial("./Partial/ScriptDate")
 }
 @section scripts{
     <script>

BO/Views/croom/grade0.cshtml

@@ -96,6 +96,7 @@
                         }
                         <th>환산점수</th>
                         <th>수료여부</th>
+                        <th>수료일변경</th>
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
@@ -123,6 +124,7 @@
                         }
                         <td>@(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString())</td>
                         <td class="@(d.iscomplete==1?"link text-center":"")">@Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
+                        <td><a style="@(d.iscomplete == 1 ? "":"display:none;")" href="#" class="btn btn-select btn-xxs" onclick="changecompt('@(d.completetime != null ? d.completetime.Value.ToString("yyyy-MM-dd") : "0001-01-01")','@d.username','@d.userid',@d.lectno,'@d.cshape')">변경</a></td>
                     </tr>
                     }
                 </tbody>
@@ -131,6 +133,18 @@
     </section>
     @Html.Partial("./Partial/dform", Model)
 </form>
+<div id="thisbox" class="findbox draggable regbox" style="width: 600px; z-index: 1041; top: 30%; left:30%; overflow: auto;">
+    <h4><i class="fa fa-bars"></i> <span id="pcap">교육생 정보</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
+    <table class="regtable">
+        <colgroup><col style="width:150px;" /><col /></colgroup>
+        <tr><th>이름(ID)</th><td id="usernameid"></td></tr>
+        <tr><th id="thcshape">수료일자/교육종료일</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "completetime" } })</td></tr>
+    </table>
+    <div class="findboxbtnbox" id="btnsavelect">
+        <a href="#" class="btn btn-primary" onclick="change();">저장</a>
+    </div>
+    <br /><br />
+</div>
 <script>
 
     var _no = 0;
@@ -182,16 +196,44 @@
         }
     }
     var _authtype = 1;
+    var _lectno;
     function viewcert(lectno) {
+        _lectno = lectno;
         capp("/acommon/authkey", { authtype: _authtype, jobkey: lectno }, "cbauthkey");
     }
     function cbauthkey() {
         if (capResult.code == 1000) {
-            var pop = window.open('@ViewBag.fronturl/Open/CertPrint?userno=@ViewBag.SSUserNo&authtype=' + _authtype + '&randkey=' + capResult.obj, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
+            @*var pop = window.open('@ViewBag.fronturl/Open/CertPrint?userno=@ViewBag.SSUserNo&authtype=' + _authtype + '&randkey=' + capResult.obj, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");*@
+            var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+_lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
             if (pop == null) {
                 msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요.");
             }
         }
     }
+    var _lectno;
+    var _cshape;
+    function changecompt(time, username, userid, lectno, cshape) {
+        _lectno = lectno;
+        _cshape = cshape;
+        if (cshape == 1) { $("#thcshape").text("교육종료일"); }
+        else { $("#thcshape").text("수료일자"); }
+        $("#usernameid").text(username + "(" + userid + ")");
+        $("#completetime").val(time);
+        bglayer();
+        $("#thisbox").slideDown("fast");
+    }
+    function change() {
+        if ($("#completetime").val == null) {
+            msg2("수료일자를 입력한 후 저장해주세요.");
+        } else if (confirm("수료일자를 수정하시겠습니까?")) {
+            capp("/acommon/lecttimechange", { lectno: _lectno, completetime: $("#completetime").val(), cshape: _cshape }, "cblecttimechange", null, null, null, true);
+        }
+    }
+    function cblecttimechange() {
+        if (capResult.code == 1000) {
+            msg2("수료일자를 변경했습니다.", null, null, null, true);
+            submit("mform", 500, true);
+        } else { msgadmin2(); }
+    } 
 </script>
 

BO/Views/croom/grade1.cshtml

@@ -61,7 +61,14 @@
                     <option value="">-회차선택</option>
                     @foreach (var d in Model.CMInnings)
                     {
-                        <option value="@d.cmino">@string.Format("{0}.{1}({2} {3}:{4}~{5}:{6})", d.iseq, d.ititle, d.idate.ToString("yy-MM-dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2), d.iet.Substring(0, 2), d.iet.Substring(2, 2))</option>
+                        if (Model.CM.cshape == 2)
+                        {
+                            <option value="@d.cmino">@string.Format("{0}.{1}", d.iseq, d.ititle)</option>
+                        }
+                        else
+                        {
+                            <option value="@d.cmino">@string.Format("{0}.{1}({2} {3}:{4}~{5}:{6})", d.iseq, d.ititle, d.idate.ToString("yy-MM-dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2), d.iet.Substring(0, 2), d.iet.Substring(2, 2))</option>
+                        }
                     }
                 </select>
             </td>

BO/Web.config

@@ -32,10 +32,11 @@
       
       <add key="fronturl" value="https://www.ynicte.com" />
       <add key="adminurl" value="http://admin.ynicte.com" />
+      <add key="reporturl" value="http://ynicter.nptc.kr" />
       <add key="isstaging" value="1" />
       <!--<add key="masteremail" value="edu@ynicte.or.kr;mail.ynicte.or.kr;25;ynicte@ynicte.or.kr;k7758870!%" />-->
       <add key="masteremail" value="yicte@cte.or.kr;smtp.daum.net;465;yicte2020;yicte04003" />
-      <add key="usessl" value="N" />
+      <add key="usessl" value="Y" />
       <add key="daokey" value="ynictelms2020" />
 
       <!--결제 url | mid | hashed signkey | 취소모듈비밀번호 | 거래번호앞두자리-->

Base/Controller/ACommonCRoom.cs

@@ -922,6 +922,10 @@ namespace NP.Base.Controllers
         {
             return JsonOK(Dao.Save("pay.unpaymoney", new Hashtable() { { "payno", payno },{ "payoktime", payoktime}, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }));
         }
-        
+        [HttpPost]
+        public JsonResult LectTimeChange(Int64 lectno, DateTime? completetime, Int64 cshape)
+        {
+            return JsonOK(Dao.Save("lect.completetime.change", new Hashtable() { { "lectno", lectno }, { "completetime", completetime }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }));
+        }
     }
 }

Dao/MyBatis/Maps/Grade.xml

@@ -245,7 +245,7 @@
             select a.lectno,b.userno
                 ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">c.cname,c.cmno,u.username</isNull> ) rno
                 ,count(a.lectno) over() pagetotalcount
-                ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete
+                ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime
                 ,p.payoktime
                 ,c.sstime,c.cmno,c.cname,c.classno
                 ,b.attrate

Dao/MyBatis/Maps/Lect.xml

@@ -1297,6 +1297,11 @@
             order by a.idx,b.retime
             limit 2
         </select>
+        <update id="lect.completetime.change" parameterClass="hashtable">
+          update lect set <include refid="sql.up"></include>
+            ,completetime=#completetime#
+          where lectno=#lectno# and iscomplete=1;
+        </update>
     </statements>
 </sqlMap>
 

Model/CM.cs

@@ -1052,6 +1052,7 @@ namespace NP.Model
         public String lectnos { get; set; }
         public String cmnos { get; set; }
         public int ispassat { get; set; }
+        public DateTime? completetime { get; set; }
     }
     /// <summary>
     /// 자격검정시험