diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 5af701f..c972572 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -263,13 +263,13 @@
}
if (d.cshape == 0) {
- p.html("");
+ p.html("");
}
else if (d.cshape == 1) {
- p.html("");
+ p.html("");
}
else if (d.cshape == 2) {
- p.html("");
+ p.html("");
}
spanIntro.text("강좌소개");
li.append(p);
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml
index a652202..2e1e5c4 100644
--- a/FO/Views/My/Index.cshtml
+++ b/FO/Views/My/Index.cshtml
@@ -60,10 +60,10 @@
- @(d.time2 > DateTime.Now ? "진행중" : "종료")
- 교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/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"))
{
-
- - 집체교육 : @d.time3.ToString("yy/MM/dd") ~ @d.time4.ToString("yy/MM/dd")
+ - 집체교육 : @d.time3.ToString("yy/MM/dd")
}
diff --git a/Model/CM.cs b/Model/CM.cs
index 97559d7..283b6b3 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -190,6 +190,20 @@ namespace NP.Model
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);
+ }
+ }
///
/// 학습종료
///