diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index dba96f3..116df0e 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -105,25 +105,32 @@ @foreach (var d in Model.LectInnings) { - +
[@(d.iseq)회] @d.ititle
-
-
@(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.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))
- @if (d.isonline == 0) - { - if (d.cshape != 2) + @if (d.cshape == 2 && d.isonline == 0) + { +
+ } + else + { +
+
@(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.sdate.ToString("MM/dd") + " ~ " + d.edate.ToString("MM/dd")))
+ @if (d.isonline == 0) { -
강의실 : @(d.icontent ?? "-")
+ if (d.cshape != 2) + { +
강의실 : @(d.icontent ?? "-")
+ } + else + { +
장소 : @(d.cname ?? "-")
+ } } - else - { -
장소 : @(d.cname ?? "-")
- } - } -
+
+ }