diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml
index 497b751..d98cf67 100644
--- a/FO/Views/CRoom/Index.cshtml
+++ b/FO/Views/CRoom/Index.cshtml
@@ -142,7 +142,8 @@
{
- @(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))
- - @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
+ @*- @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
*@
+ - @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
@if(d.cshape != 1 && d.isonline == 1)
{
- 복습기간 : @(d.edate.AddYears(1).ToString("yy-MM-dd"))
diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml
index ddaace2..2b40a0d 100644
--- a/FO/Views/CRoom/Innings.cshtml
+++ b/FO/Views/CRoom/Innings.cshtml
@@ -29,7 +29,8 @@
{
- @(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))
- - @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
+ @*- @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
*@
+ - @(d.isonline == 0 ? (d.cshape != 2 ? "강의시작일" : "집체교육") : "교육기간") : @(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")))
@if(d.cshape != 1 && d.isonline == 1)
{
- 복습기간 : @(d.edate.AddYears(1).ToString("yy-MM-dd"))
diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml
index ffddf34..e28ca69 100644
--- a/FO/Views/My/Document.cshtml
+++ b/FO/Views/My/Document.cshtml
@@ -62,20 +62,10 @@
@if (item.status == 1)
{
- if (item.cshape == 1)
+ - 교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))
+ if (item.cshape == 2 && item.estart > Convert.ToDateTime("1900-01-01") && item.eend > Convert.ToDateTime("1900-01-01"))
{
- - 교육기간 : @item.sdate.Value.ToString("yy-MM-dd") ~ @(item.edate.Value.ToString("yy-MM-dd"))
- }
- else
- {
- -
- 교육기간 : @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")))
- }
-
-
+ @:| 집체교육일자 : @("[" + item.studyplacename + "] " + string.Format("{0}", item.estart.ToString("yy-MM-dd")))
}
- 결제금액 : @(item.payamt)원
}
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml
index 7fbe9b9..6e0db3c 100644
--- a/FO/Views/My/Index.cshtml
+++ b/FO/Views/My/Index.cshtml
@@ -65,7 +65,8 @@
- @(d.time2 > DateTime.Now ? "진행중" : "종료")
- - 교육기간 : @(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"))
+ @*- 교육기간 : @(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"))
*@
+ - 교육기간 : @(d.time.ToString("yy-MM-dd")) ~ @(d.time2.ToString("yy-MM-dd"))
- 복습기간 : @(d.time2.AddYears(1).ToString("yy-MM-dd"))
@if (false && d.intval3 == 2 && d.time3 > Convert.ToDateTime("1900-01-01"))
{
diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml
index 2b08867..c6a5048 100644
--- a/FO/Views/My/Lecture.cshtml
+++ b/FO/Views/My/Lecture.cshtml
@@ -57,7 +57,8 @@
- DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")
-
- 교육기간 : @(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")))
@if(d.cshape != 1)
{
diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml
index bbd7a7d..9852122 100644
--- a/FO/Views/My/LectureOn.cshtml
+++ b/FO/Views/My/LectureOn.cshtml
@@ -30,7 +30,8 @@
- DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")
-
- 교육기간 : @(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")))
@if(d.cshape != 1)
{
diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml
index 4a2b558..20959e1 100644
--- a/FO/Views/My/PayInfo.cshtml
+++ b/FO/Views/My/PayInfo.cshtml
@@ -22,7 +22,8 @@
@if (Model.PayItem.sdate != null && Model.PayItem.edate != null)
{
- - 교육기간 : @(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())
+ @*- 교육기간 : @(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())
*@
+ - 교육기간 : @(Convert.ToDateTime(Model.PayItem.sdate).ToShortDateString()) ~ @(Convert.ToDateTime(Model.PayItem.edate).ToShortDateString())
}
else