KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2020-12-08 01:18:12 +00:00
parent 0dbc8ab406
commit d2f6726931
19 changed files with 140 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BO/obj/Debug/BO.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
Base/obj/Debug/Base.csprojAssemblyReference.cache
View File

Binary file not shown.

2
Dao/MyBatis/Maps/Lect.xml
View File

@ -1363,7 +1363,7 @@
,c.tyear,c.tseq
,u.username,u.userid
,ass.asname
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey
,f.estart,f.eend
,cc.cname studyplacename
,pt.taxno,pt.taxdate

BIN
Dao/obj/Debug/Dao.csprojAssemblyReference.cache
View File

Binary file not shown.

5
FO/Controllers/FOBaseController.cs
View File

@ -316,10 +316,11 @@ namespace NP.FO.Controllers
}
sb2.Append("</ul></li>");
sb2auth.Append("</ul></li>");
sbmauth.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a>{0}</a><span></span><ul>", m.pagename, m.pno));
var menu = GetMENUPAGES.Where(w => w.pdepth == 1 && w.isopen == 1 && w.ppno == m.pno && w.pagetype != 4).FirstOrDefault();
sbmauth.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
if (m.usertype == 0)
{
sbm.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a>{0}</a><span></span><ul>", m.pagename, m.pno));
sbm.Append(string.Format("<li class=\"topmenu{1}" + (m.pno == 16 ? "style=\"display:none;\"" : string.Empty) + "\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl));
}
foreach (var m2 in GetMENUPAGES.Where(w => w.pdepth == 1 && w.isopen == 1 && w.ppno == m.pno && w.pagetype != 4))
{

5
FO/Controllers/MyController.cs
View File

@ -243,6 +243,9 @@ namespace NP.FO.Controllers
{
return Redirect("/My/Paies");
}
vm.Pay.mid = (("test".Equals(GetConfig("CST_PLATFORM").Trim())) ? "t" : "") + GetConfig("CST_MID");
String authdata = vm.Pay.mid + vm.Pay.pgkey + GetConfig("LGD_MERTKEY");
vm.PayItems = Dao.Get<PayItem>("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } });
vm.PayItem = Dao.Get<PayItem>("pay.mypayitem", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "payno", vm.payno } }).FirstOrDefault();
vm.intval3 = Dao.Get<PayRfd>("pay.mypayrfd", new System.Collections.Hashtable() { { "payno", vm.Pay.payno }/*,{ "rstatus", 0}*/, { "withoutrstatus" , "4" } }).Count();
@ -425,6 +428,8 @@ namespace NP.FO.Controllers
public ActionResult Document(VMMy vm)
{
ViewBag.reporturl = GetConfig("reporturl");
ViewBag.mid = (("test".Equals(GetConfig("CST_PLATFORM").Trim())) ? "t" : "") + GetConfig("CST_MID");
ViewBag.mertkey = GetConfig("LGD_MERTKEY");
if (vm.tabidx == 0)
{
vm.pagerowcount = vm.pagerowcount < 1 ? 10 : vm.pagerowcount;

10
FO/FO.csproj
View File

@ -347,6 +347,15 @@
<Content Include="img\common\paging_next.png" />
<Content Include="img\common\paging_prev.png" />
<Content Include="img\common\pop_close.png" />
<Content Include="img\common\professor_01.jpg" />
<Content Include="img\common\professor_02.jpg" />
<Content Include="img\common\professor_03.jpg" />
<Content Include="img\common\professor_04.jpg" />
<Content Include="img\common\professor_05.jpg" />
<Content Include="img\common\professor_06.jpg" />
<Content Include="img\common\professor_07.jpg" />
<Content Include="img\common\professor_08.jpg" />
<Content Include="img\common\professor_09.jpg" />
<Content Include="img\common\refund_ico01.png" />
<Content Include="img\common\refund_ico02.png" />
<Content Include="img\common\select_arrow.png" />
@ -456,6 +465,7 @@
<Content Include="img\mypage\notice_close.png" />
<Content Include="img\mypage\popup_profile_sample.jpg" />
<Content Include="img\mypage\popup_sign.jpg" />
<Content Include="img\mypage\print.png" />
<Content Include="img\mypage\privacy_img.jpg" />
<Content Include="img\mypage\title_arrow.png" />
<Content Include="img\mypage\title_arrow_on.png" />

6
FO/Views/Account/Join.cshtml
View File

@ -221,7 +221,7 @@ else
}
function onGoogleLogIn(googleUser) {
if (@Request["jointype"] == "1") {
if ("@(Request["jointype"])" == "1") {
var profile = googleUser.getBasicProfile();
$("#username").val(profile.getName());
$("#email").val(profile.getEmail());
@ -235,7 +235,7 @@ else
}
function snsLogin() {
if (@Request["jointype"] == "2") {
if ("@(Request["jointype"])" == "2") {
var naverLogin = new naver.LoginWithNaverId(
{
clientId: "@naverClientId",
@ -277,7 +277,7 @@ else
}
});
}
if (@Request["jointype"] == "3") {
if ("@(Request["jointype"])" == "3") {
$.when(
Kakao.init("@kakaoClientId"),
).done(function () {

2
FO/Views/CDMS/Contents.cshtml
View File

@ -41,7 +41,7 @@
//{
<video id="video1" controls preload="auto" oncontextmenu="return false" controlslist="nodownload" webkit-playsinline style="display:none"></video>
//}
<iframe id="ifr1" class="staticframe" style="@(Model.ismobile == 1 ? "" : "width: 100%; height: 650px;")"></iframe>
<iframe id="ifr1" class="staticframe" style="@(Model.ismobile == 1 ? "" : "width: 100%; height: 820px;")"></iframe>
}
else if (Model.CMInning.ctype == 2)
{

8
FO/Views/Course/SmartSearch.cshtml
View File

@ -7,8 +7,8 @@
@if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "")
{
<ul class="schTab">
<li id="liTab1" class="current"><a href="#">법정교육</a></li>
<li id="liTab2"><a href="#">기타교육</a></li>
<li id="liTab1" class="current" style="font-size:16pt;"><a href="#">건설기술진흥법교육</a></li>
<li id="liTab2" style="font-size:16pt;"><a href="#">기타교육</a></li>
</ul>
<ul class="schCont">
<li>
@ -39,8 +39,8 @@
else if (Model.stringval == "1")
{
<ul class="schTab">
<li id="liTab1"><a href="#">법정교육</a></li>
<li id="liTab2" class="current"><a href="#">기타교육</a></li>
<li id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li id="liTab2" class="current" style="font-size:16pt;"><a href="#">기타교육</a></li>
</ul>
<ul class="schCont">
<li>

8
FO/Views/Home/Index.cshtml
View File

@ -72,8 +72,8 @@
@if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "")
{
<ul class="mainTab">
<li class="current" id="liTab1"><a href="#">법정교육</a></li>
<li id="liTab2"><a href="#">기타교육</a></li>
<li class="current" id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li id="liTab2"><a href="#" style="font-size:16pt;">기타교육</a></li>
</ul>
<ul class="mainSch">
@ -162,8 +162,8 @@
else if (Model.stringval == "1")
{
<ul class="mainTab">
<li id="liTab1"><a href="#">법정교육</a></li>
<li class="current" id="liTab2"><a href="#">기타교육</a></li>
<li id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li class="current" id="liTab2"><a href="#" style="font-size:16pt;">기타교육</a></li>
</ul>
<ul class="mainSch">
<li class="msCont">

43
FO/Views/My/Document.cshtml
View File

@ -1,9 +1,17 @@
@model NP.Model.VMMy
<style>
.lctQr {}
.lctQr > span {color: black;cursor: pointer;}
.lctQr span.current {color: blue;}
.lctQr {
}
.lctQr > span {
color: black;
cursor: pointer;
}
.lctQr span.current {
color: blue;
}
</style>
<div class="mpgInfo">
<ul>
@ -55,7 +63,7 @@
<td class="ltaBtn" data-th="위탁계약서 : ">
@if (item.pstatus == 1)
{
<a href="#" onclick="javascript: educontract(@(item.lectno));">[인쇄]</a>
<a href="#" onclick="javascript: educontract(@(item.lectno));"><img src="~/img/mypage/print.png"><br />인쇄</a>
}
else
{
@ -63,12 +71,12 @@
}
</td>
<td class="ltaBtn" data-th="입교통지서 : ">
<a href="#" onclick="javascript: eduannotation(@(item.lectno));">[인쇄]</a>
<a href="#" onclick="javascript: eduannotation(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
</td>
<td class="ltaBtn" data-th="수료증 : ">
@if (item.iscomplete == 1)
{
<a href="#" onclick="javascript: certification(@(item.lectno));">[인쇄]</a>
<a href="#" onclick="javascript: certification(@(item.lectno));"><img src="~/img/mypage/print.png"><br />[인쇄]</a>
}
else
{
@ -76,21 +84,23 @@
}
</td>
<td class="ltaBtn" data-th="계산서/영수증 : ">
@if(item.pstatus == 1)
@if (item.pstatus == 1)
{
if (item.ptype == 6)
{
@Html.Raw("-")
}else if(item.ptype == 1 && item.ispg == 1)
}
else if (item.ptype == 1 && item.ispg == 1)
{
<a href="#">[카드사 매출전표]</a>
}else if(item.ptype == 3 && item.ispg == 1)
}
else if (item.ptype == 3 && item.ispg == 1)
{
<a href="#">[서마터빌]</a>
}
else
{
if(item.taxno > 0)
if (item.taxno > 0)
{
<a href="#">[@(item.taxdate == null ? "신청중" : "발행")]</a>
}
@ -130,5 +140,18 @@
msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요.");
}
}
function viewtax(pgkey) {
showReceiptByTID('@(ViewBag.mid)', pgkey, @(ViewBag.mid)+pakey+@(ViewBag.mertkey));
}
</script>
@if (ViewBag.isPayTest == "1")
{
//테스트일 경우
<script language="JavaScript" src="https://pgweb.tosspayments.com:7085/WEB_SERVER/js/receipt_link.js"></script>
}
else
{
//서비스일 경우
<script language="JavaScript" src="https://pgweb.tosspayments.com/WEB_SERVER/js/receipt_link.js"></script>
}
}

10
FO/Views/My/MyAssInfo.cshtml
View File

@ -55,11 +55,11 @@
<li>
<select name="mphone1" id="mphone1">
<option value=""></option>
<option value="010" @(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Substring(0, 3) == "010" ? "selected" : "")>010</option>
<option value="011" @(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Substring(0, 3) == "011" ? "selected" : "")>011</option>
<option value="016" @(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Substring(0, 3) == "016" ? "selected" : "")>016</option>
<option value="017" @(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Substring(0, 3) == "017" ? "selected" : "")>017</option>
<option value="019" @(string.IsNullOrEmpty(a.mphone) || !(a.mphone ?? "").Contains("-") ? "" : (a.mphone ?? "").Substring(0, 3) == "019" ? "selected" : "")>019</option>
<option value="010" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "010" ? "selected" : "")>010</option>
<option value="011" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "011" ? "selected" : "")>011</option>
<option value="016" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "016" ? "selected" : "")>016</option>
<option value="017" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "017" ? "selected" : "")>017</option>
<option value="019" @(string.IsNullOrEmpty(a.mphone.Replace("-","")) ? "" : (a.mphone ?? "").Substring(0, 3) == "019" ? "selected" : "")>019</option>
</select>
</li>
<li>-</li>

2
FO/Views/My/MyInfoCheck.cshtml
View File

@ -75,7 +75,7 @@
<td>
@if (!string.IsNullOrEmpty(u.birthday))
{
<p>u.birthday.Replace("-", ".")</p>
<p>@(u.birthday.Replace("-", "."))</p>
}
</td>
</tr>

25
FO/Views/My/PayInfo.cshtml
View File

@ -4,7 +4,7 @@
}
<style>
.bskTitle {
margin-top : 50px !important;
margin-top: 50px !important;
}
</style>
<h4 class="bskTitle">주문상품 정보</h4>
@ -96,7 +96,7 @@
</table>
}
<ul class="bskBtn col1">
<ul class="bskBtn col1">
<li><a href="/My/Paies" class="bk">결제현황 이동</a></li>
@if (Model.Pay.ispg != 1 && Model.Pay.rstatus == 0 && Model.Pay.pstatus == 1 && Model.Pay.ptype != 1 && Model.Pay.ptype != 6)
{
@ -129,7 +129,7 @@
{
<li><a href="#" onclick="cancelpay()" class="bk">결제취소</a></li>
}
</ul>
</ul>
<div class="mpgPop mpgPopFull" style="display:none;" id="pop1">
<div>
@ -423,7 +423,7 @@
<td>
<input type="hidden" name="isownerR" id="isownerR" />
<ul class="bakRadio">
<li><input type="radio" name="isownersR" id="isowner1R" value="1" checked/><label for="isowner1">예</label></li>
<li><input type="radio" name="isownersR" id="isowner1R" value="1" checked /><label for="isowner1">예</label></li>
<li><input type="radio" name="isownersR" id="isowner0R" value="0" /><label for="isowner0">아니오</label></li>
</ul>
</td>
@ -481,7 +481,7 @@
@Html.Partial("./Partial/filescript")
}
@section scripts{
<script>
<script>
$(document).ready(function () {
});
@ -494,7 +494,8 @@
}
}
function viewtax() {
window.open("https://iniweb.inicis.com/DefaultWebApp/mall/cr/cm/mCmReceipt_head.jsp?noTid=@(Model.Pay.pgkey)&noMethod=1", "pgreceipt", "width=500, height=600, scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
@*window.open("https://iniweb.inicis.com/DefaultWebApp/mall/cr/cm/mCmReceipt_head.jsp?noTid=@(Model.Pay.pgkey)&noMethod=1", "pgreceipt", "width=500, height=600, scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");*@
showReceiptByTID('@(Model.Pay.mid)', '@(Model.Pay.pgkey)', '@(Model.Pay.authdata)');
}
function calltax() {
if ('@(Model.Pay.rstatus < 2 && Model.Pay.pstatus == 1 || Model.Pay.pstatus == 22?1:0)' == '1') {
@ -679,5 +680,15 @@
gogo2();
});
}
</script>
</script>
@if (ViewBag.isPayTest == "1")
{
//테스트일 경우
<script language="JavaScript" src="https://pgweb.tosspayments.com:7085/WEB_SERVER/js/receipt_link.js"></script>
}
else
{
//서비스일 경우
<script language="JavaScript" src="https://pgweb.tosspayments.com/WEB_SERVER/js/receipt_link.js"></script>
}
}

1
FO/Views/Shared/Partial/Foot.cshtml
View File

@ -14,6 +14,7 @@
<li><a href="#" onclick="gomenu(@(mainlocation.pno), @(mainlocation.pagetype), '@(mainlocation.pageurl??"")', this);">찾아오시는 길</a></li>*@
<li><a href="#" onclick="viewlayer(@(mainprivate.pno), this, '개인정보처리방침');" style="color:#2c5ac7;">개인정보처리방침</a></li>
<li><a href="#" onclick="viewlayer(@(mainagree.pno), this, '이용약관');">이용약관</a></li>
<li><a href="#" onclick="gomenu(@(mainintroduce.pno),@(mainintroduce.pagetype), '', this);">교육원소개</a></li>
</ul>
</div>
<div class="ftAddr">

3
FO/Views/Shared/_Layout.cshtml
View File

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

7
FO/css/style.css
View File

@ -2371,8 +2371,10 @@ span.org {color: #ff5a00;}
.tchCont {margin-top: 30px;}
.tchCont h4 {height: 60px; line-height: 58px; text-align: center; border: solid 1px #d6d6d6; font-size: 16pt; font-weight: 500;}
.tchCont h4 span {font-weight: 300; font-size: 13pt;}
.tchCont > img {width: 27%; display: inline-block; margin:30px 1%; vertical-align:top;}
.tchCont > ul {width: 70%; display: inline-block;}
.tchCont > ul:after {content: ''; display: table; clear: both;}
.tchCont > ul > li {margin-top: 30px; float: left; width: 50%; position: relative; padding-left: 170px;}
.tchCont > ul > li {margin-top: 30px; position: relative; padding-left: 170px;}
.tchCont > ul > li > h5 {width: 150px; height: 50px; line-height: 50px; text-align: center; background: #f9f9f9; font-size: 12pt; font-weight: 500; position: absolute; left: 0; top: 0;}
.tchCont > ul > li > ul {min-height: 50px;}
.tchCont > ul > li > ul > li {position: relative; padding-left: 8px; font-size: 11pt; color: #666; margin-bottom: 5px;}
@ -2539,7 +2541,8 @@ span.org {color: #ff5a00;}
.inRulCnt {display: block; height: auto;}
.inRulCnt > div {display: block; padding: 10px;}
.tchCont > img {margin-top: 15px; width:37%;}
.tchCont > ul {width: 60%;}
}

1
Model/CM.cs
View File

@ -1102,6 +1102,7 @@ namespace NP.Model
return (estart != null && estart > Convert.ToDateTime("1900-01-01")) ? estart.ToShortDateString() : "";
}
}
public String pgkey { get; set; }
}
/// <summary>
/// 자격검정시험