From ebcbc0ac7fb4228c48f16cc41a03fa71120a32c8 Mon Sep 17 00:00:00 2001
From: ksjihd163 <ksjihd163  @example.com>
Date: Fri, 8 Jul 2022 00:43:25 +0000
Subject: [PATCH]

---
 BO/Controllers/ccController.cs           | 18 ++++++-------
 BO/Views/MM/popups.cshtml                |  2 +-
 BO/Views/cc/homer2.cshtml                |  2 +-
 BO/Views/cc/homes.cshtml                 | 32 +++++++++++++-----------
 BO/Views/cc/roomr.cshtml                 |  8 +++++-
 BO/Views/cc/rooms.cshtml                 |  2 +-
 BO/Views/cm/cms.cshtml                   |  2 +-
 BO/Views/data/learns6.cshtml             |  3 ++-
 Base/Controller/ACommonCM.cs             |  2 +-
 Base/Controller/ACommonCRoom.cs          |  1 +
 Base/Controller/BasePartialController.cs |  2 +-
 Dao/MyBatis/Maps/Grade.xml               |  4 +--
 Dao/MyBatis/Maps/board.xml               |  1 +
 FO/Controllers/CRoomController.cs        |  2 +-
 FO/Views/CRoom/Boards.cshtml             | 10 ++++----
 FO/Views/Course/SmartSearch.cshtml       |  3 ++-
 FO/Views/Home/Popup.cshtml               |  2 +-
 FO/css/dev.css                           |  7 +++---
 18 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/BO/Controllers/ccController.cs b/BO/Controllers/ccController.cs
index e2a26b1..832838c 100644
--- a/BO/Controllers/ccController.cs
+++ b/BO/Controllers/ccController.cs
@@ -10,6 +10,7 @@ namespace NP.BO.Controllers
 {
     public class ccController : BOBaseController
     {
+        private int jkBoardNo = 13; // // ST :21, LIVE : 13
         public ActionResult bms(NP.Model.VMCC vm)
         {
             vm.BMs = InitM<BoardMaster>(); var ht = SetHash(vm);
@@ -89,11 +90,8 @@ namespace NP.BO.Controllers
             }
             vm.BMs = Dao.Get<BoardMaster>("board.bms", new System.Collections.Hashtable() { { "asno", vm.stringval }, { "bmposition", 0 }, { "isdefaults", string.IsNullOrEmpty(vm.stringval) ? "0,2" : "3" } });
             vm.BMOs = new List<BoardMasterOpening>() { };
-            if (!string.IsNullOrEmpty(vm.stringval2))
-            {
-                vm.BMOs = Dao.Get<BoardMasterOpening>("board.bmos", GetInt(vm.stringval2));
-            }
-            ht.Add("bmno", "13"); // ST :21, LIVE : 13
+            ht.Add("bmno", jkBoardNo.ToString()); // ST :21, LIVE : 13
+            vm.BMOs = Dao.Get<BoardMasterOpening>("board.bmos", 13);
             //ht.Add("opno", vm.stringval3);
             //ht.Add("scc", vm.stringval4);
             vm.Boards = Dao.Get<Board>("board.bs", ht);
@@ -131,7 +129,10 @@ namespace NP.BO.Controllers
             ht.Add("bmno", vm.stringval2);
             ht.Add("opno", vm.stringval3);
             ht.Add("scc", vm.stringval4);
+            ht.Add("bmposition", "0");
+
             vm.Boards = Dao.Get<Board>("board.bs", ht);
+
             vm.pagetotalcount = GetCount(vm.Boards.FirstOrDefault());
             if (vm.Boards.Count() > 0)
             {
@@ -183,16 +184,13 @@ namespace NP.BO.Controllers
                 {
                     vm.FileList = GetFiles(fgnos.Substring(1));
                 }
-                if (vm.Board.isuseopening == 1)
-                {
-                    vm.BMOs = Dao.Get<BoardMasterOpening>("board.bmos", vm.Board.bmno);
-                }
                 vm.BoardCMTs = Dao.Get<BoardCMT>("board.boardcmts", vm.Board.bno);
             }
             else
             {
                 vm.BMs = Dao.Get<BoardMaster>("board.bms", new System.Collections.Hashtable() { { "asno", vm.stringval }, { "bmposition", 0 }, { "isdefaults", "0,2,3" } });
             }
+            vm.BMOs = Dao.Get<BoardMasterOpening>("board.bmos", jkBoardNo);
             if (vm.Board.pbno != null)
             {
                 vm.BoardP = Dao.Get<Board>("board.get", vm.Board.pbno.Value).First();
@@ -202,6 +200,8 @@ namespace NP.BO.Controllers
                 }
             }
             vm.SCUserName = SUserInfo.UserName;
+            ViewBag.bmno = jkBoardNo;
+
             return View(vm);
         }
 
