diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index d530019..29fea6e 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -54,7 +54,7 @@ namespace NP.FO.Controllers { vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); ViewBag.Mobile = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault().mobile; - if (vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) + if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); } diff --git a/FO/FO.csproj b/FO/FO.csproj index 9dbbe67..e948732 100644 --- a/FO/FO.csproj +++ b/FO/FO.csproj @@ -357,6 +357,7 @@ + diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml index d350796..97ba5ab 100644 --- a/FO/Views/CRoom/Index.cshtml +++ b/FO/Views/CRoom/Index.cshtml @@ -101,7 +101,7 @@ @foreach (var d in Model.LectInnings) { - +
[@(d.iseq)회] @d.ititle
diff --git a/FO/Views/CRoom/Innings.cshtml b/FO/Views/CRoom/Innings.cshtml index 27c9f8e..c7b25f2 100644 --- a/FO/Views/CRoom/Innings.cshtml +++ b/FO/Views/CRoom/Innings.cshtml @@ -12,7 +12,7 @@ @foreach (var d in Model.LectInnings) { - +
[@(d.iseq)회] @d.ititle
diff --git a/FO/Views/CRoom/Plan.cshtml b/FO/Views/CRoom/Plan.cshtml index 74a06f6..995c03d 100644 --- a/FO/Views/CRoom/Plan.cshtml +++ b/FO/Views/CRoom/Plan.cshtml @@ -10,13 +10,13 @@ @foreach (var p in Model.CMPRs) { - - - - + + + + }
-
@p.username 교수님
-

@Html.Raw(p.introhtml ?? "")

-
+
@p.username 교수님
+

@Html.Raw(p.introhtml ?? "")

+
 
diff --git a/FO/Views/Shared/_LayoutMy.cshtml b/FO/Views/Shared/_LayoutMy.cshtml index 99462b6..38f96eb 100644 --- a/FO/Views/Shared/_LayoutMy.cshtml +++ b/FO/Views/Shared/_LayoutMy.cshtml @@ -55,7 +55,7 @@

@ViewBag.Title

@RenderBody() -

COPYRIGHT korea fair competition federation. ALL RIGHTS RESERVED.

+
�ڷ� ������