From 5077f4711b755a8e8295cb93385a631ad7f9dfc6 Mon Sep 17 00:00:00 2001 From: ksjihd163 Date: Mon, 5 Sep 2022 06:41:57 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EA=B0=9C=EB=B0=9C=20PPT=20=EB=82=B4=EC=9A=A9?= =?UTF-8?q?=201-13=EB=B2=88=20=EC=A7=84=ED=96=89=20(pms=20:=206646)=202.?= =?UTF-8?q?=20smartsearch=20/=20=EC=99=80=20my/index=EC=97=90=20=EC=9E=88?= =?UTF-8?q?=EC=97=88=EB=8D=98=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0=20?= =?UTF-8?q?=EA=B3=BC=20=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0=EA=B3=BC=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=EC=88=98=EC=A0=95=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=A7=84=ED=96=89=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FO/Views/Course/SmartSearch.cshtml | 12 ++-------- FO/Views/My/Document.cshtml | 16 ++++++------- FO/Views/My/Index.cshtml | 5 +++- FO/Views/My/Lecture.cshtml | 2 +- FO/Views/My/Paies.cshtml | 37 +++++++++++++++--------------- FO/Views/My/Ready.cshtml | 6 +++-- FO/css/mypage.css | 2 +- 7 files changed, 39 insertions(+), 41 deletions(-) diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index ff1b532..73d1777 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -427,7 +427,7 @@ } // 교육장소 생성하기 - if (/*cshape != 2 &&*/ strStudyPlaceTag != '') { + if (cshape > 0 && strStudyPlaceTag != '') { divPlace.append(strStudyPlaceTag); divPlace.show(); } @@ -441,16 +441,8 @@ var ulScd = $("#ulScd" + cmno); ulScd.empty(); - - //var seq = 0; - //2022-08-31 cshape == 1 교육장교육일때 cshape == 2 온라인교육일때 - if (cshape == 1) { - var li = $("
  • "); - li.append(""); - ulScd.append(li); - } - else if (cshape == 2) { + if (capResult.obj.length < 1) { var li = $("
  • "); li.append(""); ulScd.append(li); diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index ce01d8d..bebd402 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -103,19 +103,19 @@ } else { - var isAllDays = (item.retime == null ? String.Empty : Convert.ToDateTime(item.retime).ToString("yyyy-MM-dd")) == "2099-12-31"; + @* var isAllDays = (item.retime == null ? String.Empty : Convert.ToDateTime(item.retime).ToString("yyyy-MM-dd")) == "2099-12-31"; if (isAllDays) - { + {*@ if (item.cshape == 1) {
    @item.lectStatus
    @*if (item.pstatus != 22) {*@ -
    교육기간 :@arrEduTerm[2]
    +
    교육기간 : @arrEduTerm[2]
    @*}*@ -
    교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))
    -
    + @*
    교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))
    +
    *@
    @item.studytime 시간과정
    @Html.Raw(item.isrebate == 1 ? "환급과정" : "비환급과정") @@ -126,7 +126,7 @@
    @item.lectStatus
    @* if (item.pstatus != 22) {*@ -
    교육기간 :@arrEduTerm[2]
    +
    교육기간 : @arrEduTerm[2]
    @*}*@
    교육종료일 : @(string.Format("{0}", item.estart.ToString("yyyy년 MM월 dd일")))
    @@ -136,7 +136,7 @@ @Html.Raw(item.isrebate == 1 ? "환급과정" : "비환급과정") } - } + @*}*@ } @@ -144,7 +144,7 @@ - @if (item.pstatus == 1 && item.isrebate == 1 && item.status == 1) + @if ((item.pstatus == 1 || item.pstatus == 22)&& item.isrebate == 1 && (item.status == 1 || item.status == 2)) {
    인쇄     } diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index 262e539..7b9c3b1 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -165,7 +165,7 @@ } @**@ - +
    @(d.intval3 == 0 ? "온라인교육" : d.intval3 == 1 ? "교육장교육" : "온라인교육") @if (d.studyplace == null) @@ -349,5 +349,8 @@ }, 500); } } + function gopaies1() { + msg("결제관리 메뉴로 이동합니다.", null, null, null, "location.href='" + '/My/Paies?intval=999' + "'"); + } } \ No newline at end of file diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index f21ba00..d7db506 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -96,7 +96,7 @@ } else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0) { - 입장 + 입장 } else { diff --git a/FO/Views/My/Paies.cshtml b/FO/Views/My/Paies.cshtml index f1d8a82..0c5be3e 100644 --- a/FO/Views/My/Paies.cshtml +++ b/FO/Views/My/Paies.cshtml @@ -51,25 +51,26 @@ - diff --git a/FO/Views/My/Ready.cshtml b/FO/Views/My/Ready.cshtml index f457184..af46a18 100644 --- a/FO/Views/My/Ready.cshtml +++ b/FO/Views/My/Ready.cshtml @@ -51,7 +51,7 @@
    - +
    @d.cshapename @@ -145,7 +145,9 @@ } @section scripts{