diff --git a/BO/Views/MM/popups.cshtml b/BO/Views/MM/popups.cshtml
index c43992c..1fd01d9 100644
--- a/BO/Views/MM/popups.cshtml
+++ b/BO/Views/MM/popups.cshtml
@@ -33,7 +33,7 @@
 </form>
 <div style="position: fixed; display: none; border-radius: 10px; background-color: #fff; text-align: center; padding: 5px 10px;" class="draggable ui-widget-content" id="popbox">
     <div id="popboxtop" style="height: 30px; line-height: 30px; cursor: pointer;">
-        <span id="poptitle" style="display: block; margin-right: 50px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"></span>
+        <span id="poptitle" style="display: block; margin-right: 50px; overflow: auto; white-space: nowrap; text-overflow: ellipsis;"></span>
         <a href="#" class="btn btn-xxs btn-default f-r" style="margin-top: -25px;" onclick="bglayer(false); $('#popbox').hide();">x</a>
     </div>
     <iframe id="ifr01" style="border: 0 none;"></iframe>
diff --git a/BO/Views/cc/homer2.cshtml b/BO/Views/cc/homer2.cshtml
index 95b0a16..367deea 100644
--- a/BO/Views/cc/homer2.cshtml
+++ b/BO/Views/cc/homer2.cshtml
@@ -36,7 +36,7 @@
                                         <option data-bmtype="@bm.bmtype" data-disptype="@bm.disptype" value="@bm.bmno">@bm.bmname@(bm.asname == null ? "" : string.Format(" ({0})", bm.asname)) (@bm.bmcode)</option>
                                     }
                                 </select>*@
-                                <input type="hidden" id="Board_bmno" name="Board.bmno" value="21">
+                                <input type="hidden" id="Board_bmno" name="Board.bmno" value="@(ViewBag.bmno)">
                             }
                             else
                             {
diff --git a/BO/Views/cc/homes.cshtml b/BO/Views/cc/homes.cshtml
index 7826490..642a40b 100644
--- a/BO/Views/cc/homes.cshtml
+++ b/BO/Views/cc/homes.cshtml
@@ -47,20 +47,24 @@
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
-@foreach (var item in Model.Boards)
-{
-                    <tr>
-                        <td>@item.rnorvt</td>
-                        <td>@item.bmname</td>
-                        <td>@item.asname</td>
-                        <td>@item.opname</td>
-                        <td class="link" style="@(item.pbno == null ? "":"padding-left: 30px;")"><a href="#" onclick="reg(@item.bno)">@Html.Raw(item.pbno == null ? "" : "<i class=\"fa fa-mail-forward\"></i>")@Html.Raw(item.istop == 1 ? "<i class=\"fa fa-bullhorn\"></i>" : "")@(item.subject)@(item.ccount > 0 ? string.Format("({0})", item.ccount.ToString("#,0")) : "")@Html.Raw(item.issecr == 1 ? "<i class=\"fa fa-lock\"></i>" : "")</a></td>
-                        <td>@item.cdtymd</td>
-                        <td>@(string.Format("{0}({1})",item.cnoname,item.cnoid))</td>
-                        <td>@item.rcount.ToString("#,0")</td>
-                    </tr>
-}
-                </tbody>
+                   
+                        @foreach (var item in Model.Boards)
+                        {
+                        
+                            <tr>
+                                <td>@item.rnorvt</td>
+                                <td>@item.bmname</td>
+                                <td>@item.asname</td>
+                                <td>@item.opname</td>
+                                <td class="link" style="@(item.pbno == null ? "" : "padding-left: 30px;")"><a href="#" onclick="reg(@item.bno)">@Html.Raw(item.pbno == null ? "" : "<i class=\"fa fa-mail-forward\"></i>")@Html.Raw(item.istop == 1 ? "<i class=\"fa fa-bullhorn\"></i>" : "")@(item.subject)@(item.ccount > 0 ? string.Format("({0})", item.ccount.ToString("#,0")) : "")@Html.Raw(item.issecr == 1 ? "<i class=\"fa fa-lock\"></i>" : "")</a></td>
+                                <td>@item.cdtymd</td>
+                                <td>@(string.Format("{0}({1})", item.cnoname, item.cnoid))</td>
+                                <td>@item.rcount.ToString("#,0")</td>
+                            </tr>
+                              
+                         }
+                    
+                    </tbody>
             </table>
         </div>
         @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
diff --git a/BO/Views/cc/roomr.cshtml b/BO/Views/cc/roomr.cshtml
index c4d8b78..f0124c7 100644
--- a/BO/Views/cc/roomr.cshtml
+++ b/BO/Views/cc/roomr.cshtml
@@ -71,10 +71,16 @@ else
                     <label class="col-sm-4 col-md-2 control-label req">제목</label>
                     <div class="col-sm-8 col-md-10">
                         @Html.TextBoxFor(m => m.Board.subject, new { @class = "form-control ff", @maxlength = "100" })<br />
+                        @if (Model.Board.bno == Model.Board.issecr)
+                        {
+                            <label><input type="checkbox" name="Board.issecr" value="1" @(Model.Board.issecr == 0 ? "checked" : "") /> 비밀글</label>
+                        }
+                        else { 
                         <label><input type="checkbox" name="Board.issecr" value="1" @(Model.Board.issecr == 1 ? "checked" : "") /> 비밀글</label>
+                        }
                         @if (Model.Board.pbno == null)
                         {
-                        <label><input type="checkbox" name="Board.istop" value="1" @(Model.Board.istop == 1 ? "checked" : "") /> 상단고정</label>
+                            <label><input type="checkbox" name="Board.istop" value="1" @(Model.Board.istop == 1 ? "checked" : "") /> 상단고정</label>
                         }
                     </div>
                 </div>
diff --git a/BO/Views/cc/rooms.cshtml b/BO/Views/cc/rooms.cshtml
index 27a0e6d..aaba210 100644
--- a/BO/Views/cc/rooms.cshtml
+++ b/BO/Views/cc/rooms.cshtml
@@ -66,7 +66,7 @@
                         <td>@item.bmname</td>
                         <td class="link" style="@(item.pbno == null ? "":"padding-left: 30px;")"><a href="#" onclick="reg(@item.bno)">@Html.Raw(item.pbno == null ? "" : "<i class=\"fa fa-mail-forward\"></i>")@Html.Raw(item.istop == 1 ? "<i class=\"fa fa-bullhorn\"></i>" : "")@(item.subject)@(item.ccount > 0 ? string.Format("({0})", item.ccount.ToString("#,0")) : "")@Html.Raw(item.issecr == 1 ? "<i class=\"fa fa-lock\"></i>" : "")</a></td>
                         <td>@item.cdtymd</td>
-                        <td>@item.cnoname</td>
+                        <td>@(string.Format("{0}({1})",item.cnoname,item.cnoid))</td>
                         <td>@item.tyear / @item.tseq</td>
                     </tr>
 }
diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml
index 29209e5..11d4992 100644
--- a/BO/Views/cm/cms.cshtml
+++ b/BO/Views/cm/cms.cshtml
@@ -468,7 +468,7 @@
                         }
                     }, 50);
                 }
-            } else if (capResult.code == 1) {
+            } else if (capResult.code == -1) {
                 msg("회차가 1개라도 생성되어 있어야 강좌를 생성하실 수 있습니다.");
                 $("#thisbox").hide();
             }
diff --git a/BO/Views/data/learns6.cshtml b/BO/Views/data/learns6.cshtml
index 640b620..904014a 100644
--- a/BO/Views/data/learns6.cshtml
+++ b/BO/Views/data/learns6.cshtml
@@ -30,7 +30,7 @@
     </section>
     <div class="tar buttonbox">
         @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-        <a href="#" onclick="javascript:exceldown('mform', '/data/learns', 'tbody1', 'CourseLearns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
+        <a href="#" onclick="javascript:exceldown2('mform', '/data/learns', 'tbody1', 'CourseLearns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
     </div>
     <section class="panel panel-default">
         <div class="table-responsive" id="excel1">
@@ -110,6 +110,7 @@
     @Html.HiddenFor(m => m.tabidx)
     @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <script>
     var terms = '@(string.Join(";", Model.Terms.Select(s=>string.Format("{0}:{1}:{2}", s.tmno, s.tyear, s.tseq))))';
     var _cgs = '@(string.Join(";", Model.CGs.Select(s=>string.Format("{0}:{1}:{2}", s.pcgno??0, s.cgno, s.cgname))))';
diff --git a/Base/Controller/ACommonCM.cs b/Base/Controller/ACommonCM.cs
index de85e09..508a2a6 100644
--- a/Base/Controller/ACommonCM.cs
+++ b/Base/Controller/ACommonCM.cs
@@ -697,7 +697,7 @@ namespace NP.Base.Controllers
             int uno = SUserInfo.UserNo;
             String uip = GetUserIP();
             //해당 강좌가 회차정보가 존재하는지 확인
