pms:5765 건 작업완료 커밋

FO/Controllers/CourseController.cs

@@ -907,6 +907,7 @@ namespace NP.FO.Controllers
             ViewBag.IsMain = true;
             Base.Controllers.FOCommonController fOCommonController = new Base.Controllers.FOCommonController();
             fOCommonController.Dao = new Dao.CommonDao();
+
             ViewBag.rslt = fOCommonController.CheckUserLect(vm.stringval3, vm.stringval21, vm.stringval4, vm.stringval5, int.Parse(vm.stringval17), int.Parse(vm.stringval18), SUserInfo.UserNo);
 
             //vm.ComCodes = GetComCodes("studyplace");
@@ -923,6 +924,7 @@ namespace NP.FO.Controllers
             vm.CMInningscds= Dao.Get<CMinningscd>("cm.cminningscds.applyedu" , hsData);
             vm.SelectCMInningscd = vm.CMInningscds.Where(c => c.cmisno == long.Parse(vm.stringval20) && c.cmino == long.Parse(vm.stringval19)).First();
             vm.intval = Dao.Get<int>("lect.count.user4", new Hashtable { { "userno", SUserInfo.UserNo }, { "pcmno", long.Parse(vm.stringval18) } }).FirstOrDefault();
+            vm.intval2 = Dao.Get<int>("cm.lectcheckuser", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cmno", vm.stringval17 } }).First();
 
             /*
              * 

FO/Views/CRoom/Estimation.cshtml

@@ -16,7 +16,7 @@
     <table>
         <tbody>
 @{ 
-    List<long> allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683".Split(','), long.Parse).ToList();
+    List<long> allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683,104419".Split(','), long.Parse).ToList();
 
     }
     @foreach (var d in Model.Datas.Where(w=>w.dtype > -1))

FO/Views/Course/SmartSearchResult.cshtml

@@ -46,7 +46,7 @@
         </ul>
     </form>
     @{
-        bool lectAbleChk = (ViewBag.rslt == 0 && Model.intval == 0)  ? true : false;
+        bool lectAbleChk = (ViewBag.rslt == 0 && Model.intval == 0 && Model.intval2 == 0)  ? true : false;
     }
     <div id="history" method="post">
         @if (!lectAbleChk)
@@ -92,7 +92,11 @@
             string edu = Model.ComCodes3.Where(c => c.value == Model.stringval4).First().cname;
             string grade = Model.ComCodes4.Where(c => c.value == Model.stringval5).First().cname;
             string typejob = Model.ComCodes5.Where(c => c.value == Model.stringval6).First().cname;
-            string typejobItem = Model.ComCodes6.Where(c => c.value == Model.stringval7).First().cname;
+            string typejobItem = "";
+            if(!string.IsNullOrWhiteSpace(Model.stringval7))
+            {
+                typejobItem = Model.ComCodes6.Where(c => c.value == Model.stringval7).First().cname;
+            }
         }
 
         <table class="subTable">
@@ -121,10 +125,13 @@
                     <th>직무분야</th>
                     <td>@typejob</td>
                 </tr>
-                <tr>
+                @if (!string.IsNullOrWhiteSpace(Model.stringval7))
-                    <th>전문분야</th>
+                {
-                    <td>@typejobItem</td>
+                    <tr>
-                </tr>
+                        <th>전문분야</th>
+                        <td>@typejobItem</td>
+                    </tr>
+                }
                 <tr>
                     <th>과정명</th>
                     <td>

FO/Web.config

@@ -40,9 +40,9 @@
     <add key="ssonoauth" value="Y" />
     <add key="daokey" value="ynictelms2020" />
     
-    <!--<add key="configpath" value="Product" />-->
+    <add key="configpath" value="Product" />
     <!--<add key="configpath" value="ProductDev" />-->
-    <add key="configpath" value="Staging" />
+    <!--<add key="configpath" value="Staging" />-->
     <add key="isstaging" value="1" />
     
     <add key="thumbnailexe" value="D:\\dev_tool\\ffmpeg.exe" />