<솔루션개선-개선>

1. 작업명 : 오류 수정 요청
2. 작업요청NO :
3. 이슈NO :
4. 작업내용
 - BO/Controllers/croomController.cs
 (1) 성적처리> 상세목록에서 검색 클릭시 목록 가져오기 설정

 - BO/Views/croom/payview.cshtml
 (1) 계산서확인 문구 p.taxtype 값에 따른 분기 처리

 - BO/Views/data/learns.cshtml
 (1) 공통으로 되어있는부분 제거(페이징)

 - BO/Views/data/learns4.cshtml
 - BO/Views/data/learns6.cshtml
 - BO/Views/data/learns7.cshtml
 (1) pager, pagerow 코드 추가

 - BO/Views/Shared/Partial/DForm.cshtml
 (1) name 잘못 표기된것 수정

 - Dao/MyBatis/Maps/Lect.xml
 (1) "lect.users"에서 countlect 부분에 정상회원만 출력되게 수정

 - Dao/MyBatis/Maps/System.xml
 (1) "cm.data.lect.raw" pagetotalcount에 over() 추가

 - FO/Views/CRoom/Innings.cshtml
 (1) 문구 수정

BO/Controllers/croomController.cs

@@ -500,6 +500,8 @@ namespace NP.BO.Controllers
         }
         public ActionResult grades(NP.Model.VMCM vm)
         {
+            vm.IsAdmin = SUserInfo.IsAdmin;
+     
             var ht = SetHash(vm, false);
             ht.Add("tyear", !string.IsNullOrEmpty(vm.stringval2) ? null : vm.stringval);
             ht.Add("tmno", vm.stringval2);
@@ -523,9 +525,6 @@ namespace NP.BO.Controllers
 
             ht.Add("cnamelike", vm.stringval5);
 
-           
-
-            vm.IsAdmin = SUserInfo.IsAdmin;
             if (SUserInfo.IsTeacher)
             {
                 ht.Add("profno", SUserInfo.UserNo);
@@ -533,6 +532,7 @@ namespace NP.BO.Controllers
             ht.Add("status", 1);
             vm.CMs = Dao.Get<CM>("lect.cms", ht);
             vm.pagetotalcount = GetCount(vm.CMs.FirstOrDefault());
+            
             vm.Terms = Dao.Get<Term>("cm.term.ys", new System.Collections.Hashtable() { });
             vm.IsProf = SUserInfo.IsTeacher;
             return View(vm);
@@ -559,7 +559,37 @@ namespace NP.BO.Controllers
                         {
                             vm.CMEV = new CMEV() { };
                         }
-                        vm.Lects = Dao.Get<Lect>("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval },{"iscomplete",vm.addstringval2 },{"cmisno",vm.addstringval3 },{ "ispasss", vm.addstringval4 },{"ispassa",vm.addstringval5 },{"ispassex",vm.addstringval6 },{"usernameid",vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
+
+                        bool searchCheck = false;
+                        string tempStr = Request == null ? "" : (Request.UrlReferrer == null ? "" : Request.UrlReferrer.ToString()) ;
+                        string[] tempArr = { "" };
+
+                        try
+                        {
+                            if (tempStr.IndexOf("/croom/") > -1)
+                            {
+                                tempArr = tempStr.Split('.');
+                                tempArr = tempArr[tempArr.Length - 1].Split('/');
+                                if (tempArr[tempArr.Length - 1] == "grade")
+                                {
+                                    searchCheck = true;
+                                }
+                            }
+                        }
+                        catch
+                        {
+                            searchCheck = false;
+                        }
+
+                        if (searchCheck)
+                        {
+                            vm.Lects = Dao.Get<Lect>("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
+                        }
+                        else
+                        {
+                            vm.Lects = new List<Lect>();
+                        }
+                        
                         vm.CMInnings = new List<CMInning>() { };
                         vm.CMinningscds = new List<CMinningscd>() { };
                         if(vm.CMEV.cshape ==2)

BO/Views/Shared/Partial/DForm.cshtml

@@ -19,13 +19,13 @@
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval11")" name="stringval11" value="@Model.stringval11" />
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval12")" name="stringval12" value="@Model.stringval12" />
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval13")" name="stringval13" value="@Model.stringval13" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval14")" name="stringval13" value="@Model.stringval14" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval14")" name="stringval14" value="@Model.stringval14" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval15")" name="stringval13" value="@Model.stringval15" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval15")" name="stringval15" value="@Model.stringval15" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval16")" name="stringval13" value="@Model.stringval16" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval16")" name="stringval16" value="@Model.stringval16" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval17")" name="stringval13" value="@Model.stringval17" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval17")" name="stringval17" value="@Model.stringval17" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval18")" name="stringval13" value="@Model.stringval18" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval18")" name="stringval18" value="@Model.stringval18" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval19")" name="stringval13" value="@Model.stringval19" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval19")" name="stringval19" value="@Model.stringval19" />
-<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval20")" name="stringval13" value="@Model.stringval20" />
+<input type="hidden" id="@((ispreform ? "dform_" : "") + "stringval20")" name="stringval20" value="@Model.stringval20" />
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "searchtype")" name="searchtype" value="@Model.searchtype" />
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "searchtext")" name="searchtext" value="@Model.searchtext" />
 <input type="hidden" id="@((ispreform ? "dform_" : "") + "pagenum")" name="pagenum" value="@Model.pagenum" />

BO/Views/croom/payview.cshtml

@@ -159,7 +159,14 @@
                     계산서확인
                 </th>
                 <td>
-                    <span>@p.ischeckname</span>
+                    @if (p.taxtype == 3)
+                    {
+                        <span>@p.ischeckname</span>
+                    }
+                    else
+                    {
+                        <span>-</span>
+                    }
                 </td>
             </tr>
             <tr>

BO/Views/data/learns.cshtml

@@ -11,11 +11,8 @@
         <li class="@(Model.tabidx == 4 ? "active" : "")"><a href="#" onclick="gotab(4);" data-toggle="tab">RawData</a></li>
     </ul>
 </div>
-<div>
+
-    @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-</div>
 @{Html.RenderPartial("learns" + Model.tabidx, Model);}
-@Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 <form id="tabmainform" action="/data/learns" method="post">
     @Html.HiddenFor(m => m.tabidx)
 </form>

BO/Views/data/learns4.cshtml

@@ -26,6 +26,7 @@
         </div>
     </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', 'RawLearns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
     </div>
     <section class="panel panel-default">
@@ -86,6 +87,8 @@
         </div>
     </section>
     @Html.HiddenFor(m => m.tabidx)
+
+    @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 </form>
 <script>
     var terms = '@(string.Join(";", Model.Terms.Select(s=>string.Format("{0}:{1}:{2}", s.tmno, s.tyear, s.tseq))))';

BO/Views/data/learns6.cshtml

@@ -3,6 +3,7 @@
 <form id="mform" method="post">
     <section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1">
         @Html.Partial("./Partial/SearchCaption")
+
         <div class="step-content">
             <div class="step-pane active form-inline">
                 <div class="form-group">
@@ -28,6 +29,7 @@
         </div>
     </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>
     </div>
     <section class="panel panel-default">
@@ -106,6 +108,7 @@
         </div>
     </section>
     @Html.HiddenFor(m => m.tabidx)
+    @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 </form>
 <script>
     var terms = '@(string.Join(";", Model.Terms.Select(s=>string.Format("{0}:{1}:{2}", s.tmno, s.tyear, s.tseq))))';

BO/Views/data/learns7.cshtml

@@ -3,6 +3,7 @@
 <form id="mform" method="post">
     <section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1">
         @Html.Partial("./Partial/SearchCaption")
+
         <div class="step-content">
             <div class="step-pane active form-inline">
                 <div class="form-group">
@@ -28,6 +29,7 @@
         </div>
     </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>
     </div>
     <section class="panel panel-default">
@@ -106,6 +108,7 @@
         </div>
     </section>
     @Html.HiddenFor(m => m.tabidx)
+    @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
 </form>
 <script>
     var terms = '@(string.Join(";", Model.Terms.Select(s=>string.Format("{0}:{1}:{2}", s.tmno, s.tyear, s.tseq))))';

Dao/MyBatis/Maps/Lect.xml

@@ -94,7 +94,7 @@
           from (
             select a.cmno,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept
             from (
-                  select b.cmno,count(d.lectno) countlect
+                  select b.cmno,count(u.userno) countlect
                   ,sum(case when ifnull(d.isready,0) = 1 and d.status = 3 then 1 else 0 end) countstandby
                   ,sum(case when d.iscomplete is null then 1 else 0 end) countnoresult
                   ,sum(d.iscomplete) countcomplete
@@ -116,9 +116,10 @@
                     </isNotNull>
                     <isNull property="islect">
                     inner join lect d on d.cmno=b.cmno <isNotNull property="status">and d.status=#status#</isNotNull> and (d.status &lt; 5 or d.status = 6) and d.ischanged=0
-                      inner join payitem pi on pi.pino=d.pino
+						left outer join users u on d.userno = u.userno and u.status = 1
-                      inner join pay p on p.payno=pi.payno
+						inner join payitem pi on pi.pino=d.pino
-                    </isNull>
+						inner join pay p on p.payno=pi.payno
+					</isNull>
                     <isNotNull property="profno">
                         inner join cmprof pr on pr.cmno=b.cmno and pr.userno=#profno#
                     </isNotNull>

Dao/MyBatis/Maps/System.xml

@@ -1009,7 +1009,7 @@
             select a.tyear,a.tseq,b3.cgno pcgno,b3.cgname pcgname,b2.cgno,b2.cgname,f.cname pcname,b.cname,b.classno,b.sstime,b.setime,b.infee,b.outfee,e.asname,e.isjoin,e2.cname asctgname,c.isrebate
                 ,d.username,d.userid,c.cdt,d2.cname ccpositionname,c.iscomplete
                 ,row_number() over(order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno) rno
-                ,count(c.lectno) pagetotalcount
+                ,count(c.lectno) over() pagetotalcount
             from term a
             inner join cm b on b.tmno=a.tmno
             inner join lect c on c.cmno=b.cmno and c.status=1

FO/Views/CRoom/Innings.cshtml

@@ -6,8 +6,8 @@
     <a href="#" onclick="showatt()">출결이력조회</a>
 </div>*@
 <div class="lctcScore" style="text-align:center; background:#ffdfdf;">
-    <span>현재 오늘 학습 가능한 10차시 중 <span style="color:red;">@(Model.intval2 - Model.intval)</span>차시가 학습가능 합니다.</span><br />
+    <span>현재 오늘 학습 가능한 10차시 중 <span style="color:red;">@(Model.intval2 - Model.intval)</span>회차 학습가능 합니다.</span><br />
-    <span>※ 관련 법령에 의해 일일 최대 학습시간은 학습중인 모든 과정에 대하여 10시간(10차시)입니다.</span>
+    <span>※ 관련 법령에 의해 일일 최대 학습시간은 학습중인 모든 과정에 대하여 10시간(10회차)입니다.</span>
 </div>
 @*<h3>오늘의 학습회차(@Model.intval/@Model.intval2)</h3>*@
 <br/>