diff --git a/BO/Content/homeDepth2.htm b/BO/Content/homeDepth2.htm index 40a507b..3ba41f2 100644 --- a/BO/Content/homeDepth2.htm +++ b/BO/Content/homeDepth2.htm @@ -5,10 +5,10 @@
@@ -21,13 +21,13 @@
@@ -40,10 +40,10 @@
@@ -56,17 +56,17 @@
@@ -79,53 +79,53 @@
diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index 00beafd..004d88d 100644 --- a/BO/Controllers/cmController.cs +++ b/BO/Controllers/cmController.cs @@ -149,7 +149,7 @@ namespace NP.BO.Controllers vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } }); } vm.Assigns = Dao.Get("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } }); - vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); + vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); vm.userauths = Dao.Get("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } }); return View("cmreg", vm); } diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index ab04d1b..7339f87 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -15,7 +15,7 @@ namespace NP.BO.Controllers { public ActionResult lectreg(NP.Model.VMCM vm) { - ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; + ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); vm.IsAdmin = SUserInfo.IsAdmin; vm.IsSiteAdmin = SUserInfo.IsSiteAdmin; @@ -204,7 +204,7 @@ namespace NP.BO.Controllers vm.Lects = Dao.Get("lect.lects", ht); } - ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; + ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems); return View(vm); } @@ -910,7 +910,7 @@ namespace NP.BO.Controllers vm.Pay = Dao.Get("cr.pay1", vm.payno).First(); vm.PayItems = Dao.Get("cr.pay2", vm.payno); vm.Lect = Dao.Get("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault(); - ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; + ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); @@ -1247,7 +1247,7 @@ namespace NP.BO.Controllers { vm.Completions = InitM(); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); - ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; + ViewBag.JobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); var ht = SetHash(vm); diff --git a/BO/Views/user/ur.cshtml b/BO/Views/user/ur.cshtml index 5b76453..e2eeba3 100644 --- a/BO/Views/user/ur.cshtml +++ b/BO/Views/user/ur.cshtml @@ -258,7 +258,8 @@ 교육유형 강좌명(분반) 신청구분 - 신청일 + @*신청일*@ + 교육종료일 결제여부 수료여부 교육일정 @@ -277,19 +278,28 @@ // 강좌 설정에서 설정한 교육장 eduLocName = item.studyplace; } - - @item.rnorvt - @item.tmname - @*@item.cgname*@ - @eduLocName - @item.cshapename - @item.cnameclassno - @item.isrebatename - @item.cdtymd - @item.pstatusname - @item.iscompletename - [변경] - + + @item.rnorvt + @item.tmname + @*@item.cgname*@ + @eduLocName + @item.cshapename + @item.cnameclassno + @item.isrebatename + @*@item.cdtymd*@ + @if (item.edate == null) + { + 2021-12-31 + } + else + { + @(Convert.ToDateTime(item.edate).ToShortDateString()) + } + + @item.pstatusname + @item.iscompletename + [변경] + } diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index a9cdcec..6e1a939 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -587,17 +587,6 @@ namespace NP.Base.Controllers ,{ "typeedu", 2} ,{ "typegrade", 3} ,{ "typejob", 4} - ,{ "typejob63", 5} - ,{ "typejob64", 5} - ,{ "typejob65", 5} - ,{ "typejob66", 5} - ,{ "typejob67", 5} - ,{ "typejob68", 5} - ,{ "typejob69", 5} - ,{ "typejob70", 5} - ,{ "typejob71", 5} - ,{ "typejob72", 5} - ,{ "typejob83", 5} ,{ "typejob40", 5} ,{ "typejob41", 5} diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index c65f5f6..51e45cc 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1801,7 +1801,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult Completion(Int64 lectno) { - string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; + string jobTypeItems = "typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"; var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + jobTypeItems); var completion = Dao.Get("cr.completions", new Hashtable() { { "lectno", lectno } }).First(); completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname; diff --git a/Base/Controller/AOCommon.cs b/Base/Controller/AOCommon.cs index dbc959a..c728686 100644 --- a/Base/Controller/AOCommon.cs +++ b/Base/Controller/AOCommon.cs @@ -206,6 +206,7 @@ namespace NP.Base.Controllers } //} } + [HttpPost] public JsonResult DisableAccount(string loginid) { diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index d9fc9bc..22dc9aa 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -540,14 +540,17 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno) { + // 29:기본교육 ,30:최초교육 ,31:계속교육 ,32:안전관리계속교육(16시간) ,33:PQ가점교육 ,34:기타교육 ,35:승급교육 + // 36:초급 ,37:중급 ,38:고급 ,39:특급 int result = 0; // 0 이면 수강 가능, 그외 수강 불가 int userno = SUserInfo.UserNo; string[] cgcodes = { "103", "104", "105" }; - string[] edus = { "53", "54", "58", "59", "60" }; // 최초교육, 계속교육, 승급교육 - // 등급 59: 초급, 60: 중급, 61: 고급, 62: 특급 - if (man == "51" && cgcodes.Contains(cgcode) && edus.Contains(edu)) + string[] edus = { "30", "31", "35" }; // 최초교육, 계속교육, 승급교육 + + // man == 28 : 건설사업관리기술인(typeman) + if (man == "28" && cgcodes.Contains(cgcode) && edus.Contains(edu)) { - if (edu == "54" && (cgcode == "103" || cgcode == "104") && (grade == "59" || grade == "60")) // 계속교육, (103 or 104), (초급 or 중급) + if (edu == "31" && (cgcode == "103" || cgcode == "104") && (grade == "36" || grade == "37")) // 계속교육, (103 or 104), (초급 or 중급) { result = 1; // 신청불가 } @@ -555,15 +558,15 @@ namespace NP.Base.Controllers { int rst = 0; - if (edu == "53" && cgcode == "105") // 최초교육 , 105 + if (edu == "30" && cgcode == "105") // 최초교육 , 105 { rst = 0; // 신청가능 } - else if (edu == "54" && cgcode == "105" && (grade == "59" || grade == "60")) // 계속교육, 105, (초급 or 중급) + else if (edu == "31" && cgcode == "105" && (grade == "36" || grade == "37")) // 계속교육, 105, (초급 or 중급) { rst = 0; // 신청가능 } - else if (edu == "58" && (cgcode == "103" || cgcode == "104" || cgcode == "105") && (grade == "59" || grade == "60")) // 승급교육, (103 or 104 or 105), (초급 or 중급) + else if (edu == "35" && (cgcode == "103" || cgcode == "104" || cgcode == "105") && (grade == "36" || grade == "37")) // 승급교육, (103 or 104 or 105), (초급 or 중급) { rst = 0; // 신청가능 } @@ -579,14 +582,19 @@ from lect t1 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 = 103 -- and t1.userno=82 -- 82,5,31 + + + + // 29:기본교육 ,30:최초교육 ,31:계속교육 ,32:안전관리계속교육(16시간) ,33:PQ가점교육 ,34:기타교육 ,35:승급교육 + // 36:초급 ,37:중급 ,38:고급 ,39:특급 */ - if((edu == "54" || edu == "58") && (grade == "61" || grade == "62")) // 계속교육, 승급교육 && 고급, 특급 + if ((edu == "31" || edu == "35") && (grade == "38" || grade == "39")) // 계속교육, 승급교육 && 고급, 특급 { var lectCount = Dao.Get("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade } }); rst = lectCount.First(); } - else if((cgcode == "103" || cgcode == "104") && edu == "53") + else if((cgcode == "103" || cgcode == "104") && edu == "30") // 최초 { var lectCount = Dao.Get("lect.count.user3", new Hashtable() { { "userno", userno } }); rst = lectCount.First(); diff --git a/Dao/MyBatis/Maps/Common.xml b/Dao/MyBatis/Maps/Common.xml index 02f7f87..0bc523b 100644 --- a/Dao/MyBatis/Maps/Common.xml +++ b/Dao/MyBatis/Maps/Common.xml @@ -480,8 +480,8 @@ SELECT LAST_INSERT_ID() - insert into smsauth(latime,lakey,userno) - values(now(),#lakey#,#userno#); + insert into smsauth(latime,lakey,userno, lectno) + values(now(),#lakey#,#userno#, 0); SELECT LAST_INSERT_ID() + diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 29ed8bc..806740a 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -1049,7 +1049,7 @@ namespace NP.FO.Controllers } vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First(); vm.User = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First(); - vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); + vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57"); vm.ComCodes2 = GetComCodes("typeman"); vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes4 = GetComCodes("typegrade"); diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index 817e7dc..3e87fcf 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -295,13 +295,15 @@ $("#stringval6").val($("#sch5").val()); $("#stringval7").val($("#sch6").val()); + + if ($("#stringval").val() == "0") { if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; } if ($("#stringval3").val() == "") { msg("기술인분류를 입력하세요."); $("#stringval3").focus(); return; } if ($("#stringval4").val() == "") { msg("교육목적을 입력하세요."); $("#stringval4").focus(); return; } if ($("#stringval5").val() == "") { msg("등급을 입력하세요."); $("#stringval5").focus(); return; } if ($("#stringval6").val() == "") { msg("직무분야를 입력하세요."); $("#stringval6").focus(); return; } - if ($("#stringval7").val() == "" && $("#msSel6 div").css("display") != 'none') { msg("전문분야를 입력하세요."); $("#stringval6").focus(); return; } + if ($("#stringval7").val() == "" && $("#msSel6 div").css("display") != 'none' && $("#stringval6").val() != "57") { msg("전문분야를 입력하세요."); $("#stringval6").focus(); return; } } else if ($("#stringval").val() == "1") { if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; }