diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm
index 0239173..8c9a941 100644
--- a/BO/Content/homeDepth2.htm
+++ b/BO/Content/homeDepth2.htm
@@ -28,6 +28,8 @@
안전관리계속교육(16시간)
PQ가점교육
기타교육
+ 필수계속교육(7시간)
+ 일반계속교육(14시간)
diff --git a/BO/Web.config b/BO/Web.config
index 27cf48b..7d4c0ec 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -56,9 +56,9 @@
-
+
-
+
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 877285d..c0e5150 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1840,7 +1840,7 @@
left outer join pplog pl on p.pplno= pl.pplno
where l.lectno=#lectno# and l.userno = #userno# and (pl.typeedu = 32 or
( l.completetime is null and li.stime is not null
- and l.sdate < '2024-08-19 00:00:00' and l.edate < '2024-08-22 00:00:00'))
+ and l.sdate < '2024-08-19 00:00:00' and li.stime is not null and li.stime < '2024-08-22 00:00:00'))
-
\ No newline at end of file
+
diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml
index 0ba09a9..38e5dc2 100644
--- a/FO/Views/Home/Index.cshtml
+++ b/FO/Views/Home/Index.cshtml
@@ -447,6 +447,12 @@
$("#lijob57").hide()
+
+ let sch1 = $("#sch1").val()
+ let sch2 = $("#sch2").val()
+ $("#liedu08").css("display", "none") // 계속교육 막기
+ $("#liedu09").css("display", "none") // 필수교육 막기
+
@if(DateTime.Now > DateTime.Parse("2030-01-02 00:00")) // ### ty 2024년 추가건
{
@:if (num => 2) {
@@ -473,8 +479,21 @@
@:}
}
- if (num == 3) {
+
+ if (num == 2) {
+ if (sch1 == "2" && sch2 == "28") {
+ $("#liedu09").css("display", "block")
+ }
+ if (sch1 == "1" && sch2 == "28") {
+ $("#liedu08").css("display", "block")
+ $("#liedu09").css("display", "block")
+ }
+
+ }
+
+ if (num == 3) {
+
if ($("#msSel3 > span").text() == "승급교육") {
$("#msSel4 > span").text("승급 후 등급")
}
diff --git a/FO/Web.config b/FO/Web.config
index c25dae0..fa14f2c 100644
--- a/FO/Web.config
+++ b/FO/Web.config
@@ -40,9 +40,9 @@
-
+
-
+