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

<기능개선> 

1. PMS NO : pms6712, pms6746
2. (주요)작업내용 
(1) FO/Views/My/Lecture.cshtml
 - 교육종료일이 지난 과정 클릭시 알림창 적용이 안되는 오류 수정
(2) FO/Views/My/LectureOn.cshtml
 - 변경팝업에서 교육종료일 과거 건은 출력 안하도록 설정
This commit is contained in:
jity7777 2022-09-23 07:43:41 +00:00
parent fe0ac07bcb
commit 853aad30a4
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@
} }
else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0) else if (Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).Count() > 0)
{ {
<a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno" data-cshape=@d.cshape class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:55px; height:42px; line-height:2; font-size:20px;">입장</a> <a href="/CRoom/Index?croomlectno=@(Model.Lects.Where(w => w.payno == d.payno && w.userno == ViewBag.SSUserNo).First().lectno)&cmno=@d.cmno" data-cshape=@d.cshape @strComplete class="gocroom" style="border: solid 1px #238dfa; color: #238dfa; width:55px; height:42px; line-height:2; font-size:20px;">입장</a>
} }
else else
{ {

37
FO/Views/My/LectureOn.cshtml
View File

@ -152,11 +152,8 @@
var ulScd = $("#ulScd" + cmno); var ulScd = $("#ulScd" + cmno);
ulScd.empty(); ulScd.empty();
//var seq = 0; //var seq = 0;
if (capResult.obj.length < 1) { let displayCnt = 0;
var li = $("<li />"); let noDisPlay = true;
li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
ulScd.append(li);
}
$.each(capResult.obj, function (i, d) { $.each(capResult.obj, function (i, d) {
var li = $("<li />"); var li = $("<li />");
@ -171,10 +168,12 @@
strStudyPlacename = '[' + d.studyplacename + '교육장]'; strStudyPlacename = '[' + d.studyplacename + '교육장]';
} }
if (d.isEnd == true) { //if (d.isEnd == true) {
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>"); // pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
} //}
else { if (d.isEnd == false)
{
++displayCnt;
if (d.quota != 0) { if (d.quota != 0) {
if (d.remainPeople <= 0) { if (d.remainPeople <= 0) {
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>"); pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
@ -203,9 +202,27 @@
} }
} }
li.append(pData); //if (capResult.obj.length < 1) {
// var li = $("<li />");
// li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
// ulScd.append(li);
//}
// 아래 코딩으로 대체
if (displayCnt == 0 && noDisPlay) {
var li = $("<li />");
li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
ulScd.append(li);
noDisPlay = false;
}
li.append(pData);
ulScd.append(li); ulScd.append(li);
}); });
} }
function renderScd() { function renderScd() {