-            if (nomaster && Dao.Get<CMInning>("cm.cminnings", new System.Collections.Hashtable() { { "cmno", cmno } }).Count < 1 )
+            if (nomaster && Dao.Get<CMInning>("cm.cminnings", new System.Collections.Hashtable() { { "cmno", cmno } }).Count < -1 )
             {
                 return JsonBack(new JsonRtn() { code = 1 });
             }
diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index 51e45cc..2e738dd 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -486,6 +486,7 @@ namespace NP.Base.Controllers
                 {
                     lectnos = string.Join(",", Lects1.Select(s => s.lectno));
                     var data1 = new Lect() { lectnos = lectnos, uno = SUserInfo.UserNo, uip = GetUserIP() };
+                    //return JsonOK(Dao.Save("grade.lectcomplete.abs", new Hashtable() { { "lectnos", lectnos }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }));
                     return JsonOK(Dao.Save("grade.lectcomplete.abs2", data1));
                 }
                 else
diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs
index c38ead8..22e1464 100644
--- a/Base/Controller/BasePartialController.cs
+++ b/Base/Controller/BasePartialController.cs
@@ -720,7 +720,7 @@ namespace NP.Base
                 {
                     if (Dao.Save("sys.file.del", new System.Collections.Hashtable() { { "fileno", fileNo }, { "uip", GetUserIP() }, { "uno", uno } }) > 0)
                     {
-                        //System.IO.File.Delete(Server.MapPath(NP.Model.Base.Files + file.fileurl));
+                        System.IO.File.Delete(Server.MapPath(NP.Model.Base.Files + file.fileurl));
                         return 1;
                     }
                     return 0;
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index fbf4c01..670983a 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -390,7 +390,7 @@
 		  ) t1
 		  left outer join (
 		  select date_format(l.cdt, '%Y') cyear
-		  ,replace(max(substring(l.completeno, -6)), ' 호','')  seqNo
+		  ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6))  seqNo
 		  from lect l
 		  group by date_format(l.cdt, '%Y')
 		  ) t2 on t2.cyear = t1.cyear
@@ -443,7 +443,7 @@
 		  ) t1
 		  left outer join (
 		  select date_format(l.cdt, '%Y') cyear
-		  ,replace(max(substring(l.completeno, -6)), ' 호','')  seqNo
+		 ,max(substring(replace(replace(l.completeno, ' - N105 - ','N'), '호',''), -6))  seqNo
 		  from lect l
 		  group by date_format(l.cdt, '%Y')
 		  ) t2 on t2.cyear = t1.cyear
diff --git a/Dao/MyBatis/Maps/board.xml b/Dao/MyBatis/Maps/board.xml
index a58d024..cb12fd7 100644
--- a/Dao/MyBatis/Maps/board.xml
+++ b/Dao/MyBatis/Maps/board.xml
@@ -151,6 +151,7 @@
                         <isNotNull property="isbase" prepend="and">b.pbno is null</isNotNull>
                         <isNotNull property="cno" prepend="and">b.cno=#cno#</isNotNull>
                         <isNotNull property="cmno" prepend="and">b.cmno=#cmno#</isNotNull>
+		            	<isNotNull property="bmposition" prepend="and">a.bmposition=#bmposition#</isNotNull>
                     left outer join board b2 on b.pbno is not null and b2.bno=b.pbno
                     inner join users c on c.userno=b.cno
                     <dynamic prepend="where">
diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs
index dc6ef14..5582a81 100644
--- a/FO/Controllers/CRoomController.cs
+++ b/FO/Controllers/CRoomController.cs
@@ -111,7 +111,7 @@ namespace NP.FO.Controllers
             ViewBag.croombmno = cvm.croombmno.ToString();
             if (SUserInfo.UserNo < 1) { return Redirect("/Account/Index"); }
             cvm.Board = Dao.Get<Board>("board.bs", new System.Collections.Hashtable() { { "bno", cvm.BNo }, { "getcontents", 1 } }).First();
