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

<기능개선> 

통합테스트목록 . 616~622
출력사항 변경
This commit is contained in:
kdh0120 2021-12-07 02:24:41 +00:00
parent 9efebaffdb
commit fc60e38139
7 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FO/Views/CRoom/Index.cshtml
View File

@ -142,7 +142,8 @@
{
<dl>
<dt>@(d.edate < DateTime.Now ? "학습기간종료" : d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) :d.cshape != 1 ? d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd") : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@*<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) :d.cshape != 1 ? d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd") : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>*@
<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) :(d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@if(d.cshape != 1 && d.isonline == 1)
{
<dd><span>복습기간</span> : @(d.edate.AddYears(1).ToString("yy-MM-dd"))</dd>

3
FO/Views/CRoom/Innings.cshtml
View File

@ -29,7 +29,8 @@
{
<dl>
<dt>@(d.edate < DateTime.Now ? "학습기간종료" : d.isonline == 0 && d.istatus == 2 ? "출석완료" : d.isonline == 0 && d.idate < DateTime.Now ? "결석" : d.isonline == 0 ? "출석전" : d.stime == null ? "학습전(0%)" : d.istatus == 2 ? "학습완료" : string.Format("학습중({0}%)", d.sttime > 0 ? (d.totstudy * 100 / (d.sttime * 60)) : 0))</dt>
<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : d.cshape != 1 ? (d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@*<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : d.cshape != 1 ? (d.cdt.ToString("MM/dd")+" ~ "+d.estart.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>*@
<dt style="color:#888888"><span style="color:red;">@(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간")</span> : @(d.isonline == 0 ? (d.cshape != 2 ? string.Format("{0} {1}:{2}", d.idate.ToString("MM/dd"), d.ist.Substring(0, 2), d.ist.Substring(2, 2)) : d.eend.ToString("MM/dd")) : (d.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))</dt>
@if(d.cshape != 1 && d.isonline == 1)
{
<dd><span>복습기간</span> : @(d.edate.AddYears(1).ToString("yy-MM-dd"))</dd>

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

@ -62,20 +62,10 @@
<dl class="ltaDl">
@if (item.status == 1)
{
if (item.cshape == 1)
<dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
{
<dd>교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))</dd>
}
else
{
<dd>
교육기간 : @item.paycdt.ToString("yy-MM-dd") ~ @(item.estart.ToString("yy-MM-dd"))
@if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
{
@:| 집체교육일자 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
}
</dd>
@:| 집체교육일자 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
}
<dd>결제금액 : @(item.payamt)원</dd>
}

3
FO/Views/My/Index.cshtml
View File

@ -65,7 +65,8 @@
</h5>
<dl>
<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<dt style="color:#888888">교육기간 : @(d.intval3 == 1 ? d.time.ToString("yy-MM-dd") : d.time5.ToString("yy-MM-dd")) ~ @(d.intval3 == 1 ? d.time2.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))</dt>
@*<dt style="color:#888888">교육기간 : @(d.intval3 == 1 ? d.time.ToString("yy-MM-dd") : d.time5.ToString("yy-MM-dd")) ~ @(d.intval3 == 1 ? d.time2.ToString("yy-MM-dd") : d.time3.ToString("yy-MM-dd"))</dt>*@
<dt style="color:#888888">교육기간 : @(d.time.ToString("yy-MM-dd")) ~ @(d.time2.ToString("yy-MM-dd"))</dt>
<dd>복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))</dd>
@if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
{

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

@ -57,7 +57,8 @@
<dl class="ltaDl">
<dt class="@(d.edate > DateTime.Now ? "ltaDlblue" : d.edate.Value.AddYears(1) > DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")</dt>
<dt style="color:#888888">
교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))
@*교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))*@
교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))
</dt>
@if(d.cshape != 1)
{

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

@ -30,7 +30,8 @@
<dl class="ltaDl">
<dt class="@(d.edate > DateTime.Now ? "ltaDlblue" : d.edate.Value.AddYears(1) > DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")</dt>
<dt style="color:#888888">
교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))
@*교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))*@
교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yy-MM-dd"), d.edate.Value.ToString("yy-MM-dd")))
</dt>
@if(d.cshape != 1)
{

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

@ -22,7 +22,8 @@
@if (Model.PayItem.sdate != null && Model.PayItem.edate != null)
{
<dl>
<dd>교육기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.sdate : Model.PayItem.cdt).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.edate : Model.PayItem.estart).ToShortDateString())</span></dd>
@*<dd>교육기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.sdate : Model.PayItem.cdt).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.cshape == 1 ? Model.PayItem.edate : Model.PayItem.estart).ToShortDateString())</span></dd>*@
<dd>교육기간 : <span class="red">@(Convert.ToDateTime(Model.PayItem.sdate).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.edate).ToShortDateString())</span></dd>
</dl>
}
else