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 @@