diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm
index 3ba41f2..5b75a50 100644
--- a/BO/Content/homeDepth2.htm
+++ b/BO/Content/homeDepth2.htm
@@ -5,10 +5,10 @@
@@ -21,13 +21,13 @@
@@ -40,10 +40,10 @@
diff --git a/BO/Controllers/ccController.cs b/BO/Controllers/ccController.cs
index 1ab3d47..3b75b13 100644
--- a/BO/Controllers/ccController.cs
+++ b/BO/Controllers/ccController.cs
@@ -93,7 +93,7 @@ namespace NP.BO.Controllers
{
vm.BMOs = Dao.Get("board.bmos", GetInt(vm.stringval2));
}
- ht.Add("bmno", "21");
+ ht.Add("bmno", "13");
//ht.Add("opno", vm.stringval3);
//ht.Add("scc", vm.stringval4);
vm.Boards = Dao.Get("board.bs", ht);
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 556c351..6e26c9f 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1974,7 +1974,7 @@
inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
- where t1.status = 1 and t4.pstatus= 1 and t5.typeman = 28
+ where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t5.typeman = 28
and t1.userno = #userno#
and t5.typegrade in (38,39)
@@ -1992,7 +1992,7 @@
inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
- where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
+ where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
and t1.userno = #userno# and t5.typeman = 28
@@ -2003,7 +2003,7 @@
inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
- where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104) and t5.typeedu = 30
+ where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104) and t5.typeedu = 30
and t1.userno = #userno# and t5.typeman = 28
diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml
index ad82e61..fbadb34 100644
--- a/FO/Views/Home/Index.cshtml
+++ b/FO/Views/Home/Index.cshtml
@@ -361,6 +361,105 @@
}
});
function schIpt(num, code, name) {
+
+ $('#sch' + num).val(code);
+ $('#msSel' + num + '>span').text(name);
+ $('.msSel > div').slideUp(300);
+ $('.msSel > span').removeClass('on');
+ $('#msSel' + (Number(num) + 1)).removeClass('disable');
+ $('#msSel' + (Number(num) + 1)).addClass('active');
+
+ let tempCnt = 0;
+ $('#msSel' + (Number(num) + 1) + ' div ul li').each(function () {
+ if ($(this).css("display") != 'none') {
+ ++tempCnt;
+ }
+ })
+
+ if (tempCnt > 0) {
+ $('#msSel' + (Number(num) + 1)).removeClass("disable")
+ $('#msSel' + (Number(num) + 1) + ' > div').slideDown(300);
+ }
+ else {
+ $('#msSel' + (Number(num) + 1)).addClass("disable")
+ }
+
+ $("[id^='liman']").show()
+ $("[id^='liedu']").show()
+ $("[id^='ligrade']").show()
+ $("[id^='lijob']").show()
+ $("[id^='lijob']").show()
+
+ $("#liedu04").hide()
+ $("#liedu4").hide()
+
+ $("#lijob57").hide()
+ if ($("#msSel2 > span").text() == "설계시공기술인") {
+
+ $("#liedu4").hide()
+ if ($("#msSel3 > span").text() == "승급교육") {
+ $("#ligrade01").hide()
+
+ $("#ligrade1").hide()
+ }
+ else if ($("#msSel3 > span").text() == "계속교육") {
+ $("#ligrade01").hide()
+ $("#ligrade02").hide()
+ $("#ligrade03").hide()
+
+ $("#ligrade1").hide()
+ $("#ligrade2").hide()
+ $("#ligrade3").hide()
+ }
+ }
+ else if ($("#msSel2 > span").text() == "건설사업관리기술인") {
+ $("#liedu04").show()
+
+ $("#liedu4").show()
+ if ($("#msSel3 > span").text() == "승급교육") {
+ $("#ligrade01").hide()
+
+ $("#ligrade1").hide()
+ }
+ }
+ else if ($("#msSel2 > span").text() == "품질관리기술인") {
+ $("#liedu04").hide();
+
+ $("#liedu4").hide();
+
+ $("[name='typejob']").hide()
+ $("#lijob57").show()
+
+ if ($("#msSel3 > span").text() == "승급교육") {
+ $("#ligrade01").hide()
+
+ $("#ligrade1").hide()
+ }
+ }
+ else if ($("#msSel2 > span").text() == "발주청기술인") {
+ $("#liedu07").hide()
+ $("#liedu03").hide()
+ $("#liedu04").hide()
+ $("#liedu05").hide()
+ $("#liedu06").hide()
+
+ $("#liedu7").hide()
+ $("#liedu3").hide()
+ $("#liedu4").hide()
+ $("#liedu5").hide()
+ $("#liedu6").hide()
+ }
+
+ if (num == 5) {
+ $("#msSel6 > div > div > ul > li").hide();
+
+ $("[id='lijob" + code + "']").each(function () {
+ $(this).show();
+ })
+ }
+ }
+
+ function schIpt2(num, code, name) {
let tempStr = "";
switch (num) {
case '1':
@@ -420,29 +519,63 @@
$("#msSel5 li").show();
}
if (num == 2 && name == "발주청기술인") {
- $("#liedu03").hide();
- $("#liedu04").hide();
- $("#liedu05").hide();
- $("#liedu06").hide();
- $("#liedu07").hide();
+
+ $("#liedu7").hide();
+ $("#liedu3").hide();
+ $("#liedu4").hide();
+ $("#liedu5").hide();
+ $("#liedu6").hide();
+
+ $("#ligrade2").hide();
+ $("#ligrade3").hide();
+ $("#ligrade4").hide();
+
+ //$("#liedu03").hide();
+ //$("#liedu04").hide();
+ //$("#liedu05").hide();
+ //$("#liedu06").hide();
+ //$("#liedu07").hide();
}
- else if (num == 2 && name != "발주청기술인") {
+ else {
+ $("#liedu2").show();
+ $("#liedu7").show();
+ $("#liedu3").show();
+ $("#liedu4").show();
+ $("#liedu5").show();
+ $("#liedu6").show();
+
+ $("#ligrade2").show();
+ $("#ligrade3").show();
+ $("#ligrade4").show();
+
$("#liedu01").show();
$("#liedu03").show();
$("#liedu05").show();
$("#liedu06").show();
$("#liedu07").show();
}
+ if (num == 2 && name == "설계시공기술인") {
+ $("#liedu4").hide();
+
+ $("#liedu2").show();
+ $("#liedu7").show();
+ $("#liedu3").show();
+ $("#liedu4").hide();
+ $("#liedu5").show();
+ $("#liedu6").show();
+
+ $("#ligrade2").show();
+ $("#ligrade3").show();
+ $("#ligrade4").show();
+ }
+
if (num == 2 && name == "건설사업관리기술인") {
$("#liedu04").show();
+ $("#liedu4").show();
}
if (num == 2 && name == "품질관리기술인") {
- /*$("#msSel5 li a").each(function (i, d) {
- if (d.text != "품질관리") {
- //var item = d.closest("li").id;
- $("#lijob" + code).hide();
- }
- });*/
+
+ $("#liedu4").hide();
$("#msSel5 li").each(function () {
$(this).hide();
});
@@ -457,6 +590,10 @@
if (num == 3) {
$("#msSel4 li").show();
}
+
+ if (num == 3 && name == "최초교육") {
+ $("#ligrade1").hide()
+ }
if (num == 3 && name == "승급교육") {
$('#msSel4 > span').text("승급가능등급");
$("#ligrade01").hide();