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

This commit is contained in:
hyunho 2020-12-14 01:23:38 +00:00
parent 0751ad6237
commit fdda9dbbff
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,13 +263,13 @@
} }
if (d.cshape == 0) { if (d.cshape == 0) {
p.html("<label>" + d.tseq + "기 <span class='gry'>" + d.rsrename + " (" + d.rsretimeToDay+"일) </span> " + d.cname + "<span class='red'> | " + d.infee + "원</span></label>"); p.html("<label>" + d.tseq + "기 <span class='gry'>" + d.ssrename + "</span><span class='red'> (" + d.ssretimeToDay +"일) | " + d.infee + "원</span></label>");
} }
else if (d.cshape == 1) { else if (d.cshape == 1) {
p.html("<label>" + d.tseq + "기 <span class='blu'>[" + d.studyplacename + "교육장] </span><span class='gry'>" + d.rsrename + " (" + d.rsretimeToDay +"일) </span> " + d.cname + "<span class='red'> | "+d.infee+"원</span></label>"); p.html("<label>" + d.tseq + "기 <span class='blu'>[" + d.studyplacename + "교육장] </span><span class='gry'>" + d.rsrename + "</span><span class='red'> (" + d.rsretimeToDay +"일) | "+d.infee+"원</span></label>");
} }
else if (d.cshape == 2) { else if (d.cshape == 2) {
p.html("<label>" + d.tseq + "기 <span class='gry'>" + d.rsrename + " (" + d.rsretimeToDay +"일) </span> " + d.cname + "<span class='red'> | " + d.infee + "원 ※ 집체교육 선택 필수</span></label>"); p.html("<label>" + d.tseq + "기 <span class='gry'>" + d.ssrename + "</span><span class='red'> (" + d.ssretimeToDay +"일) | " + d.infee + "원 ※ 집체교육 선택 필수</span></label>");
} }
spanIntro.text("강좌소개"); spanIntro.text("강좌소개");
li.append(p); li.append(p);

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

@ -60,10 +60,10 @@
<dl> <dl>
<dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt> <dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
<dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd> <dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
@if (d.intval3 == 2 && d.time3> Convert.ToDateTime("1900-01-01") && d.time4 > Convert.ToDateTime("1900-01-01")) @if (d.intval3 == 2 && d.time3> Convert.ToDateTime("1900-01-01"))
{ {
<dt class="mpglSta3">&nbsp;&nbsp;&nbsp;</dt> <dt class="mpglSta3">&nbsp;&nbsp;&nbsp;</dt>
<dd> 집체교육 : @d.time3.ToString("yy/MM/dd") ~ @d.time4.ToString("yy/MM/dd")</dd> <dd> 집체교육 : @d.time3.ToString("yy/MM/dd")</dd>
} }
</dl> </dl>

14
Model/CM.cs
View File

@ -190,6 +190,20 @@ namespace NP.Model
return sstime == null ? "" : sstime.Value.ToString("yyyy.MM.dd"); return sstime == null ? "" : sstime.Value.ToString("yyyy.MM.dd");
} }
} }
public String ssrename
{
get
{
return sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
}
}
public String ssretimeToDay
{
get
{
return sstime == null && setime == null ? "" : string.Format("{0}", Convert.ToDateTime(setime).DayOfYear - Convert.ToDateTime(sstime).DayOfYear);
}
}
/// <summary> /// <summary>
/// 학습종료 /// 학습종료
/// </summary> /// </summary>