-            if (cvm.Board.issecr == 1 && cvm.Board.cno != SUserInfo.UserNo) { return Redirect("/"); }
+            if (cvm.Board.issecr == 1 && !(cvm.Board.cno == SUserInfo.UserNo || cvm.Board.pcno == SUserInfo.UserNo)) { return Redirect("/"); }
             if (cvm.Board.cno != SUserInfo.UserNo)
             {
                 Dao.Save("board.bd.read", cvm.BNo);
diff --git a/FO/Views/CRoom/Boards.cshtml b/FO/Views/CRoom/Boards.cshtml
index 581f46c..1bd8a84 100644
--- a/FO/Views/CRoom/Boards.cshtml
+++ b/FO/Views/CRoom/Boards.cshtml
@@ -59,7 +59,7 @@ else
         {
             <tr class="@(b.istop == 1 ? "visit" : "") @(b.pbno == null ? "" : "reply")">
                 <th>
-                    <a href="#" onclick="gov(@b.bno, @b.cno, @b.issecr)">
+                    <a href="#" onclick="gov(@b.bno, @b.cno, @b.issecr,@b.pcno )">
                         <p>
                             <h5><span>@b.opname2</span> @b.subject <em>@b.rpcountname</em> @Html.Raw(b.issecr == 0 ? "" : "<img src=\"/img/customer/notice_ico.png\" alt=\"\" />")</h5>
                         <p>@Html.Raw(b.issecr == 1 && b.cno != ViewBag.SSUserNo ? "-" : System.Text.RegularExpressions.Regex.Replace(System.Text.RegularExpressions.Regex.Replace(b.contents, @"<[^>]*>", String.Empty), @"<.*?>", String.Empty))</p>
@@ -123,12 +123,12 @@ else
             $("#mform #pagenum").val(pno || @Model.pagenum);
             $("#mform").submit();
         }
-        function gov(bno, cno, issecr) {
+        function gov(bno, cno, issecr, pcno) {
             if (@ViewBag.SSUserNo < 1) {
-                gologin(null, location.pathname.replace(/#/gi, '') + location.search.replace(/#/gi,''));
+                gologin(null, location.pathname.replace(/#/gi, '') + location.search.replace(/#/gi, ''));
             }
-            else if (issecr == 1 && cno != @ViewBag.SSUserNo) {
-                msg("비밀글입니다.");
+            else if (issecr == 1 &&  !(cno == @ViewBag.SSUserNo || pcno == @ViewBag.SSUserNO)) {
+               msg("비밀글입니다.");
             } else {
                 setv("BNo", bno);
                 bglayer();
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 4518dc2..3a25f83 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -406,7 +406,8 @@
        var cnt = capResult.obj;
         if (cnt > 0) {
             // 강좌를 만들 수 있지만 이미 생성된 조건?
-           msg("이미 수강/수료한 과정입니다.");
+           @* msg("이미 수강/수료한 과정입니다.");*@
+            msg("<sapn style='font-size: 15pt;'>현재 신청 하여 수강 중인 과정 또는 이미 수료한 과정입니다.</span>");
            return;
         }
         else {
diff --git a/FO/Views/Home/Popup.cshtml b/FO/Views/Home/Popup.cshtml
index 9bef20c..047bbd0 100644
--- a/FO/Views/Home/Popup.cshtml
+++ b/FO/Views/Home/Popup.cshtml
@@ -30,7 +30,7 @@
     <link rel="stylesheet" type="text/css" href="/css/mainpopup.css">
     <script>function pf() { parent.hppopclick('@(Model.purl??"")'); }</script>
 </head>
-<body style="padding: 0; margin: 0;" onclick="javascript: pf();">
+<body style="padding: 0; margin: 0; overflow: auto !important; " onclick="javascript: pf();">
     @Html.Raw(Server.UrlDecode(Model.pcontents ?? ""))
 </body>
 </html>
\ No newline at end of file
diff --git a/FO/css/dev.css b/FO/css/dev.css
index 8c49b85..0c306cd 100644
--- a/FO/css/dev.css
+++ b/FO/css/dev.css
@@ -10,11 +10,12 @@
 /*.req:after{color: red;content:'*'}*/
 @media (max-width:1000px) {
     .popupitem{
-        top: 10% !important; left: 10% !important; max-width: 80% !important; max-height: 80% !important}
+        top: 10% !important; left: 10% !important; max-width: 80% !important; /*max-height: 80% !important*/}
         .popupitem .inner .iframebox{position:absolute;top:50px;right:10px;bottom: 50px;left: 10px;}
-        .popupitem .inner .iframebox iframe{width: 100% !important; height: 100% !important;}
+        .popupitem .inner .iframebox iframe{width: 100% !important; /*height: 100% !important;*/}
     .iframeclosebox{position: absolute; bottom: 10px; text-align: center; left: 10px; right: 10px;}
-}
+    #layermessage, #layermessage2 {overflow-y:auto; max-height:60%}
+    }
 
 #bglayer, #bglayer2, #findlayerbglayer {
     background-color: #000;