From 75116148c799905589cc0b683948864cea6a2a19 Mon Sep 17 00:00:00 2001 From: hyunho Date: Fri, 11 Dec 2020 07:56:16 +0000 Subject: [PATCH] --- BO/Views/croom/cmlects.cshtml | 18 ++++++++++++++---- FO/Controllers/CourseController.cs | 2 +- FO/Views/Course/ApplyEdu.cshtml | 18 ++++++++++++++---- FO/Views/Course/OffList.cshtml | 2 +- FO/Views/My/Lecture.cshtml | 18 ++++++++++++++---- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml index 6b26d96..f89f96f 100644 --- a/BO/Views/croom/cmlects.cshtml +++ b/BO/Views/croom/cmlects.cshtml @@ -294,15 +294,25 @@ } else { - if (d.remainPeople <= 0) { - li.append(""); + if (d.quota != 0) { + if (d.remainPeople <= 0) { + li.append(""); + } + else { + if (seq == 0) { + li.append(""); + } + else { + li.append(""); + } + } } else { if (seq == 0) { - li.append(""); + li.append(""); } else { - li.append(""); + li.append(""); } } } diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index f38fb68..92af557 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -789,7 +789,7 @@ namespace NP.FO.Controllers { vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.cmno } }).FirstOrDefault(); - vm.CM.applicableCM = (vm.CM.quota - vm.CM.lectcnt <= 0) ? "대기접수" : "정상접수"; + vm.CM.applicableCM = (vm.CM.quota != 0 && vm.CM.quota - vm.CM.lectcnt <= 0) ? "대기접수" : "정상접수"; vm.CMInningscds = Dao.Get("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", vm.cmno },{"month", (vm.scdMonth == null)? DateTime.Now.Year : vm.scdMonth } }); foreach (var item in vm.CMInningscds) { diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 2000d0d..6d5e839 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -346,15 +346,25 @@ } else { - if (d.remainPeople <= 0) { - li.append(""); + if (d.quota != 0) { + if (d.remainPeople <= 0) { + li.append(""); + } + else { + if (seq == 0) { + li.append(""); + } + else { + li.append(""); + } + } } else { if (seq == 0) { - li.append(""); + li.append(""); } else { - li.append(""); + li.append(""); } } } diff --git a/FO/Views/Course/OffList.cshtml b/FO/Views/Course/OffList.cshtml index bdd2931..2a62ac5 100644 --- a/FO/Views/Course/OffList.cshtml +++ b/FO/Views/Course/OffList.cshtml @@ -55,7 +55,7 @@ @if (DateTime.Now >= d.rstime.Value && DateTime.Now < d.retime.Value) { - if (d.quota - d.lectcnt <= 0) + if (d.quota !=0 && d.quota - d.lectcnt <= 0) { 대기접수 } diff --git a/FO/Views/My/Lecture.cshtml b/FO/Views/My/Lecture.cshtml index 6d6d673..f2c6d30 100644 --- a/FO/Views/My/Lecture.cshtml +++ b/FO/Views/My/Lecture.cshtml @@ -232,15 +232,25 @@ li.append(" " + d.scdInfoSummary + ""); } else { - if (d.remainPeople <= 0) { - li.append(" " + d.scdInfoSummary + ""); + if (d.quota != 0) { + if (d.remainPeople <= 0) { + li.append(" " + d.scdInfoSummary + ""); + } + else { + if (seq == 0) { + li.append(" " + d.scdInfoSummary + ""); + } + else { + li.append(" " + d.scdInfoSummary + ""); + } + } } else { if (seq == 0) { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + ""); } else { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + ""); } } }