BO/Controllers/BOBaseController.cs

@@ -24,6 +24,12 @@ namespace NP.BO.Controllers
             ViewBag.issiteadmin = SUserInfo.IsSiteAdmin;
             ViewBag.ckmainlmenu = CookieGet("leftmenutoggle", "0");
             ViewBag.Menus = GetMENUS.Where(w => w.usertype == base.SUserInfo.UserType).ToList();
+
+            //로그인을 위해서 다 https로 돌림
+            if (!Request.IsSecureConnection)
+            {
+                filterContext.Result = new RedirectResult("https://" + Request.Url.Host + Request.Url.PathAndQuery);
+            }
         }
     }
 }

BO/Controllers/croomController.cs

@@ -862,8 +862,10 @@ namespace NP.BO.Controllers
             ht.Add("typeedu", vm.stringval6);
             ht.Add("typegrade", vm.stringval7);
             ht.Add("typejob", vm.stringval8);
-            ht.Add("ssdate", vm.stringval9 == null? "2019-12-01" : vm.stringval9);
-            ht.Add("sedate", vm.stringval10 == null ? "2020-12-01" : vm.stringval10);
+            vm.stringval9 = vm.stringval9 == null ? vm.stringval == null ?  "2019-01-01 00:00:00" : vm.stringval + "-01-01 00:00:00" : vm.stringval9;
+            vm.stringval10 = vm.stringval10 == null ? vm.stringval == null ? "2020-12-31 23:59:59" : vm.stringval + "-12-31 23:59:59" : vm.stringval10;
+            ht.Add("ssdate",  vm.stringval9);
+            ht.Add("sedate", vm.stringval10);
             switch (vm.stringval11)
             {
                 case "이름": ht.Add("word", "username"); break;

BO/Views/croom/documentspast.cshtml

@@ -198,12 +198,6 @@
 @section scripts{
     <script>
         $(document).ready(function () {
-            if ("@Model.stringval9" == null || "@Model.stringval9" == "" || "@Model.stringval9" == undefined) {
-                $("#stringval9").val("2019-12-01");
-            }
-            if ("@Model.stringval10" == null || "@Model.stringval10" == "" || "@Model.stringval10" == undefined) {
-                $("#stringval10").val("2020-12-01");
-            }
         });
     </script>
 }

BO/Views/data/learns.cshtml

@@ -3,8 +3,8 @@
     <ul class="pagination pagination-md" style="margin: 0;">
         <li class="@(Model.tabidx == 0 ? "active" : "")"><a href="#" onclick="gotab(0);" data-toggle="tab">과정별</a></li>
         <li class="@(Model.tabidx == 1 ? "active" : "")"><a href="#" onclick="gotab(1);" data-toggle="tab">강좌별</a></li>
-        <li class="@(Model.tabidx == 2 ? "active" : "")"><a href="#" onclick="gotab(2);" data-toggle="tab">계열별</a></li>
-        <li class="@(Model.tabidx == 3 ? "active" : "")"><a href="#" onclick="gotab(3);" data-toggle="tab">직급별</a></li>
+        @*<li class="@(Model.tabidx == 2 ? "active" : "")"><a href="#" onclick="gotab(2);" data-toggle="tab">계열별</a></li>*@
+        @*<li class="@(Model.tabidx == 3 ? "active" : "")"><a href="#" onclick="gotab(3);" data-toggle="tab">직급별</a></li>*@
         <li class="@(Model.tabidx == 4 ? "active" : "")"><a href="#" onclick="gotab(4);" data-toggle="tab">RawData</a></li>
     </ul>
 </div>

FO/Controllers/FOBaseController.cs

@@ -293,7 +293,6 @@ namespace NP.FO.Controllers
                 System.Text.StringBuilder sbmauth = new System.Text.StringBuilder("");
                 var tops = "";
                 var topsauth = "";
-                sbmauth.Append("<li><a class=\"mlink\" href=\"/My/Index\">Home</a></li>");
                 foreach (var m in GetMENUPAGES.Where(w => w.pdepth == 0 && w.isopen == 1))
                 {
                     var mp = m.pagetype == 0 ? GetMENUPAGES.Where(w => w.pagetype > 0 && (w.m0 == m.pno || w.m1 == m.pno || w.m2 == m.pno || w.m3 == m.pno || w.m4 == m.pno)).FirstOrDefault() ?? new Model.MenuPage() { } : m;

FO/FO.csproj

@@ -496,6 +496,33 @@
     <Content Include="img\player\player_nav_next.png" />
     <Content Include="img\player\player_nav_prev.png" />
     <Content Include="img\repute_tail.png" />
+    <Content Include="img\sub\build_tab_ico01.png" />
+    <Content Include="img\sub\build_tab_ico01_on.png" />
+    <Content Include="img\sub\build_tab_ico02.png" />
+    <Content Include="img\sub\build_tab_ico02_on.png" />
+    <Content Include="img\sub\build_tab_ico03.png" />
+    <Content Include="img\sub\build_tab_ico03_on.png" />
+    <Content Include="img\sub\build_tab_ico04.png" />
+    <Content Include="img\sub\build_tab_ico04_on.png" />
+    <Content Include="img\sub\build_tab_ico05.png" />
+    <Content Include="img\sub\build_tab_ico05_on.png" />
+    <Content Include="img\sub\etc_tab_ico01.png" />
+    <Content Include="img\sub\etc_tab_ico01_on.png" />
+    <Content Include="img\sub\graph_sample.jpg" />
+    <Content Include="img\sub\isu_ico01.png" />
+    <Content Include="img\sub\isu_ico02.png" />
+    <Content Include="img\sub\isu_ico03.png" />
+    <Content Include="img\sub\isu_ico04.png" />
+    <Content Include="img\sub\program_down.png" />
+    <Content Include="img\sub\program_ico01.png" />
+    <Content Include="img\sub\program_ico02.png" />
+    <Content Include="img\sub\yui_ico01.png" />
+    <Content Include="img\sub\yui_ico02.png" />
+    <Content Include="img\sub\yui_ico03.png" />
+    <Content Include="img\sub\yui_ico04.png" />
+    <Content Include="img\sub\yui_ico05.png" />
+    <Content Include="img\sub\yui_ico06.png" />
+    <Content Include="img\sub\yui_ico07.png" />
     <Content Include="js\bootstrap.js" />
     <Content Include="js\examcommon.js" />
     <Content Include="js\exam.js" />

FO/Views/Shared/_Layout.cshtml

@@ -48,9 +48,6 @@
         var _ismain = 1;
         $("li.topsubmenu@(ViewBag.MenuPage.m1)").addClass("current");
         $("li.topmenu@(ViewBag.MenuPage.m0)").addClass("current");
-        $(document).ready(function () {
-            $(".gnbMenu").find("a:contains('마이페이지')").css("color", "#0070C0");
-        });
     </script>
 </body>
 </html>