diff --git a/BO/Controllers/cmController.cs b/BO/Controllers/cmController.cs index 2c97767..00beafd 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"); + 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.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 364ee19..ab04d1b 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"; + ViewBag.JobTypeItems = "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,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"; + ViewBag.JobTypeItems = "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,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"; + ViewBag.JobTypeItems = "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,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"; + ViewBag.JobTypeItems = "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,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems); var ht = SetHash(vm); diff --git a/BO/Views/Account/Index.cshtml b/BO/Views/Account/Index.cshtml index 7b643c6..f1b4f47 100644 --- a/BO/Views/Account/Index.cshtml +++ b/BO/Views/Account/Index.cshtml @@ -188,9 +188,10 @@ } } else if (capResult.obj.code == 1000) { - $("#ipaddress").html(capResult.obj.ip); - $("#boxmobile").html(capResult.obj.mobile); - capp("/aocommon/sendlakey", { mobile: capResult.obj.mobile, no : capResult.obj.no }, "sendkey"); + //$("#ipaddress").html(capResult.obj.ip); + //$("#boxmobile").html(capResult.obj.mobile); + //capp("/aocommon/sendlakey", { mobile: capResult.obj.mobile, no : capResult.obj.no }, "sendkey"); + login(); } else if (capResult.obj.code == -1) { cnt--; diff --git a/BO/Views/user/ur.cshtml b/BO/Views/user/ur.cshtml index 74a861f..5b76453 100644 --- a/BO/Views/user/ur.cshtml +++ b/BO/Views/user/ur.cshtml @@ -286,7 +286,7 @@ @item.cnameclassno @item.isrebatename @item.cdtymd - @item.pstatusname + @item.pstatusname @item.iscompletename [변경] diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index f8fe7da..a9cdcec 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -598,6 +598,18 @@ namespace NP.Base.Controllers ,{ "typejob71", 5} ,{ "typejob72", 5} ,{ "typejob83", 5} + + ,{ "typejob40", 5} + ,{ "typejob41", 5} + ,{ "typejob42", 5} + ,{ "typejob43", 5} + ,{ "typejob44", 5} + ,{ "typejob45", 5} + ,{ "typejob46", 5} + ,{ "typejob47", 5} + ,{ "typejob48", 5} + ,{ "typejob49", 5} + ,{ "typejob57", 5} }; bool printCheck = true; diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 855264b..c65f5f6 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1767,6 +1767,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult PPlogTypeChange(Int64 pplno, string typeman, string typejob, string typeedu, string typegrade, string typejobitem) { + typejobitem = string.IsNullOrWhiteSpace(typejobitem) ? "0" : typejobitem; return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade }, { "typejobitem", typejobitem } })); } /// @@ -1800,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"; + string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,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 1c539b8..dbc959a 100644 --- a/Base/Controller/AOCommon.cs +++ b/Base/Controller/AOCommon.cs @@ -38,7 +38,7 @@ namespace NP.Base.Controllers /// /// /// - [HttpPost] + // [HttpPost] public JsonResult SendLakey(String mobile, String no) { long result = 0; @@ -65,6 +65,39 @@ namespace NP.Base.Controllers return JsonOK(result); } + public string SendLakey2(String mobile, String no) + { + string result = ""; + + try + { + Random r = new Random(); + int lakey = r.Next(100000, 999999); + //SmsAuth sa = new SmsAuth() { lakey = lakey.ToString(), userno=SUserInfo.UserNo }; + SmsAuth sa = new SmsAuth() { lakey = lakey.ToString(), userno = long.Parse(no) }; + String msg = "[영남건설기술교육원]\n\n영남건설기술교육원 인증번호 [" + lakey + "] 입니다."; + Dao.Insert("common.smsauth2", sa); + result = sa.authno.ToString(); + + IList us = new List(); + us.Add(new MemoUser() + { + userno = SUserInfo.UserNo, + mobile = mobile, + title = "인증번호", + mcontents = msg, + smstype = "A", + isok = 1 + }); + SaveTalk(us, "alarm"); + } + catch(Exception e) + { + result = e.Message; + } + return result; + } + /// /// @custom@ : 본인인증처리 /// diff --git a/Dao/MyBatis/SqlMapProductDev.config b/Dao/MyBatis/SqlMapProductDev.config index 4247735..a105e9f 100644 --- a/Dao/MyBatis/SqlMapProductDev.config +++ b/Dao/MyBatis/SqlMapProductDev.config @@ -12,7 +12,8 @@ - + + diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 1fd4778..29ed8bc 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -779,6 +779,7 @@ namespace NP.FO.Controllers vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes4 = GetComCodes("typegrade"); vm.ComCodes5 = GetComCodes("typejob"); + vm.ComCodes6 = GetComCodes("typejobitem"); bool getComCheck = true; var typeman = vm.ComCodes2.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval3) ? int.Parse(vm.stringval3) : 0)).FirstOrDefault(); @@ -1048,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"); + 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.ComCodes2 = GetComCodes("typeman"); vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes4 = GetComCodes("typegrade"); diff --git a/FO/Controllers/HomeController.cs b/FO/Controllers/HomeController.cs index a2bcc81..68e2418 100644 --- a/FO/Controllers/HomeController.cs +++ b/FO/Controllers/HomeController.cs @@ -28,10 +28,7 @@ namespace NP.FO.Controllers return Redirect("/My/Index"); } } - if(GetConfig("ispaytest") == "1") - { - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob"); - } + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob"); //HttpWebRequest requestHttp = (HttpWebRequest)HttpWebRequest.Create("http://ynictea.nptc.kr/Content/homeDepth2.htm"); string urlStr = GetConfig("adminurl"); HttpWebRequest requestHttp = (HttpWebRequest)HttpWebRequest.Create(urlStr + "/Content/homeDepth1.htm");