diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm
index 9dae3c2..0239173 100644
--- a/BO/Content/homeDepth2.htm
+++ b/BO/Content/homeDepth2.htm
@@ -28,8 +28,6 @@
안전관리계속교육(16시간)
PQ가점교육
기타교육
- 필수계속교육
- 일반계속교육
@@ -133,4 +131,4 @@
- 교육신청
+ 일정확인 및 교육신청
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index e5c75b7..dd754d0 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -2695,6 +2695,15 @@
,fgno=null
where lectno=#lectno# and sdno=#sdno#;
+
+
diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs
index f90e853..a1e453c 100644
--- a/FO/Controllers/MyController.cs
+++ b/FO/Controllers/MyController.cs
@@ -229,10 +229,11 @@ namespace NP.FO.Controllers
//hsData.Add("cshape", 2);
hsData.Add("issubtable", 1);
vm.Lects = Dao.Get("lect.mylectures2", hsData);
-
+
foreach (var item in vm.Lects)
{
+ item.intv1 = 0;
if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
{
item.lectStatus = "미수료";
@@ -250,7 +251,26 @@ namespace NP.FO.Controllers
item.lectStatus = "교육진행중";
}
}
-
+
+ if (vm.Lects.Count > 0)
+ {
+ string lectsNos = string.Join(",", vm.Lects.Select(c => c.lectno).ToList());
+ var getLectAtt = Dao.Get("lect.get.lectsdChk", new Hashtable { { "lectnos", lectsNos } });
+
+ if (getLectAtt.Count > 0)
+ {
+ foreach (var item in getLectAtt.Where(c => c.intv1 == 1).ToList())
+ {
+ var lectitem = vm.Lects.Where(c => c.lectno == item.lectno).FirstOrDefault();
+
+ if (lectitem != null)
+ {
+ lectitem.intv1 = 1;
+ }
+ }
+ }
+ }
+
return View(vm);
}
public ActionResult CertPrint(VMMy vm)
diff --git a/FO/Views/CRoom/Estimation.cshtml b/FO/Views/CRoom/Estimation.cshtml
index 7b6e653..31047dd 100644
--- a/FO/Views/CRoom/Estimation.cshtml
+++ b/FO/Views/CRoom/Estimation.cshtml
@@ -15,8 +15,16 @@
-@foreach (var d in Model.Datas.Where(w=>w.dtype > -1))
-{
+@{
+ List allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683".Split(','), long.Parse).ToList();
+
+ }
+ @foreach (var d in Model.Datas.Where(w=>w.dtype > -1))
+ {
+ if(allowLectNos.IndexOf(Model.croomlectno) > -1)
+ {
+ ViewBag.exCheck = true;
+ }
@(d.dtype == 0 ? "진행평가":d.dtype==1?"최종평가":d.dtype == 2?"과제":d.dtype==3?"토론":"") @d.strval
diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml
index f062d93..3876473 100644
--- a/FO/Views/My/LectureOn.cshtml
+++ b/FO/Views/My/LectureOn.cshtml
@@ -59,9 +59,16 @@
|
-
- - 변경
- |
+
+ @if (d.intv1 == 0)
+ {
+ - 변경
+ }
+ else
+ {
+ - 변경
+ }
+ |
}
diff --git a/FO/Web.config b/FO/Web.config
index fa14f2c..c25dae0 100644
--- a/FO/Web.config
+++ b/FO/Web.config
@@ -40,9 +40,9 @@
-
+
-
+