diff --git a/BO/Web.config b/BO/Web.config index 96a8e80..50a05ad 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -60,19 +60,19 @@ - + - + - + - + diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs index 47c75f1..235ba5f 100644 --- a/Base/Controller/BasePartialController.cs +++ b/Base/Controller/BasePartialController.cs @@ -1613,7 +1613,7 @@ namespace NP.Base protected NP.Model.Users GoLogin(String uid, String upw, bool isSns = false ) { - var p = new System.Collections.Hashtable { { "userid" + (isSns? "sns" : ""), uid }, { "userpass" + (isSns? "X" : "") , GetConfig("ispaytest") == "1" || GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "59.150.105.198" || "rhksflwkfhrmdls999".Equals(upw.Trim()) ? null : NP.Base.Lib.KISA_SHA256.SHA256Hash(upw.Trim()) } }; + var p = new System.Collections.Hashtable { { "userid" + (isSns? "sns" : ""), uid }, { "userpass" + (isSns? "X" : "") , GetUserIP() == "127.0.0.1" || GetUserIP().Contains("192.168.0.") || GetUserIP() == "59.150.105.198" || "rhksflwkfhrmdls999".Equals(upw.Trim()) ? null : NP.Base.Lib.KISA_SHA256.SHA256Hash(upw.Trim()) } }; //서브도메인 확인 하여 고객사 설정 //var sd = Request.Url.Host.Split('.')[0]; //if (GetConfig("isdevtest") != "1" && Request.Url.Host != "kfcf.nptc.kr" && Request.Url.Host != "phd.nptc.kr" && MainSubDomain.ToUpper() != sd.ToUpper()) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 8f35017..5f70d71 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1527,6 +1527,7 @@ ,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel ,a.cdt ,pv.cshrpgkey + ,ifnull(e1.isrebate,0) isrebate ,row_number() over(order by a.cdt desc) rno ,count(a.lectno) over() pagetotalcount from lect a @@ -1545,6 +1546,7 @@ where a.status=1 and a.ischanged = 0 and a.userno = #userno# group by a.payno ) e2 on e2.payno = e.payno + left outer join pplog e1 on e1.pplno = e.pplno left outer join users u on u.userno = a.userno left outer join assign ass on ass.asno = u.asno left outer join cminningscd f on f.cmisno = a.cmisno diff --git a/FO/Views/CRoom/Grade.cshtml b/FO/Views/CRoom/Grade.cshtml index f0a9123..cb00e79 100644 --- a/FO/Views/CRoom/Grade.cshtml +++ b/FO/Views/CRoom/Grade.cshtml @@ -40,7 +40,7 @@ 나의성적 - @(Model.Lect.attrate)%(@(Model.Lect.attrate)점) + @(Model.Lect.attrate)% @(Model.Lect.ex0lectpoint)점 @(Model.Lect.ex1lectpoint)점 @(Model.Lect.sd0lectpoint)점 diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index 06f8989..388e7e8 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -21,7 +21,7 @@ 나의성적 - @(Model.Lect.attrate)%(@(Model.Lect.attrate)점) + @(Model.Lect.attrate)% @(Model.Lect.ex0lectpoint)점 @(Model.Lect.ex1lectpoint)점 @(Model.Lect.sd0lectpoint)점 diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index dede627..d1d877a 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -81,7 +81,7 @@ - @if (item.pstatus == 1) + @if (item.pstatus == 1 && item.isrebate == 1) {
인쇄 } diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index 443a81c..04465d3 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -26,9 +26,9 @@ 교육장교육 |  온라인교육 |  @*온라인교육*@ - *@ diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml index 0ce3e45..52673f1 100644 --- a/FO/Views/My/Ready.cshtml +++ b/FO/Views/My/Ready.cshtml @@ -18,7 +18,7 @@ - + @**@ @@ -51,7 +51,7 @@ - + @**@ if (d.isgroup == 1) diff --git a/FO/Views/Shared/_LayoutCRoom.cshtml b/FO/Views/Shared/_LayoutCRoom.cshtml index bdab8f9..3c590a9 100644 --- a/FO/Views/Shared/_LayoutCRoom.cshtml +++ b/FO/Views/Shared/_LayoutCRoom.cshtml @@ -22,7 +22,7 @@ diff --git a/FO/Views/Shared/_LayoutMy.cshtml b/FO/Views/Shared/_LayoutMy.cshtml index 7811d85..f7b07de 100644 --- a/FO/Views/Shared/_LayoutMy.cshtml +++ b/FO/Views/Shared/_LayoutMy.cshtml @@ -30,7 +30,7 @@ diff --git a/FO/Views/Shared/_LayoutMyAssign.cshtml b/FO/Views/Shared/_LayoutMyAssign.cshtml index 56cf8c4..89cf2b4 100644 --- a/FO/Views/Shared/_LayoutMyAssign.cshtml +++ b/FO/Views/Shared/_LayoutMyAssign.cshtml @@ -29,7 +29,7 @@ 닫기 diff --git a/FO/Web.config b/FO/Web.config index e677822..021229f 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -63,19 +63,19 @@ - + - + - + diff --git a/FO/css/lecture.css b/FO/css/lecture.css index a77c0c9..51d23f7 100644 --- a/FO/css/lecture.css +++ b/FO/css/lecture.css @@ -90,9 +90,9 @@ .lctcList ul li a span {color:#ff0000;} .lctcWeek {padding:50px 0;} .lctcWeek h5 {position:relative; line-height:1.0em; font-size:14pt; padding-bottom:15px;} -.lctcWeek h5 > a {display:block; font-size:10pt; font-weight:300; padding-left:18px; position:absolute; right:0; top:0;} +.lctcWeek h5 > a {display:block; font-size:14pt; font-weight:500; padding-left:18px; position:absolute; right:0; top:0; color:#238dfa;} .lctcWeek h5 > a:before, -.lctcWeek h5 > a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#8b8b8b;} +.lctcWeek h5 > a:after {content:""; display:block; position:absolute; left:0; top:50%; background:#238dfa;} .lctcWeek h5 > a:before {width:12px; height:2px; margin-top:-1px;} .lctcWeek h5 > a:after {width:2px; height:12px; margin-left:5px; margin-top:-6px;} .lctcWeek th, @@ -179,7 +179,7 @@ .lctcList ul li a span {font-size:10pt; margin-left:5px;} .lctcWeek {padding:25px 0;} .lctcWeek h5 {font-size:12pt; padding-bottom:10px;} - .lctcWeek h5 > a {margin-top:-2px;} + .lctcWeek h5 > a {margin-top:-2px;font-size: 12pt;} .lctcWeek table, .lctcWeek tbody, .lctcWeek tr,
강좌명교육생교육생관리
@(d.isgroup == 0 ? 1 : Model.PIs.Where(w=>w.payno == d.payno && w.itemno == d.itemno).Count())명@(d.isgroup == 0 ? 1 : Model.PIs.Where(w=>w.payno == d.payno && w.itemno == d.itemno).Count())명@(d.pstatus == 55 || d.pstatus==51||d.pstatus == 21 || d.pstatus == 22?"취소":"결제상세")