KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. PMS NO : 

2. (주요)작업내용 
(1) 추가 개발건(전문분야)
This commit is contained in:
jity7777 2022-03-11 02:18:44 +00:00
parent ef5accf21a
commit 5395b96686
29 changed files with 841 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/BO.csproj
View File

@ -213,6 +213,8 @@
<Content Include="Content\BSFileInput\fileinput.min.js" /> <Content Include="Content\BSFileInput\fileinput.min.js" />
<Content Include="Content\emailForm\template_email.html" /> <Content Include="Content\emailForm\template_email.html" />
<Content Include="Content\emailForm\template_email_3.html" /> <Content Include="Content\emailForm\template_email_3.html" />
<Content Include="Content\homeDepth1.htm" />
<Content Include="Content\homeDepth2.htm" />
<Content Include="Content\img\ico_6.gif" /> <Content Include="Content\img\ico_6.gif" />
<Content Include="Content\smarteditor\css\en_US\smart_editor2.css" /> <Content Include="Content\smarteditor\css\en_US\smart_editor2.css" />
<Content Include="Content\smarteditor\css\en_US\smart_editor2_in.css" /> <Content Include="Content\smarteditor\css\en_US\smart_editor2_in.css" />

15
BO/Content/homeDepth1.htm Normal file
View File

@ -0,0 +1,15 @@
<li class="msCont">
<em>SKILL</em>
<div class="msSel active" id="msSel1">
<span>교육유형</span>
<div>
<div>
<ul>
<!--<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>
<li><a href="javascript:schIpt('1', '1', '교육장교육');">교육장교육</a></li>-->
<li><a href="javascript:schIpt('1', '2', '온라인교육');">온라인교육</a></li>
</ul>
</div>
</div>
</div>
</li>

133
BO/Content/homeDepth2.htm Normal file
View File

@ -0,0 +1,133 @@
<li class="msCont">
<em>JOB</em>
<div class="msSel disable" id="msSel2">
<span>기술인분류</span>
<div>
<div>
<ul>
<li id="liman01"><a href="javascript: schIpt('2', '48', '설계시공기술인'); ">설계시공기술인</a></li>
<li id="liman03"><a href="javascript: schIpt('2', '50', '발주청기술인'); ">발주청기술인</a></li>
<li id="liman04"><a href="javascript: schIpt('2', '51', '건설사업관리기술인'); ">건설사업관리기술인</a></li>
<li id="liman02"><a href="javascript: schIpt('2', '49', '품질관리기술인'); ">품질관리기술인</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>OBJECT</em>
<div class="msSel disable" id="msSel3">
<span>교육목적</span>
<div>
<div>
<ul>
<li id="liedu01"><a href="javascript: schIpt('3', '52', '기본교육'); ">기본교육</a></li>
<li id="liedu02"><a href="javascript: schIpt('3', '53', '최초교육'); ">최초교육</a></li>
<li id="liedu07"><a href="javascript: schIpt('3', '58', '승급교육'); ">승급교육</a></li>
<li id="liedu03"><a href="javascript: schIpt('3', '54', '계속교육'); ">계속교육</a></li>
<li id="liedu04"><a href="javascript: schIpt('3', '55', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li>
<li id="liedu05"><a href="javascript: schIpt('3', '56', 'PQ가점교육'); ">PQ가점교육</a></li>
<li id="liedu06"><a href="javascript: schIpt('3', '57', '기타교육'); ">기타교육</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>GRADE</em>
<div class="msSel disable" id="msSel4">
<span>현재등급</span>
<div>
<div>
<ul>
<li id="ligrade01"><a href="javascript: schIpt('4', '59', '초급'); ">초급</a></li>
<li id="ligrade02"><a href="javascript: schIpt('4', '60', '중급'); ">중급</a></li>
<li id="ligrade03"><a href="javascript: schIpt('4', '61', '고급'); ">고급</a></li>
<li id="ligrade04"><a href="javascript: schIpt('4', '62', '특급'); ">특급</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>TYPE</em>
<div class="msSel disable" id="msSel5">
<span>직무분야</span>
<div>
<div>
<ul>
<li id="lijob"><a href="javascript: schIpt('5', '63', '토목'); ">토목</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '64', '건축'); ">건축</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '65', '기계'); ">기계</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '66', '조경'); ">조경</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '67', '환경'); ">환경</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '68', '광업'); ">광업</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '69', '안전관리'); ">안전관리</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '70', '도시교통'); ">도시교통</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '71', '전기전자'); ">전기전자</a></li>
<li id="lijob"><a href="javascript: schIpt('5', '72', '건설지원'); ">건설지원</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>TYPE2</em>
<div class="msSel disable" id="msSel6">
<span>전문분야</span>
<div>
<div>
<ul>
<li id="lijob64"><a href="javascript: schIpt('6', '118', '건축구조'); ">건축구조</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '119', '건축기계설비'); ">건축기계설비</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '120', '건축시공'); ">건축시공</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '121', '실내건축'); ">실내건축</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '122', '건축품질관리'); ">건축품질관리</a></li>
<li id="lijob64"><a href="javascript: schIpt('6', '123', '건축계획․설계'); ">건축계획․설계</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '124', '공조냉동및설비'); ">공조냉동및설비</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '125', '용접'); ">용접</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '126', '건설기계'); ">건설기계</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '127', '승강기'); ">승강기</a></li>
<li id="lijob65"><a href="javascript: schIpt('6', '128', '일반기계'); ">일반기계</a></li>
<li id="lijob66"><a href="javascript: schIpt('6', '129', '조경계획'); ">조경계획</a></li>
<li id="lijob66"><a href="javascript: schIpt('6', '130', '조경시공관리'); ">조경시공관리</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '106', '토질·지질'); ">토질·지질</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '107', '토목구조'); ">토목구조</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '108', '항만및해안'); ">항만및해안</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '109', '도로및공항'); ">도로및공항</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '110', '철도·삭도'); ">철도·삭도</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '111', '수자원개발'); ">수자원개발</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '112', '상하수도'); ">상하수도</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '113', '농어업토목'); ">농어업토목</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '114', '토목시공'); ">토목시공</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '115', '토목품질관리'); ">토목품질관리</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '116', '측량및지형공간정보'); ">측량및지형공간정보</a></li>
<li id="lijob63"><a href="javascript: schIpt('6', '117', '지적'); ">지적</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '131', '대기관리'); ">대기관리</a></li>
<li id="lijob68"><a href="javascript: schIpt('6', '138', '화약류관리'); ">화약류관리</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '140', '건설안전'); ">건설안전</a></li>
<li id="lijob70"><a href="javascript: schIpt('6', '145', '교통'); ">교통</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '146', '철도신호.'); ">철도신호.</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '149', '건설 마케팅'); ">건설 마케팅</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '132', '수질관리'); ">수질관리</a></li>
<li id="lijob68"><a href="javascript: schIpt('6', '139', '광산보안'); ">광산보안</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '141', '소방'); ">소방</a></li>
<li id="lijob70"><a href="javascript: schIpt('6', '144', '도시계획'); ">도시계획</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '147', '건축전기설비'); ">건축전기설비</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '150', '건설 정보 처리'); ">건설 정보 처리</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '133', '소음진동'); ">소음진동</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '142', '가스'); ">가스</a></li>
<li id="lijob71"><a href="javascript: schIpt('6', '148', '산업계측제어'); ">산업계측제어</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '151', '건설 금융․재무'); ">건설 금융․재무</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '134', '폐기물처리'); ">폐기물처리</a></li>
<li id="lijob69"><a href="javascript: schIpt('6', '143', '비파괴검사'); ">비파괴검사</a></li>
<li id="lijob72"><a href="javascript: schIpt('6', '152', '건설 기획'); ">건설 기획</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '135', '자연환경'); ">자연환경</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '136', '토양환경'); ">토양환경</a></li>
<li id="lijob67"><a href="javascript: schIpt('6', '137', '해양'); ">해양</a></li>
</ul>
</div>
</div>
</div>
</li>
<li><a href="#" class="msBtn">검색/교육신청</a></li>

2
BO/Controllers/cmController.cs
View File

@ -149,7 +149,7 @@ namespace NP.BO.Controllers
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } }); vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
} }
vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } }); vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } });
vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace"); vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83");
vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } }); vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } });
return View("cmreg", vm); return View("cmreg", vm);
} }

12
BO/Controllers/croomController.cs
View File

@ -203,7 +203,8 @@ namespace NP.BO.Controllers
vm.Lects = Dao.Get<Lect>("lect.lects", ht); vm.Lects = Dao.Get<Lect>("lect.lects", ht);
} }
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob"); ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems);
return View(vm); return View(vm);
} }
public ActionResult asrpop(VMCM vm) public ActionResult asrpop(VMCM vm)
@ -907,11 +908,15 @@ namespace NP.BO.Controllers
{ {
vm.Pay = Dao.Get<Pay>("cr.pay1", vm.payno).First(); vm.Pay = Dao.Get<Pay>("cr.pay1", vm.payno).First();
vm.PayItems = Dao.Get<PayItem>("cr.pay2", vm.payno); vm.PayItems = Dao.Get<PayItem>("cr.pay2", vm.payno);
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace");
vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault(); vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault();
ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
vm.Lect.typemanname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeman" && w.ccode == vm.Lect.typeman).FirstOrDefault()?.cname; vm.Lect.typemanname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeman" && w.ccode == vm.Lect.typeman).FirstOrDefault()?.cname;
vm.Lect.typeeduname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeedu" && w.ccode == vm.Lect.typeedu).FirstOrDefault()?.cname; vm.Lect.typeeduname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typeedu" && w.ccode == vm.Lect.typeedu).FirstOrDefault()?.cname;
vm.Lect.typegradename = vm.ComCodes.Where(w => w.cgroup.ToString() == "typegrade" && w.ccode == vm.Lect.typegrade).FirstOrDefault()?.cname; vm.Lect.typegradename = vm.ComCodes.Where(w => w.cgroup.ToString() == "typegrade" && w.ccode == vm.Lect.typegrade).FirstOrDefault()?.cname;
vm.Lect.typejobitemname = vm.ComCodes.Where(w => w.ccode == vm.Lect.typejobitem).FirstOrDefault()?.cname;
vm.Lect.typejobname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == vm.Lect.typejob).FirstOrDefault()?.cname; vm.Lect.typejobname = vm.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == vm.Lect.typejob).FirstOrDefault()?.cname;
if(!string.IsNullOrEmpty(vm.Lect.studyplace)) vm.Lect.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == int.Parse(vm.Lect.studyplace)).FirstOrDefault()?.cname; if(!string.IsNullOrEmpty(vm.Lect.studyplace)) vm.Lect.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == int.Parse(vm.Lect.studyplace)).FirstOrDefault()?.cname;
ViewBag.TestCode = TestCode; ViewBag.TestCode = TestCode;
@ -1241,7 +1246,8 @@ namespace NP.BO.Controllers
{ {
vm.Completions = InitM<Completion>(); vm.Completions = InitM<Completion>();
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } });
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
var ht = SetHash(vm); var ht = SetHash(vm);
ht.Add("tyear", vm.stringval); ht.Add("tyear", vm.stringval);

3
BO/Views/MM/Config0.cshtml
View File

@ -3,7 +3,8 @@
<div class="row"> <div class="row">
<div class="col-md-12 col-lg-5"> <div class="col-md-12 col-lg-5">
<section class="panel panel-default"> <section class="panel panel-default">
<header class="panel-heading font-bold">상위코드<br /><span style="color: red;">#상위코드를 클릭하면 하위코드목록이 표시됩니다.</span></header> <header class="panel-heading font-bold">상위코드<br /><span style="color: red;">#상위코드를 클릭하면 하위코드목록이 표시됩니다.</span>
</header>
<div class="panel-body" id="treebox" style="overflow-y: auto; max-height: 400px;"> <div class="panel-body" id="treebox" style="overflow-y: auto; max-height: 400px;">
<ul class="box left cap header"> <ul class="box left cap header">
<li style="width: 20%;">No</li> <li style="width: 20%;">No</li>

82
BO/Views/cm/cmreg.cshtml
View File

@ -137,6 +137,55 @@
@Html.Partial("./Partial/Checkbox", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "typejob" }, {"autobind", "CM_typejob" }, { "checked", Model.CM.typejob }@*, { "fixwidth", "100px" }*@ }) @Html.Partial("./Partial/Checkbox", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "typejob" }, {"autobind", "CM_typejob" }, { "checked", Model.CM.typejob }@*, { "fixwidth", "100px" }*@ })
</div> </div>
</div> </div>
<div class="line line-dashed line-lg pull-in"></div><div class="form-group">
<label class="col-sm-4 col-md-2 control-label">전문분야</label>
<div class="col-sm-8 col-md-10">
@{
Dictionary<int, string> typeJobList = new Dictionary<int, string>();
foreach (var item in Model.ComCodes.Where(w => w.cgroup == "typejob"))
{
typeJobList.Add(item.ccode, item.cname);
}
bool typejobItemCheck = false;
string typeJobGroupName = "";
List<int> typejobitems = new List<int>();
if (!string.IsNullOrWhiteSpace(Model.CM.typejobitem))
{
typejobitems = Array.ConvertAll(Model.CM.typejobitem.Split(','), int.Parse).ToList();
}
foreach (var item in typeJobList)
{
typeJobGroupName = "typejob" + item.Key;
var subList = Model.ComCodes.Where(w => w.cgroup == typeJobGroupName).OrderBy(c => c.corder);
if (subList.Count() > 0)
{
<div id="@(typeJobGroupName)items" style="display:none">
<font style="font-weight:bold;margin-right:10px">@item.Value : </font>
@foreach (var item2 in subList)
{
if (typejobitems.IndexOf(item2.ccode) > -1)
{
typejobItemCheck = true;
}
else
{
typejobItemCheck = false;
}
<span><input type="checkbox" name="typeJobItems" value="@item2.ccode" @(typejobItemCheck ? "checked" : "")><label for="">@item2.cname</label></span>
}
</div>
}
}
}
<input id="CM_typejobItem" name="CM.typejobItem" type="hidden" value="@Model.CM.typejobitem">
</div>
</div>
</div> </div>
<div class="line line-dashed line-lg pull-in"></div><div class="form-group"> <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
@ -448,7 +497,40 @@
$("#CM_cshape1").prop("disabled", false); $("#CM_cshape1").prop("disabled", false);
} }
}); });
$("[name='typejob']").on("click", function () {
if ($(this).is(":checked")) {
$("#typejob" + $(this).val() + "items").css("display", "")
}
else {
$("#typejob" + $(this).val() + "items").css("display", "none")
$("#typejob" + $(this).val() + "items input:checkbox").prop("checked", false)
$($("#typejob" + $(this).val() + "items input:checkbox")[0]).trigger("click")
$($("#typejob" + $(this).val() + "items input:checkbox")[0]).trigger("click") // 두번 입력인 이유는 클릭해제 이벤트 발생을 위해서
}
})
beginSetJobTypeCheckbox();// 최초 열릴때 해당 체크 박스 활성화
$("[name='typeJobItems']").on("click", function () {
$("#CM_typejobItem").val("")
let nos = "";
$("[name='typeJobItems']").each(function () {
if ($(this).is(":checked")) {
nos += (nos == "" ? "" : ",") + $(this).val();
}
})
$("#CM_typejobItem").val(nos)
})
}); });
function beginSetJobTypeCheckbox() {
$("[name='typejob']").each(function () {
if ($(this).is(":checked")) {
$("#typejob" + $(this).val() + "items").css("display", "")
}
})
}
function loadlegal(cgno) { function loadlegal(cgno) {
capp("/acommon/cgget", { cgno: cgno }, "renderlegal"); capp("/acommon/cgget", { cgno: cgno }, "renderlegal");
} }

35
BO/Views/croom/cmlects.cshtml
View File

@ -97,7 +97,7 @@
<td>@d.rnorvt</td> <td>@d.rnorvt</td>
<td class="link text-center"><a href="#" onclick="viewas(@d.asno);">@d.asname</a></td> <td class="link text-center"><a href="#" onclick="viewas(@d.asno);">@d.asname</a></td>
<td>@(d.cnoname)(@d.cnoid)</td> <td>@(d.cnoname)(@d.cnoid)</td>
<td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,@d.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}:{17}", d.asname ?? "", d.username, d.userid ?? "", d.uduty ?? "", d.depart ?? "", d.email, d.telno, d.mobile, d.ckfcfyear, d.assignuser, d.edus, d.sdate == null ? "" : d.sdate.Value.ToString("yyyy-MM-dd"), d.edate == null ? "" : d.edate.Value.ToString("yyyy-MM-dd"), d.typeman, d.typejob, d.typeedu, d.typegrade, d.pplno)')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td> <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,@d.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}:{17}:{18}", d.asname ?? "", d.username, d.userid ?? "", d.uduty ?? "", d.depart ?? "", d.email, d.telno, d.mobile, d.ckfcfyear, d.assignuser, d.edus, d.sdate == null ? "" : d.sdate.Value.ToString("yyyy-MM-dd"), d.edate == null ? "" : d.edate.Value.ToString("yyyy-MM-dd"), d.typeman, d.typejob, d.typeedu, d.typegrade, d.pplno, d.typejobitem)')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td>
<td>@d.cdtymd</td> <td>@d.cdtymd</td>
<td>@d.statusname</td> <td>@d.statusname</td>
<td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td> <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
@ -192,6 +192,21 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr>
<th>전문분야</th>
<td>
<select class="form-control dev" id="selTypejobItem" name="selTypejobItem">
@{
List<string> tempList = ((string)ViewBag.JobTypeItems).Split(',').ToList();
foreach (var t in Model.ComCodes.Where(w => tempList.Contains(w.cgroup)))
{
<option value="@t.ccode" class="jobTypeItems" name="@t.cgroup">@t.cname</option>
}
}
</select>
</td>
</tr>
<tr> <tr>
<th>교육목적</th> <th>교육목적</th>
<td> <td>
@ -276,6 +291,15 @@
var selectedLectno; var selectedLectno;
var selectedCmisno; var selectedCmisno;
$(document).ready(function () { $(document).ready(function () {
$("#selTypejob").on("change", function () {
$(".jobTypeItems").css("display", "none")
let seltypeJobGroup = "typejob" + $(this).val();
$("[name='" + seltypeJobGroup + "']").each(function () {
$(this).css("display", "")
})
})
$("#addstringval5").on("keydown", function (e) { $("#addstringval5").on("keydown", function (e) {
if (e.keyCode == 13) { if (e.keyCode == 13) {
submit(); submit();
@ -349,7 +373,13 @@
$("#selTypejob").val(ds[14]).attr("selected", "selected"); $("#selTypejob").val(ds[14]).attr("selected", "selected");
$("#selTypeedu").val(ds[15]).attr("selected", "selected"); $("#selTypeedu").val(ds[15]).attr("selected", "selected");
$("#selTypegrade").val(ds[16]).attr("selected", "selected"); $("#selTypegrade").val(ds[16]).attr("selected", "selected");
$("#selTypejobItem").val(ds[18])
$("#hidpplno").val(ds[17]); $("#hidpplno").val(ds[17]);
$(".jobTypeItems").css("display", "none");
$("[name='typejob" + $("#selTypejob").val() + "']").each(function () {
$(this).css("display", "");
})
} }
} }
function change() { function change() {
@ -443,7 +473,8 @@
typeman: $("#selTypeman").val(), typeman: $("#selTypeman").val(),
typejob: $("#selTypejob").val(), typejob: $("#selTypejob").val(),
typeedu: $("#selTypeedu").val(), typeedu: $("#selTypeedu").val(),
typegrade: $("#selTypegrade").val() typegrade: $("#selTypegrade").val(),
typejobitem: $("#selTypejobItem").val()
}, "afterUpdateType"); }, "afterUpdateType");
} }
} }

38
BO/Views/croom/completions.cshtml
View File

@ -268,20 +268,33 @@
<td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "completion.typejob" }, { "style", "width: 100%" }, { "df", ":-직무분야" } })</td> <td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typejob"), new ViewDataDictionary { { "name", "completion.typejob" }, { "style", "width: 100%" }, { "df", ":-직무분야" } })</td>
</tr> </tr>
<tr> <tr>
<th>전문분야 <spn style="color:red;">*</spn></th>
<td>
<select class="form-control dev" id="completion_typejobItem" name="completion.typejobItem">
@{
List<string> tempList = ((string)ViewBag.JobTypeItems).Split(',').ToList();
foreach (var t in Model.ComCodes.Where(w => tempList.Contains(w.cgroup)))
{
<option value="@t.ccode" class="jobTypeItems" name="@t.cgroup">@t.cname</option>
}
}
</select>
</td>
<th>교육목적 <spn style="color:red;">*</spn></th> <th>교육목적 <spn style="color:red;">*</spn></th>
<td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeedu"), new ViewDataDictionary { { "name", "completion.typeedu" }, { "style", "width: 100%" }, { "df", ":-교육목적" } })</td> <td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeedu"), new ViewDataDictionary { { "name", "completion.typeedu" }, { "style", "width: 100%" }, { "df", ":-교육목적" } })</td>
</tr>
<tr>
<th>등급 <spn style="color:red;">*</spn></th> <th>등급 <spn style="color:red;">*</spn></th>
<td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typegrade"), new ViewDataDictionary { { "name", "completion.typegrade" }, { "style", "width: 100%" }, { "df", ":-등급" } })</td> <td>@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typegrade"), new ViewDataDictionary { { "name", "completion.typegrade" }, { "style", "width: 100%" }, { "df", ":-등급" } })</td>
</tr>
<tr>
<th>결제금액</th> <th>결제금액</th>
<td id="completion_payamt"></td> <td id="completion_payamt"></td>
<th>교육구분</th>
<td id="completion_edukind"></td>
</tr> </tr>
<tr> <tr>
<th>교육구분</th>
<td id="completion_edukind"></td>
<th>수료여부 <spn style="color:red;">*</spn></th> <th>수료여부 <spn style="color:red;">*</spn></th>
<td colspan="3">@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:미수료;1:수료" }, { "name", "completion.iscomplete" }, { "style", "width: 100%" } })</td> <td>@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:미수료;1:수료" }, { "name", "completion.iscomplete" }, { "style", "width: 100%" } })</td>
</tr> </tr>
</table> </table>
<h5>ㆍ환급정보</h5> <h5>ㆍ환급정보</h5>
@ -405,6 +418,15 @@
findcmscdshow(cmno); findcmscdshow(cmno);
} }
}); });
$("#completion_typejob").on("change", function () {
$(".jobTypeItems").css("display", "none")
let seltypeJobGroup = "typejob" + $(this).val();
$("[name='" + seltypeJobGroup + "']").each(function () {
$(this).css("display", "")
})
})
}); });
function bindCMScd(data) { function bindCMScd(data) {
$("#completion_cmisno").val(data.value); $("#completion_cmisno").val(data.value);
@ -456,6 +478,12 @@
$("#completion_" + key).val(capResult.obj[key]); $("#completion_" + key).val(capResult.obj[key]);
} }
} }
$("#completion_typejobItem").val(capResult.obj.typejobitem)
$(".jobTypeItems").css("display", "none");
$("[name='typejob" + $("#completion_typejob").val() + "']").each(function () {
$(this).css("display", "");
})
if (capResult.obj.cshape == 2) { if (capResult.obj.cshape == 2) {
$("#trcshape1").hide(); $("#trcshape1").hide();
$("#trcshape2").show(); $("#trcshape2").show();

65
BO/Views/croom/payview.cshtml
View File

@ -304,6 +304,7 @@
<th>교육기간</th> <th>교육기간</th>
<th>기술인분류</th> <th>기술인분류</th>
<th>직무분야</th> <th>직무분야</th>
<th>전문분야</th>
<th>교육목적</th> <th>교육목적</th>
<th>등급</th> <th>등급</th>
</tr> </tr>
@ -311,12 +312,13 @@
<td>@(Model.Lect.sdate != null ? Model.Lect.sdate.Value.ToString("yyyy-MM-dd") : "") ~ @(Model.Lect.edate != null ? Model.Lect.edate.Value.ToString("yyyy-MM-dd") : "")</td> <td>@(Model.Lect.sdate != null ? Model.Lect.sdate.Value.ToString("yyyy-MM-dd") : "") ~ @(Model.Lect.edate != null ? Model.Lect.edate.Value.ToString("yyyy-MM-dd") : "")</td>
<td>@Model.Lect.typemanname</td> <td>@Model.Lect.typemanname</td>
<td>@Model.Lect.typejobname</td> <td>@Model.Lect.typejobname</td>
<td>@Model.Lect.typejobitemname</td>
<td>@Model.Lect.typeeduname</td> <td>@Model.Lect.typeeduname</td>
<td>@Model.Lect.typegradename</td> <td>@Model.Lect.typegradename</td>
</tr> </tr>
</table> </table>
<div style="padding: 5px 10px; text-align: right;"> <div style="padding: 5px 10px; text-align: right;">
<a href="#" class="btn btn-primary" onclick="viewlect(this, @Model.Lect.ustatus, @Model.Lect.lectno, @Model.Lect.fileno, '@Model.Lect.fileurl', '@Model.Lect.orgname', @Model.Lect.status, @Model.Lect.pstatus,@Model.Lect.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}:{17}",Model.Lect.asname??"",Model.Lect.username, Model.Lect.userid??"", Model.Lect.uduty??"", Model.Lect.depart??"", Model.Lect.email, Model.Lect.telno, Model.Lect.mobile,Model.Lect.ckfcfyear,Model.Lect.assignuser,Model.Lect.edus,Model.Lect.sdate==null?"":Model.Lect.sdate.Value.ToString("yyyy-MM-dd"),Model.Lect.edate==null?"":Model.Lect.edate.Value.ToString("yyyy-MM-dd"),Model.Lect.typeman,Model.Lect.typejob,Model.Lect.typeedu,Model.Lect.typegrade,Model.Lect.pplno)')">수정</a><br /> <a href="#" class="btn btn-primary" onclick="viewlect(this, @Model.Lect.ustatus, @Model.Lect.lectno, @Model.Lect.fileno, '@Model.Lect.fileurl', '@Model.Lect.orgname', @Model.Lect.status, @Model.Lect.pstatus,@Model.Lect.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}:{16}:{17}:{18}",Model.Lect.asname??"",Model.Lect.username, Model.Lect.userid??"", Model.Lect.uduty??"", Model.Lect.depart??"", Model.Lect.email, Model.Lect.telno, Model.Lect.mobile,Model.Lect.ckfcfyear,Model.Lect.assignuser,Model.Lect.edus,Model.Lect.sdate==null?"":Model.Lect.sdate.Value.ToString("yyyy-MM-dd"),Model.Lect.edate==null?"":Model.Lect.edate.Value.ToString("yyyy-MM-dd"),Model.Lect.typeman,Model.Lect.typejob,Model.Lect.typeedu,Model.Lect.typegrade,Model.Lect.pplno,Model.Lect.typejobitem)')">수정</a><br />
</div> </div>
</section> </section>
if (Model.Lect.cshape == 2) if (Model.Lect.cshape == 2)
@ -367,10 +369,53 @@
<th>직무분야</th> <th>직무분야</th>
<td> <td>
<select class="form-control dev" id="selTypejob" name="selTypejob"> <select class="form-control dev" id="selTypejob" name="selTypejob">
@foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob")) @{
/*
int[] jobTypeSelItems = Array.ConvertAll(Model.Lect.typejobitems.Split(','), int.Parse);
string[] jobTypeItems = Model.ComCodes.Where(c => jobTypeSelItems.Contains(c.ccode)).Select(c => c.cgroup).Distinct().ToArray();
int[] jobTypeNos = new int[jobTypeItems.Length];
for(int cnt = 0; cnt < jobTypeNos.Length; cnt++)
{
jobTypeNos[cnt] = int.Parse(jobTypeItems[cnt].Replace("typejob", ""));
}
foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && jobTypeNos.Contains(w.ccode)))
{ {
<option value="@t.ccode">@t.cname</option> <option value="@t.ccode">@t.cname</option>
} }
*/
foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"))
{
<option value="@t.ccode">@t.cname</option>
}
}
</select>
</td>
</tr>
<tr>
<th>전문분야</th>
<td>
<select class="form-control dev" id="selTypejobItem" name="selTypejobItem">
@{
/*
var jobTypeGroup = Model.ComCodes.Where(c => c.ccode == Model.Lect.typejobitem).FirstOrDefault();
string jobTypeGroupCode = "";
if(jobTypeGroup != null)
{
jobTypeGroupCode = jobTypeGroup.cgroup;
}
foreach (var t in Model.ComCodes.Where(w => jobTypeItems.Contains(w.cgroup) && jobTypeSelItems.Contains(w.ccode)))
{
<option value="@t.ccode" class="jobTypeItems" name="@t.cgroup" style="display:@(jobTypeGroupCode == t.cgroup ? "" : "none")" @(t.ccode == Model.Lect.typejobitem ? "selected" : "")>@t.cname</option>
}
*/
List<string> tempList = ((string)ViewBag.JobTypeItems).Split(',').ToList();
foreach (var t in Model.ComCodes.Where(w => tempList.Contains(w.cgroup)))
{
<option value="@t.ccode" class="jobTypeItems" name="@t.cgroup">@t.cname</option>
}
}
</select> </select>
</td> </td>
</tr> </tr>
@ -437,7 +482,15 @@
@section scripts{ @section scripts{
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#selTypejob").on("change", function () {
$(".jobTypeItems").css("display", "none")
let seltypeJobGroup = "typejob" + $(this).val();
$("[name='" + seltypeJobGroup + "']").each(function () {
$(this).css("display", "")
})
})
}); });
function viewdvr(a) { function viewdvr(a) {
if ($(a).closest("td").find("input").val() == "") { if ($(a).closest("td").find("input").val() == "") {
@ -590,7 +643,12 @@
$("#selTypejob").val(ds[14]).attr("selected", "selected"); $("#selTypejob").val(ds[14]).attr("selected", "selected");
$("#selTypeedu").val(ds[15]).attr("selected", "selected"); $("#selTypeedu").val(ds[15]).attr("selected", "selected");
$("#selTypegrade").val(ds[16]).attr("selected", "selected"); $("#selTypegrade").val(ds[16]).attr("selected", "selected");
$("#selTypejobItem").val(ds[18])
$("#hidpplno").val(ds[17]); $("#hidpplno").val(ds[17]);
$(".jobTypeItems").css("display", "none");
$("[name='typejob" + $("#selTypejob").val() + "']").each(function () {
$(this).css("display", "");
})
} }
} }
function change() { function change() {
@ -615,7 +673,8 @@
typeman: $("#selTypeman").val(), typeman: $("#selTypeman").val(),
typejob: $("#selTypejob").val(), typejob: $("#selTypejob").val(),
typeedu: $("#selTypeedu").val(), typeedu: $("#selTypeedu").val(),
typegrade: $("#selTypegrade").val() typegrade: $("#selTypegrade").val(),
typejobitem: $("#selTypejobItem").val()
}, "afterUpdateType"); }, "afterUpdateType");
} }
} }

112
Base/Controller/ACommon.cs
View File

@ -9,6 +9,7 @@ using System.Collections;
using NP.Base.Auth; using NP.Base.Auth;
using NP.Base.ENUM; using NP.Base.ENUM;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Newtonsoft.Json;
namespace NP.Base.Controllers namespace NP.Base.Controllers
{ {
@ -551,7 +552,10 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult SaveNewcCode(String cg, string cn, int co = 0, int iu = 1) public JsonResult SaveNewcCode(String cg, string cn, int co = 0, int iu = 1)
{ {
return JsonOK(Dao.Save("mm.comcode.insert", new ComCode() { cname = cn, cgroup = cg, isuse = iu, corder = co, uno = SUserInfo.UserNo, uip = GetUserIP() })); //return JsonOK(Dao.Save("mm.comcode.insert", new ComCode() { cname = cn, cgroup = cg, isuse = iu, corder = co, uno = SUserInfo.UserNo, uip = GetUserIP() }));
var result = Dao.Save("mm.comcode.insert", new ComCode() { cname = cn, cgroup = cg, isuse = iu, corder = co, uno = SUserInfo.UserNo, uip = GetUserIP() });
SetFrontDepthHtml();
return JsonOK(result);
} }
/// <summary> /// <summary>
/// 공통코드 수정 /// 공통코드 수정
@ -564,8 +568,112 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult SaveCCode(int cc, string cn, int? co = null, int? iu = null) public JsonResult SaveCCode(int cc, string cn, int? co = null, int? iu = null)
{ {
return JsonOK(Dao.Save("mm.comcode.update", new ComCode() { ccode = cc, cname = cn, corder = co??-1, isuse = iu??-1, uno = SUserInfo.UserNo, uip = GetUserIP()})); //return JsonOK(Dao.Save("mm.comcode.update", new ComCode() { ccode = cc, cname = cn, corder = co??-1, isuse = iu??-1, uno = SUserInfo.UserNo, uip = GetUserIP()}));
var result = Dao.Save("mm.comcode.update", new ComCode() { ccode = cc, cname = cn, corder = co ?? -1, isuse = iu ?? -1, uno = SUserInfo.UserNo, uip = GetUserIP() });
SetFrontDepthHtml();
return JsonOK(result);
} }
[HttpPost]
// https://admin.ynicte2.com/acommon/SetFrontDepthHtml
public void SetFrontDepthHtml()
{
string result = "";
string[] depthListHeader = { "", "JOB|기술인분류", "OBJECT|교육목적", "GRADE|현재등급", "TYPE|직무분야", "TYPE2|전문분야" };
string[] tempArr;
Dictionary<string, int> depthList = new Dictionary<string, int>()
{
{ "typeman", 1}
,{ "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}
};
bool printCheck = true;
int tempCount = 0;
string tempStr = string.Join(",", depthList.Select(c => c.Key).ToList());
List<int> depthNos = depthList.Select(c => c.Value).ToList().Distinct().ToList();
List<string> tempList = new List<string>();
IList<ComCode> list = GetComCodes(tempStr);
IList<ComCode> items = new List<ComCode>();
foreach (int item in depthNos)
{
tempList = depthList.Where(c => c.Value == item).Select(c => c.Key).ToList();
items = list.Where(c => tempList.Contains(c.cgroup)).ToList();
tempArr = depthListHeader[item].Split('|');
result += "<li class=\"msCont\">\n";
result += "\t<em>" + tempArr[0] + "</em>\n";
result += "\t\t<div class=\"msSel disable\" id=\"msSel" + (item + 1) + "\">\n";
result += "\t\t\t<span>" + tempArr[1] + "</span>\n";
result += "\t\t\t<div>\n";
result += "\t\t\t\t<div>\n";
result += "\t\t\t\t\t<ul>\n";
foreach (var item2 in items)
{
if (item == 4)
{
tempStr = "typejob" + item2.ccode;
tempCount = list.Where(c => c.cgroup == tempStr).Count();
if (tempCount > 0)
{
printCheck = true;
}
else
{
printCheck = false;
}
}
else
{
printCheck = true;
}
if (printCheck)
{
result += "\t\t\t\t\t\t<li id=\"" + item2.cgroup.Replace("type", "li") + item2.refcode + "\"><a href=\"javascript: schIpt('" + (item + 1) + "', '" + item2.ccode + "', '" + item2.cname + "'); \">" + item2.cname + "</a></li>\n";
}
}
result += "\t\t\t\t\t</ul>\n";
result += "\t\t\t\t</div>\n";
result += "\t\t\t</div>\n";
result += "\t\t</div>\n";
result += "\t</li>\n";
}
result += "\t<li><a href=\"#\" class=\"msBtn\">검색/교육신청</a></li>\n";
string path = Server.MapPath("~/") + "\\Content\\homeDepth2.htm";
System.IO.StreamWriter sw = new System.IO.StreamWriter(path, false, System.Text.Encoding.UTF8);
sw.Write(result);
sw.Flush();
sw.Close();
//var settings = new JsonSerializerSettings();
//settings.TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Full;
//result = JsonConvert.SerializeObject(list, Formatting.Indented, settings);
//result = result.Replace("\r\n", "");
}
/// <summary> /// <summary>
/// 팝업 저장 /// 팝업 저장
/// </summary> /// </summary>

8
Base/Controller/ACommonCRoom.cs
View File

@ -1765,9 +1765,9 @@ namespace NP.Base.Controllers
/// <param name="typegrade"></param> /// <param name="typegrade"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public JsonResult PPlogTypeChange(Int64 pplno, string typeman, string typejob, string typeedu, string typegrade) public JsonResult PPlogTypeChange(Int64 pplno, string typeman, string typejob, string typeedu, string typegrade, string typejobitem)
{ {
return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade } })); return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade }, { "typejobitem", typejobitem } }));
} }
/// <summary> /// <summary>
/// 과거신청이력 /// 과거신청이력
@ -1800,13 +1800,15 @@ namespace NP.Base.Controllers
[HttpPost] [HttpPost]
public JsonResult Completion(Int64 lectno) public JsonResult Completion(Int64 lectno)
{ {
var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + jobTypeItems);
var completion = Dao.Get<Completion>("cr.completions", new Hashtable() { { "lectno", lectno } }).First(); var completion = Dao.Get<Completion>("cr.completions", new Hashtable() { { "lectno", lectno } }).First();
completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname; completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname;
completion.typegradeName = comCodes.Where(w => w.ccode == completion.typegrade).FirstOrDefault()?.cname; completion.typegradeName = comCodes.Where(w => w.ccode == completion.typegrade).FirstOrDefault()?.cname;
completion.typejobName = comCodes.Where(w => w.ccode == completion.typejob).FirstOrDefault()?.cname; completion.typejobName = comCodes.Where(w => w.ccode == completion.typejob).FirstOrDefault()?.cname;
completion.typemanName = comCodes.Where(w => w.ccode == completion.typeman).FirstOrDefault()?.cname; completion.typemanName = comCodes.Where(w => w.ccode == completion.typeman).FirstOrDefault()?.cname;
completion.studyplaceName = comCodes.Where(w => w.ccode == completion.studyplace).FirstOrDefault()?.cname; completion.studyplaceName = comCodes.Where(w => w.ccode == completion.studyplace).FirstOrDefault()?.cname;
return JsonBack(completion); return JsonBack(completion);
} }
/// <summary> /// <summary>

1
Base/Controller/FCommon.cs
View File

@ -268,6 +268,7 @@ namespace NP.Base.Controllers
pplog.typeedu = !string.IsNullOrEmpty(vm.stringval4) ? Convert.ToInt32(vm.stringval4) : (int?)null; pplog.typeedu = !string.IsNullOrEmpty(vm.stringval4) ? Convert.ToInt32(vm.stringval4) : (int?)null;
pplog.typegrade = !string.IsNullOrEmpty(vm.stringval5) ? Convert.ToInt32(vm.stringval5) : (int?)null; pplog.typegrade = !string.IsNullOrEmpty(vm.stringval5) ? Convert.ToInt32(vm.stringval5) : (int?)null;
pplog.typejob = !string.IsNullOrEmpty(vm.stringval6) ? Convert.ToInt32(vm.stringval6) : (int?)null; pplog.typejob = !string.IsNullOrEmpty(vm.stringval6) ? Convert.ToInt32(vm.stringval6) : (int?)null;
pplog.typejobItem = !string.IsNullOrEmpty(vm.stringval7) ? Convert.ToInt32(vm.stringval7) : (int?)null;
} }
else else
{ {

55
Base/Controller/FOCommon.cs
View File

@ -537,6 +537,61 @@ namespace NP.Base.Controllers
return JsonBack(result); return JsonBack(result);
} }
[HttpPost]
public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno)
{
int result = 0; // 0 이면 수강 가능, 그외 수강 불가
int userno = SUserInfo.UserNo;
string[] cgcodes = { "103", "104", "105" };
string[] edus = { "53", "54", "58" }; // 최초교육, 계속교육, 승급교육
// 등급 59: 초급, 60: 중급, 61: 고급, 62: 특급
if (man == "51" && cgcodes.Contains(cgcode) && edus.Contains(edu))
{
if (edu == "54" && (cgcode == "103" || cgcode == "104") && (grade == "59" || grade == "60")) // 계속교육, (103 or 104), (초급 or 중급)
{
result = 1; // 신청불가
}
else
{
int rst = 0;
if (edu == "53" && cgcode == "105") // 최초교육 , 105
{
rst = 0; // 신청가능
}
else if (edu == "54" && cgcode == "105" && (grade == "59" || grade == "60")) // 계속교육, 105, (초급 or 중급)
{
rst = 0; // 신청가능
}
else if (edu == "58" && (cgcode == "103" || cgcode == "104" || cgcode == "105") && (grade == "59" || grade == "60")) // 승급교육, (103 or 104 or 105), (초급 or 중급)
{
rst = 0; // 신청가능
}
else
{
/*
* 기본 설계 쿼리
select t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno
from lect t1
inner join cm t2 on t1.cmno = t2.cmno
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 = 103 -- and t1.userno=82 -- 82,5,31
*/
var lectCount = Dao.Get<int>("lect.count.user", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu } });
rst = lectCount.First();
}
result = rst == 0 ? 0 : 1;//
}
}
return JsonBack(result);
}
[HttpPost] [HttpPost]
public JsonResult UpdateScd(int cmisno, int lectno) public JsonResult UpdateScd(int cmisno, int lectno)
{ {

16
Dao/MyBatis/Maps/CM.xml
View File

@ -123,7 +123,7 @@
,a.cshape,a.infee,a.outfee,a.quota,a.accommofee ,a.cshape,a.infee,a.outfee,a.quota,a.accommofee
,a.introhtml,a.targethtml,a.goalhtml,a.contenthtml ,a.introhtml,a.targethtml,a.goalhtml,a.contenthtml
,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm,a.studydays,a.isaccommodation ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm,a.studydays,a.isaccommodation
,a.typeman,a.typeedu,a.typegrade,a.typejob,a.iscertificate ,a.typeman,a.typeedu,a.typegrade,a.typejob,a.iscertificate, a.typejobitem
,b.pcgno,b.cgcode cgcode ,b.pcgno,b.cgcode cgcode
,b.cgname,c.cgname pcgname ,b.cgname,c.cgname pcgname
,c.cgcode pcgcode ,c.cgcode pcgcode
@ -154,6 +154,7 @@
<isNotNull property="typeedu">and a.typeedu like concat('%',#typeedu#,'%')</isNotNull> <isNotNull property="typeedu">and a.typeedu like concat('%',#typeedu#,'%')</isNotNull>
<isNotNull property="typegrade">and a.typegrade like concat('%',#typegrade#,'%')</isNotNull> <isNotNull property="typegrade">and a.typegrade like concat('%',#typegrade#,'%')</isNotNull>
<isNotNull property="typejob">and a.typejob like concat('%',#typejob#,'%')</isNotNull> <isNotNull property="typejob">and a.typejob like concat('%',#typejob#,'%')</isNotNull>
<isNotNull property="typejobitem">and a.typejobitem like concat('%',#typejobitem#,'%')</isNotNull>
<isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull> <isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull>
<isNotNull property="cshapes">and a.cshape in ($cshapes$)</isNotNull> <isNotNull property="cshapes">and a.cshape in ($cshapes$)</isNotNull>
<isNotEmpty property="cname">and a.cname like concat('%',#cname#,'%')</isNotEmpty> <isNotEmpty property="cname">and a.cname like concat('%',#cname#,'%')</isNotEmpty>
@ -239,11 +240,11 @@
insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape
,infee,outfee,accommofee,quota ,infee,outfee,accommofee,quota
,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime ,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isdel,isseq,fgnocm,typeman,typeedu,typegrade,typejob,iscertificate,ischkatt,isaccommodation,daylectinninglimit,<include refid="sql.inc"></include>) ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isdel,isseq,fgnocm,typeman,typeedu,typegrade,typejob,typejobitem,iscertificate,ischkatt,isaccommodation,daylectinninglimit,<include refid="sql.inc"></include>)
values (#ismaster#,#cgno#,#pcmno#,#cname#,#kname#,#tmno#,#classno#,#rstime#,#retime#,#sstime#,#setime#,#gstime#,#getime#,#cshape# values (#ismaster#,#cgno#,#pcmno#,#cname#,#kname#,#tmno#,#classno#,#rstime#,#retime#,#sstime#,#setime#,#gstime#,#getime#,#cshape#
,#infee#,#outfee#,#accommofee#,#quota# ,#infee#,#outfee#,#accommofee#,#quota#
,#introhtml#,#targethtml#,#goalhtml#,#contenthtml# ,#introhtml#,#targethtml#,#goalhtml#,#contenthtml#
,#studyplace#,#studytime#,#certcc#,#certgradecc#,#jobcc#,#jobpositiongrade#,#difficulty#,#isrefund#,#isuse#,0,#isseq#,#fgnocm#,#typeman#,#typeedu#,#typegrade#,#typejob#,#iscertificate#,#ischkatt#,#isaccommodation#,10,<include refid="sql.inv"></include>); ,#studyplace#,#studytime#,#certcc#,#certgradecc#,#jobcc#,#jobpositiongrade#,#difficulty#,#isrefund#,#isuse#,0,#isseq#,#fgnocm#,#typeman#,#typeedu#,#typegrade#,#typejob#,#typejobitem#,#iscertificate#,#ischkatt#,#isaccommodation#,10,<include refid="sql.inv"></include>);
<selectKey type="post" property="cmno" resultClass="int">SELECT LAST_INSERT_ID()</selectKey> <selectKey type="post" property="cmno" resultClass="int">SELECT LAST_INSERT_ID()</selectKey>
</insert> </insert>
<update id="cm.cmup" parameterClass="hashtable"> <update id="cm.cmup" parameterClass="hashtable">
@ -281,6 +282,7 @@
,typeedu =#typeedu# ,typeedu =#typeedu#
,typegrade =#typegrade# ,typegrade =#typegrade#
,typejob =#typejob# ,typejob =#typejob#
,typejobitem =#typejobitem#
,iscertificate =#iscertificate# ,iscertificate =#iscertificate#
,ischkatt =#ischkatt# ,ischkatt =#ischkatt#
,studydays =#studydays# ,studydays =#studydays#
@ -1325,7 +1327,7 @@
order by dtype,intval,longval2 order by dtype,intval,longval2
</select> </select>
<insert id="cm.cmcopy0" parameterClass="cm"> <insert id="cm.cmcopy0" parameterClass="cm">
insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,typejobItem,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,iscertificate,isdel,studydays,isaccommodation,daylectinninglimit,<include refid="sql.inc"></include>) ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,iscertificate,isdel,studydays,isaccommodation,daylectinninglimit,<include refid="sql.inc"></include>)
select #ismaster#,cgno,case when a.ismaster = 1 and #ismaster# = 0 then a.cmno else a.pcmno end,ifnull(#cname#, concat('사본_', cname)),a.kname,#tmno# select #ismaster#,cgno,case when a.ismaster = 1 and #ismaster# = 0 then a.cmno else a.pcmno end,ifnull(#cname#, concat('사본_', cname)),a.kname,#tmno#
,case when #tmno# is null then null else ifnull(b.classno,0)+1 end ,case when #tmno# is null then null else ifnull(b.classno,0)+1 end
@ -1335,7 +1337,7 @@
,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.setime,'%Y-%m-%d 23:59:59') end ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.setime,'%Y-%m-%d 23:59:59') end
,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else t.gstime end ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else t.gstime end
,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.getime,'%Y-%m-%d 23:59:59') end ,case when date_format(a.retime,'%Y-%m-%d')='2099-12-31' then null else date_format(t.getime,'%Y-%m-%d 23:59:59') end
,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob, a.typejobItem,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,a.iscertificate,0,studydays,isaccommodation,daylectinninglimit,<include refid="sql.inv"></include> ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,a.iscertificate,0,studydays,isaccommodation,daylectinninglimit,<include refid="sql.inv"></include>
from cm a from cm a
left outer join ( left outer join (
@ -1992,10 +1994,10 @@
SELECT * FROM (SELECT LAST_INSERT_ID(0) col1) a WHERE col1 > 0; SELECT * FROM (SELECT LAST_INSERT_ID(0) col1) a WHERE col1 > 0;
insert into pplog ( insert into pplog (
userno,cmno,isready,cgcode,cshape,typeman,typeedu,typegrade,typejob,cgno,cmisno,isrebate,rbankname,rbankacc,rbankowner,asname,brno,ceoname,post,address1,address2,btype,bkind,eino,mname userno,cmno,isready,cgcode,cshape,typeman,typeedu,typegrade,typejob,typejobItem,cgno,cmisno,isrebate,rbankname,rbankacc,rbankowner,asname,brno,ceoname,post,address1,address2,btype,bkind,eino,mname
,mphone,taxemail,userpno,mobile,email,upost,uaddress1,uaddress2,isassignuser,uduty,slevel,isaccommodation,<include refid="sql.inc"></include>) ,mphone,taxemail,userpno,mobile,email,upost,uaddress1,uaddress2,isassignuser,uduty,slevel,isaccommodation,<include refid="sql.inc"></include>)
values ( values (
#userno#,#cmno#,#isready#,#cgcode#,#cshape#,#typeman#,#typeedu#,#typegrade#,#typejob#,#cgno#,#cmisno#,#isrebate#,#rbankname# #userno#,#cmno#,#isready#,#cgcode#,#cshape#,#typeman#,#typeedu#,#typegrade#,#typejob#,#typejobItem#,#cgno#,#cmisno#,#isrebate#,#rbankname#
,HEX(AES_ENCRYPT(#rbankacc#, <include refid="sql.digest"></include>)) ,HEX(AES_ENCRYPT(#rbankacc#, <include refid="sql.digest"></include>))
,#rbankowner#,#asname#,#brno#,#ceoname#,#post#,#address1# ,#rbankowner#,#asname#,#brno#,#ceoname#,#post#,#address1#
,#address2#,#btype#,#bkind#,#eino#,#mname# ,#address2#,#btype#,#bkind#,#eino#,#mname#

3
Dao/MyBatis/Maps/CRoom.xml
View File

@ -1623,7 +1623,7 @@
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
,p.payamt,p.payoktime ,p.payamt,p.payoktime
,case when ifnull(cmi.estart,now()) &lt; '2021-08-15' then p.payoktime else p.cdt end paycdt ,case when ifnull(cmi.estart,now()) &lt; '2021-08-15' then p.payoktime else p.cdt end paycdt
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob, pp.typejobitem
,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone ,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
@ -1703,6 +1703,7 @@
<isNotNull property="typejob">,typejob=#typejob#</isNotNull> <isNotNull property="typejob">,typejob=#typejob#</isNotNull>
<isNotNull property="typeedu">,typeedu=#typeedu#</isNotNull> <isNotNull property="typeedu">,typeedu=#typeedu#</isNotNull>
<isNotNull property="typegrade">,typegrade=#typegrade#</isNotNull> <isNotNull property="typegrade">,typegrade=#typegrade#</isNotNull>
<isNotNull property="typejobitem">,typejobitem=#typejobitem#</isNotNull>
<isNotNull property="rbank">,rbankname=#rbank#</isNotNull> <isNotNull property="rbank">,rbankname=#rbank#</isNotNull>
<isNotNull property="rbankaccnum">,rbankacc=HEX(AES_ENCRYPT(#rbankaccnum#, <include refid="sql.digest"></include>))</isNotNull> <isNotNull property="rbankaccnum">,rbankacc=HEX(AES_ENCRYPT(#rbankaccnum#, <include refid="sql.digest"></include>))</isNotNull>
<isNotNull property="rbankuser">,rbankowner=#rbankuser#</isNotNull> <isNotNull property="rbankuser">,rbankowner=#rbankuser#</isNotNull>

16
Dao/MyBatis/Maps/Lect.xml
View File

@ -173,9 +173,10 @@
,a2.rstime,a2.retime,a.sdate sstime,a.edate setime,a2.cshape,a2.studydays ,a2.rstime,a2.retime,a.sdate sstime,a.edate setime,a2.cshape,a2.studydays
,a.sdate,a.edate,a.isrebate,a.iscomplete ,a.sdate,a.edate,a.isrebate,a.iscomplete
,scd.estart,scd.eend,scd.studyplace ,scd.estart,scd.eend,scd.studyplace
,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob, pp.pplno ,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob, pp.typejobitem, pp.pplno
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.payno,a.pino</isNull>) rno ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.payno,a.pino</isNull>) rno
,count(a.cdt) over() pagetotalcount ,count(a.cdt) over() pagetotalcount
,a2.typejobitem as typejobitems
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
left outer join fileinfo af on af.fgno=a.fgno and af.isdel=0 left outer join fileinfo af on af.fgno=a.fgno and af.isdel=0
@ -1919,6 +1920,19 @@
<isNotEmpty property="eqnos">and b.eqno in ($eqnos$)</isNotEmpty> <isNotEmpty property="eqnos">and b.eqno in ($eqnos$)</isNotEmpty>
order by e.qno,e.qino order by e.qno,e.qino
</select> </select>
<select id="lect.count.user" parameterClass="hashtable" resultClass="int">
select count(t1.lectno) <!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno-->
from lect t1
inner join cm t2 on t1.cmno = t2.cmno
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 = #cgcode#
<isNotNull property="userno">and t1.userno = #userno#</isNotNull>
<isNotEmpty property="edu">
<isNotEqual property="edu" compareValue="53">and t5.typegrade in (61,62)</isNotEqual>
</isNotEmpty>
</select>
</statements> </statements>
</sqlMap> </sqlMap>

1
Dao/MyBatis/Maps/Pay.xml
View File

@ -1121,6 +1121,7 @@
,typejob = #typejob# ,typejob = #typejob#
,typeedu = #typeedu# ,typeedu = #typeedu#
,typegrade = #typegrade# ,typegrade = #typegrade#
,typejobitem = #typejobitem#
where pplno = #pplno# where pplno = #pplno#
</update> </update>
<update id="pay.pplog.up" parameterClass="hashtable"> <update id="pay.pplog.up" parameterClass="hashtable">

25
FO/Controllers/CourseController.cs
View File

@ -769,7 +769,7 @@ namespace NP.FO.Controllers
if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval)) if (vm.stringval == "0" || string.IsNullOrEmpty(vm.stringval))
{ {
vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "typeman", vm.stringval3 }, { "typeedu", vm.stringval4 }, { "typegrade", vm.stringval5 }, { "typejob", vm.stringval6 } }).Where(w=>w.isuse == 1).ToList(); vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", "1" }, { "cshape", vm.stringval2 }, { "typeman", vm.stringval3 }, { "typeedu", vm.stringval4 }, { "typegrade", vm.stringval5 }, { "typejob", vm.stringval6 }, { "typejobitem", vm.stringval7 } }).Where(w=>w.isuse == 1).ToList();
} }
else if (vm.stringval == "1") else if (vm.stringval == "1")
{ {
@ -780,6 +780,7 @@ namespace NP.FO.Controllers
vm.ComCodes4 = GetComCodes("typegrade"); vm.ComCodes4 = GetComCodes("typegrade");
vm.ComCodes5 = GetComCodes("typejob"); vm.ComCodes5 = GetComCodes("typejob");
bool getComCheck = true;
var typeman = vm.ComCodes2.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval3) ? int.Parse(vm.stringval3) : 0)).FirstOrDefault(); var typeman = vm.ComCodes2.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval3) ? int.Parse(vm.stringval3) : 0)).FirstOrDefault();
var typemanName = typeman != null ? typeman.cname : string.Empty; var typemanName = typeman != null ? typeman.cname : string.Empty;
var typeedu = vm.ComCodes3.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval4) ? int.Parse(vm.stringval4) : 0)).FirstOrDefault(); var typeedu = vm.ComCodes3.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval4) ? int.Parse(vm.stringval4) : 0)).FirstOrDefault();
@ -825,10 +826,30 @@ namespace NP.FO.Controllers
vm.ComCodes3 = vm.ComCodes3.Where(x => x.ccode == 0).ToList(); vm.ComCodes3 = vm.ComCodes3.Where(x => x.ccode == 0).ToList();
vm.ComCodes4 = vm.ComCodes4.Where(x => x.ccode == 0).ToList(); vm.ComCodes4 = vm.ComCodes4.Where(x => x.ccode == 0).ToList();
vm.ComCodes5 = vm.ComCodes5.Where(x => x.ccode == 0).ToList(); vm.ComCodes5 = vm.ComCodes5.Where(x => x.ccode == 0).ToList();
vm.ComCodes6 = vm.ComCodes6.Where(x => x.ccode == 0).ToList();
getComCheck = false;
}
if (getComCheck)
{
vm.ComCodes6 = GetComCodes("typejob" + vm.stringval6);
} }
return View(vm); return View(vm);
} }
//private string GetComCode6CodeList(IList<ComCode> comCodes)
//{
// string result = "";
// foreach(var item in comCodes)
// {
// result += (result == "" ? "" : ",") + "typejob" + item.ccode;
// }
// return result;
//}
[NP.Base.Auth.CFilter] [NP.Base.Auth.CFilter]
public ActionResult ApplyEdu(VMCourse vm) public ActionResult ApplyEdu(VMCourse vm)
{ {
@ -1027,7 +1048,7 @@ namespace NP.FO.Controllers
} }
vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First(); vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First();
vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First(); vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First();
vm.ComCodes = GetComCodes("typeman,typejob,studyplace"); vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83");
vm.ComCodes2 = GetComCodes("typeman"); vm.ComCodes2 = GetComCodes("typeman");
vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes3 = GetComCodes("typeedu");
vm.ComCodes4 = GetComCodes("typegrade"); vm.ComCodes4 = GetComCodes("typegrade");

18
FO/Controllers/HomeController.cs
View File

@ -6,6 +6,9 @@ using System.Web.Mvc;
using NP.Model; using NP.Model;
using NP.Base; using NP.Base;
using System.Net;
using System.IO;
namespace NP.FO.Controllers namespace NP.FO.Controllers
{ {
public class HomeController : FOOpenBaseController public class HomeController : FOOpenBaseController
@ -29,6 +32,21 @@ namespace NP.FO.Controllers
{ {
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");
requestHttp.Method = WebRequestMethods.Http.Get;
var resp = requestHttp.GetResponse() as System.Net.HttpWebResponse;
var receiveStream = resp.GetResponseStream();
StreamReader readStream = new System.IO.StreamReader(receiveStream, System.Text.Encoding.UTF8);
ViewBag.depthHtml = (readStream.ReadToEnd());
requestHttp = (HttpWebRequest)HttpWebRequest.Create(urlStr + "/Content/homeDepth2.htm");
requestHttp.Method = WebRequestMethods.Http.Get;
resp = requestHttp.GetResponse() as System.Net.HttpWebResponse;
receiveStream = resp.GetResponseStream();
readStream = new System.IO.StreamReader(receiveStream, System.Text.Encoding.UTF8);
ViewBag.depthHtml += (readStream.ReadToEnd());
ViewBag.POPUPS = GetPOPUP; ViewBag.POPUPS = GetPOPUP;
ViewBag.POPUPXS = CookieGet("popup", ""); ViewBag.POPUPXS = CookieGet("popup", "");

7
FO/FO.csproj
View File

@ -762,15 +762,14 @@
<VisualStudio> <VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties> <WebProjectProperties>
<UseIIS>True</UseIIS> <UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>49399</DevelopmentServerPort> <DevelopmentServerPort>49399</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>https://ynicte.com</IISUrl> <IISUrl>https://ynicte.com</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer> <UseCustomServer>True</UseCustomServer>
<CustomServerUrl> <CustomServerUrl>https://ynicte.com</CustomServerUrl>
</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>

9
FO/Views/Course/ApplyAgree.cshtml
View File

@ -10,6 +10,7 @@
<input type="hidden" name="stringval4" value="@Model.stringval4" />@*교육목적*@ <input type="hidden" name="stringval4" value="@Model.stringval4" />@*교육목적*@
<input type="hidden" name="stringval5" value="@Model.stringval5" />@*등급*@ <input type="hidden" name="stringval5" value="@Model.stringval5" />@*등급*@
<input type="hidden" name="stringval6" value="@Model.stringval6" />@*직무분야*@ <input type="hidden" name="stringval6" value="@Model.stringval6" />@*직무분야*@
<input type="hidden" name="stringval7" value="@Model.stringval7" />@*전문분야*@
<input type="hidden" name="pplno" value="@Model.pplno" />@*pplno*@ <input type="hidden" name="pplno" value="@Model.pplno" />@*pplno*@
<input type="hidden" name="selMonth" value="@Model.selMonth" />@*교육일정선택(selMonth)*@ <input type="hidden" name="selMonth" value="@Model.selMonth" />@*교육일정선택(selMonth)*@
<input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@ <input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
@ -101,6 +102,10 @@
{ {
<th>직무분야</th> <th>직무분야</th>
} }
@if (!string.IsNullOrEmpty(Model.stringval7))
{
<th>전문분야</th>
}
</tr> </tr>
<tr> <tr>
<td>@(Model.stringval2 == "0" ? "온라인교육" : Model.stringval2 == "1" ? "교육장교육" : "온라인교육")</td> <td>@(Model.stringval2 == "0" ? "온라인교육" : Model.stringval2 == "1" ? "교육장교육" : "온라인교육")</td>
@ -120,6 +125,10 @@
{ {
<td>@Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == int.Parse(Model.stringval6)).First().cname</td> <td>@Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob" && w.ccode == int.Parse(Model.stringval6)).First().cname</td>
} }
@if (!string.IsNullOrEmpty(Model.stringval7))
{
<td>@Model.ComCodes.Where(w => w.ccode == int.Parse(Model.stringval7)).First().cname</td>
}
</tr> </tr>
</table> </table>
} }

2
FO/Views/Course/ApplyEdu.cshtml
View File

@ -10,6 +10,7 @@
<input type="hidden" name="stringval4" value="@Model.stringval4" />@*교육목적*@ <input type="hidden" name="stringval4" value="@Model.stringval4" />@*교육목적*@
<input type="hidden" name="stringval5" value="@Model.stringval5" />@*등급*@ <input type="hidden" name="stringval5" value="@Model.stringval5" />@*등급*@
<input type="hidden" name="stringval6" value="@Model.stringval6" />@*직무분야*@ <input type="hidden" name="stringval6" value="@Model.stringval6" />@*직무분야*@
<input type="hidden" name="stringval7" value="@Model.stringval7" />@*전문분야*@
<input type="hidden" name="pplno" value="@Model.pplno" />@*pplno*@ <input type="hidden" name="pplno" value="@Model.pplno" />@*pplno*@
<input type="hidden" name="selMonth" value="@Model.selMonth" />@*교육일정선택(selMonth)*@ <input type="hidden" name="selMonth" value="@Model.selMonth" />@*교육일정선택(selMonth)*@
<input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@ <input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
@ -22,6 +23,7 @@
<input type="hidden" name="stringval4" id="stringval4" value="@Model.stringval4" />@*교육목적*@ <input type="hidden" name="stringval4" id="stringval4" value="@Model.stringval4" />@*교육목적*@
<input type="hidden" name="stringval5" id="stringval5" value="@Model.stringval5" />@*등급*@ <input type="hidden" name="stringval5" id="stringval5" value="@Model.stringval5" />@*등급*@
<input type="hidden" name="stringval6" id="stringval6" value="@Model.stringval6" />@*직무분야*@ <input type="hidden" name="stringval6" id="stringval6" value="@Model.stringval6" />@*직무분야*@
<input type="hidden" name="stringval7" id="stringval7" value="@Model.stringval7" />@*전문분야*@
<input type="hidden" name="cmisno" id="cmisno" /> <input type="hidden" name="cmisno" id="cmisno" />
<input type="hidden" name="applicableCM" id="applicableCM" /> <input type="hidden" name="applicableCM" id="applicableCM" />
<input type="hidden" name="cshape" id="cshape" value="@Model.CM.cshape" /> <input type="hidden" name="cshape" id="cshape" value="@Model.CM.cshape" />

29
FO/Views/Course/SmartSearch.cshtml
View File

@ -33,6 +33,9 @@
<li> <li>
@Html.DropDownListFor(x => x.stringval6, new SelectList(Model.ComCodes5, "ccode", "cname"), "-선택-") @Html.DropDownListFor(x => x.stringval6, new SelectList(Model.ComCodes5, "ccode", "cname"), "-선택-")
</li> </li>
<li>
@Html.DropDownListFor(x => x.stringval7, new SelectList(Model.ComCodes6, "ccode", "cname"), "-선택-")
</li>
<li><a href="#" id="btnSearch">검색</a></li> <li><a href="#" id="btnSearch">검색</a></li>
</ul> </ul>
} }
@ -92,6 +95,7 @@
} }
</ul> </ul>
} }
<input type="hidden" id="pcmno_@(item.cmno)_cgcode" value="@(item.cgcode)" />
<ul class="smtlChk" id="ulSubCm_@item.cmno"></ul> <ul class="smtlChk" id="ulSubCm_@item.cmno"></ul>
</li> </li>
} }
@ -314,7 +318,7 @@
var li = $("<li />"); var li = $("<li />");
var p = $("<p />"); var p = $("<p />");
var a = $("<a />", { "onclick": "javascript:openIntro(" + d.cmno + ");" }); var a = $("<a />", { "onclick": "javascript:openIntro(" + d.cmno + ");" });
var a2 = $("<a />", { "onclick": "javascript:applyClass(" + d.cmno +");" }); var a2 = $("<a />", { "onclick": "javascript:applyClass(" + d.cmno + ", " + d.pcmno +");" });
var spanIntro = $("<span />", { "class": "smtlChkBtn smtlChk01", "style":"right:130px; font-size:18px;"}); var spanIntro = $("<span />", { "class": "smtlChkBtn smtlChk01", "style":"right:130px; font-size:18px;"});
var span = $("<span />", { "class": "smtlChkBtn smtlChk03" , "style": "font-size:18px" }); var span = $("<span />", { "class": "smtlChkBtn smtlChk03" , "style": "font-size:18px" });
@ -362,9 +366,9 @@
} }
} }
function applyClass(cmno) { function applyClass(cmno, pcmno) {
if (@ViewBag.SSUserNo > 0) { if (@ViewBag.SSUserNo > 0) {
checkLectIsComplete(cmno); checkLectComplete(cmno, "@Model.stringval3", "@Model.stringval5", "@Model.stringval5", $("#pcmno_" + pcmno + "_cgcode").val(), "chkLect");
} }
else { else {
msg("로그인 후 신청 할 수 있습니다."); msg("로그인 후 신청 할 수 있습니다.");
@ -372,6 +376,25 @@
} }
} }
function checkLectComplete(cmno, man, edu, grade, cgcode) {
_cmno = cmno;
capp("/focommon/GetCheckLectIs", { cmno: cmno, man: man, edu: edu, grade: grade, cgcode: cgcode }, "chkLect");
}
function chkLect() {
if (capResult.code == 1000) {
if (capResult.obj == 0) {
checkLectIsComplete(_cmno);
}
else {
msg("이미 같은 교육목적과 등급으로 신청 또는 이수한 내역이 있습니다.");
}
}
else {
msg("정보를 조회할 수 없습니다.");
}
}
function checkLectIsComplete(cmno) { function checkLectIsComplete(cmno) {
_cmno = cmno; _cmno = cmno;
capp("/focommon/GetCheckLectIsComplete", { cmno: cmno }, "check"); capp("/focommon/GetCheckLectIsComplete", { cmno: cmno }, "check");

156
FO/Views/Home/Index.cshtml
View File

@ -25,6 +25,7 @@
<input type="hidden" id="sch3" value="" /> <input type="hidden" id="sch3" value="" />
<input type="hidden" id="sch4" value="" /> <input type="hidden" id="sch4" value="" />
<input type="hidden" id="sch5" value="" /> <input type="hidden" id="sch5" value="" />
<input type="hidden" id="sch6" value="" />
<input type="hidden" name="stringval" id="stringval" value="" /> <input type="hidden" name="stringval" id="stringval" value="" />
<input type="hidden" name="stringval2" id="stringval2" value="" /> <input type="hidden" name="stringval2" id="stringval2" value="" />
@ -32,9 +33,30 @@
<input type="hidden" name="stringval4" id="stringval4" value="" /> <input type="hidden" name="stringval4" id="stringval4" value="" />
<input type="hidden" name="stringval5" id="stringval5" value="" /> <input type="hidden" name="stringval5" id="stringval5" value="" />
<input type="hidden" name="stringval6" id="stringval6" value="" /> <input type="hidden" name="stringval6" id="stringval6" value="" />
<input type="hidden" name="stringval7" id="stringval7" value="" />
@if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "") @if (Model.stringval == "0" || Model.stringval == null || Model.stringval == "")
{ {
<style>
.container {
max-width: 1200px
}
.mainSch > li {
width: 14%
}
.msBtn:after {
content: '';
display: inline-block;
width: 21px;
height: 17px;
margin-left: 10px;
background: url(../../img/main/main_search_btn.png)no-repeat right center;
background-size: cover;
}
</style>
<ul class="mainTab"> <ul class="mainTab">
<li class="current" id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li> <li class="current" id="liTab1"><a href="#" style="font-size:16pt;">건설기술진흥법교육</a></li>
<li id="liTab2" style="display:none;"><a href="#" style="font-size:16pt;">기타교육</a></li> <li id="liTab2" style="display:none;"><a href="#" style="font-size:16pt;">기타교육</a></li>
@ -42,86 +64,7 @@
if (Model.ComCodes != null) if (Model.ComCodes != null)
{ {
<ul class="mainSch"> <ul class="mainSch">
<li class="msCont"> @MvcHtmlString.Create(ViewBag.depthHtml)
<em>SKILL</em>
<div class="msSel active" id="msSel1">
<span>교육유형</span>
<div>
<div>
<ul>
@*<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>*@
@*<li><a href="javascript:schIpt('1', '1', '교육장교육');">교육장교육</a></li>*@
<li><a href="javascript:schIpt('1', '2', '온라인교육');">온라인교육</a></li>
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>JOB</em>
<div class="msSel disable" id="msSel2">
<span>기술인분류</span>
<div>
<div>
<ul>
@foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"))
{
<li id="liman@(t.refcode)"><a href="javascript:schIpt('2', '@t.ccode', '@t.cname');">@t.cname</a></li>
}
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>OBJECT</em>
<div class="msSel disable" id="msSel3">
<span>교육목적</span>
<div>
<div>
<ul>
@foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu"))
{
<li id="liedu@(t.refcode)"><a href="javascript:schIpt('3', '@t.ccode', '@t.cname');">@t.cname</a></li>
}
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>GRADE</em>
<div class="msSel disable" id="msSel4">
<span>등급</span>
<div>
<div>
<ul>
@foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade"))
{
<li id="liGrade@(t.refcode)"><a href="javascript:schIpt('4', '@t.ccode', '@t.cname');">@t.cname</a></li>
}
</ul>
</div>
</div>
</div>
</li>
<li class="msCont">
<em>TYPE</em>
<div class="msSel disable" id="msSel5">
<span>직무분야</span>
<div>
<div>
<ul>
@foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"))
{
<li id="liJob@(t.corder)"><a href="javascript:schIpt('5', '@t.ccode', '@t.cname');">@t.cname</a></li>
}
</ul>
</div>
</div>
</div>
</li>
<li><a href="#" class="msBtn">검색/교육신청</a></li>
</ul> </ul>
} }
else else
@ -184,10 +127,10 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="liGrade01"><a href="javascript:schIpt('4', '36', '초급');">초급</a></li> <li id="ligrade01"><a href="javascript:schIpt('4', '36', '초급');">초급</a></li>
<li id="liGrade02"><a href="javascript:schIpt('4', '37', '중급');">중급</a></li> <li id="ligrade02"><a href="javascript:schIpt('4', '37', '중급');">중급</a></li>
<li id="liGrade03"><a href="javascript:schIpt('4', '38', '고급');">고급</a></li> <li id="ligrade03"><a href="javascript:schIpt('4', '38', '고급');">고급</a></li>
<li id="liGrade04"><a href="javascript:schIpt('4', '39', '특급');">특급</a></li> <li id="ligrade04"><a href="javascript:schIpt('4', '39', '특급');">특급</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -200,17 +143,17 @@
<div> <div>
<div> <div>
<ul> <ul>
<li id="liJob1"><a href="javascript:schIpt('5', '40', '토목');">토목</a></li> <li id="lijob1"><a href="javascript:schIpt('5', '40', '토목');">토목</a></li>
<li id="liJob2"><a href="javascript:schIpt('5', '41', '건축');">건축</a></li> <li id="lijob2"><a href="javascript:schIpt('5', '41', '건축');">건축</a></li>
<li id="liJob3"><a href="javascript:schIpt('5', '42', '기계');">기계</a></li> <li id="lijob3"><a href="javascript:schIpt('5', '42', '기계');">기계</a></li>
<li id="liJob4"><a href="javascript:schIpt('5', '43', '조경');">조경</a></li> <li id="lijob4"><a href="javascript:schIpt('5', '43', '조경');">조경</a></li>
<li id="liJob5"><a href="javascript:schIpt('5', '44', '환경');">환경</a></li> <li id="lijob5"><a href="javascript:schIpt('5', '44', '환경');">환경</a></li>
<li id="liJob6"><a href="javascript:schIpt('5', '45', '광업');">광업</a></li> <li id="lijob6"><a href="javascript:schIpt('5', '45', '광업');">광업</a></li>
<li id="liJob7"><a href="javascript:schIpt('5', '46', '안전관리');">안전관리</a></li> <li id="lijob7"><a href="javascript:schIpt('5', '46', '안전관리');">안전관리</a></li>
<li id="liJob8"><a href="javascript:schIpt('5', '47', '도시교통');">도시교통</a></li> <li id="lijob8"><a href="javascript:schIpt('5', '47', '도시교통');">도시교통</a></li>
<li id="liJob9"><a href="javascript:schIpt('5', '48', '전기전자');">전기전자</a></li> <li id="lijob9"><a href="javascript:schIpt('5', '48', '전기전자');">전기전자</a></li>
<li id="liJob10"><a href="javascript:schIpt('5', '49', '건설지원');">건설지원</a></li> <li id="lijob10"><a href="javascript:schIpt('5', '49', '건설지원');">건설지원</a></li>
<li id="liJob11"><a href="javascript:schIpt('5', '57', '품질관리');">품질관리</a></li> <li id="lijob11"><a href="javascript:schIpt('5', '57', '품질관리');">품질관리</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -350,6 +293,7 @@
$("#stringval4").val($("#sch3").val()); $("#stringval4").val($("#sch3").val());
$("#stringval5").val($("#sch4").val()); $("#stringval5").val($("#sch4").val());
$("#stringval6").val($("#sch5").val()); $("#stringval6").val($("#sch5").val());
$("#stringval7").val($("#sch6").val());
if ($("#stringval").val() == "0") { if ($("#stringval").val() == "0") {
if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; } if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; }
@ -357,6 +301,7 @@
if ($("#stringval4").val() == "") { msg("교육목적을 입력하세요."); $("#stringval4").focus(); return; } if ($("#stringval4").val() == "") { msg("교육목적을 입력하세요."); $("#stringval4").focus(); return; }
if ($("#stringval5").val() == "") { msg("등급을 입력하세요."); $("#stringval5").focus(); return; } if ($("#stringval5").val() == "") { msg("등급을 입력하세요."); $("#stringval5").focus(); return; }
if ($("#stringval6").val() == "") { msg("직무분야를 입력하세요."); $("#stringval6").focus(); return; } if ($("#stringval6").val() == "") { msg("직무분야를 입력하세요."); $("#stringval6").focus(); return; }
if ($("#stringval7").val() == "") { msg("전문분야를 입력하세요."); $("#stringval6").focus(); return; }
} }
else if ($("#stringval").val() == "1") { else if ($("#stringval").val() == "1") {
if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; } if ($("#stringval2").val() == "") { msg("교육유형을 입력하세요."); $("#stringval2").focus(); return; }
@ -386,6 +331,8 @@
msg('교육목적을 선택해주세요.'); msg('교육목적을 선택해주세요.');
} else if ($(this).parent().attr('id') == 'msSel5') { } else if ($(this).parent().attr('id') == 'msSel5') {
msg('등급을 선택해주세요.'); msg('등급을 선택해주세요.');
} else if ($(this).parent().attr('id') == 'msSel6') {
msg('전문분야를 선택해주세요.');
} }
} }
}); });
@ -412,6 +359,17 @@
$('#msSel5 > span').text("직무분야"); $('#msSel5 > span').text("직무분야");
$('#msSel5').removeClass('active'); $('#msSel5').removeClass('active');
$('#msSel5').addClass('disable'); $('#msSel5').addClass('disable');
case '5':
$('#msSel6 > span').text("전문분야");
$('#msSel6').removeClass('active');
$('#msSel6').addClass('disable');
}
if (num == 5) {
$("#msSel6 li").css("display", "none")
//msSel5Code = code;
$("[id='lijob" + code + "']").css("display", "")
} }
$('#sch' + num).val(code); $('#sch' + num).val(code);
@ -451,7 +409,7 @@
} }
}); });
} else if (num == 2 && name != "품질관리기술인") { } else if (num == 2 && name != "품질관리기술인") {
$("#liJob11").hide(); $("#lijob11").hide();
} }
if (num == 3) { if (num == 3) {
@ -459,11 +417,11 @@
} }
if (num == 3 && name == "승급교육") { if (num == 3 && name == "승급교육") {
$('#msSel4 > span').text("승급가능등급"); $('#msSel4 > span').text("승급가능등급");
$("#liGrade01").hide(); $("#ligrade01").hide();
} }
else if (num == 3 && name != "승급교육" && name != "계속교육") { else if (num == 3 && name != "승급교육" && name != "계속교육") {
$('#msSel4 > span').text("현재등급"); $('#msSel4 > span').text("현재등급");
$("#liGrade01").show(); $("#ligrade01").show();
}else if (num == 3 && name == "계속교육") { }else if (num == 3 && name == "계속교육") {
if ($("#msSel2 > span").text() == "설계시공기술인") { if ($("#msSel2 > span").text() == "설계시공기술인") {
$("#msSel4 li a").each(function (i, d) { $("#msSel4 li a").each(function (i, d) {
@ -484,6 +442,7 @@
$('#msSel3 > span').text("교육목적"); $('#msSel3 > span').text("교육목적");
$('#msSel4 > span').text("현재등급"); $('#msSel4 > span').text("현재등급");
$('#msSel5 > span').text("직무분야"); $('#msSel5 > span').text("직무분야");
$('#msSel6 > span').text("전문분야");
} }
else if ($("#liTab1").hasClass("current")) else if ($("#liTab1").hasClass("current"))
{ {
@ -491,6 +450,7 @@
$('#msSel3 > span').text(""); $('#msSel3 > span').text("");
$('#msSel4 > span').text(""); $('#msSel4 > span').text("");
$('#msSel5 > span').text(""); $('#msSel5 > span').text("");
$('#msSel6 > span').text("");
} }
} }

2
FO/css/style.css
View File

@ -201,7 +201,7 @@ a.msBtn {display: block; height: 130px; line-height: 130px; text-align: center;
.mainTop h2 {font-size: 22pt;} .mainTop h2 {font-size: 22pt;}
.mainTop p {font-size: 12pt; margin-top: 10px;} .mainTop p {font-size: 12pt; margin-top: 10px;}
.mainSch {margin-top: 30px; padding: 0 30px;} .mainSch {margin-top: 30px; padding: 0 30px;}
.mainSch > li {float: none; width: 100%; height: auto; border-right: none; margin-bottom: 10px; border-radius: 5px !important; -moz-border-radius: 5px !important; -webkit-border-radius: 5px !important;} .mainSch > li {float: none;width: 100% !important;height: auto;border-right: none;margin-bottom: 10px;border-radius: 5px !important;-moz-border-radius: 5px !important;-webkit-border-radius: 5px !important;}
.mainSch > li:last-child {margin-bottom: 0; margin-top: 30px;} .mainSch > li:last-child {margin-bottom: 0; margin-top: 30px;}
.msCont em {display: none;} .msCont em {display: none;}
a.msBtn {height: 50px; line-height: 50px; font-size: 14pt;} a.msBtn {height: 50px; line-height: 50px; font-size: 14pt;}

10
Model/CM.cs
View File

@ -462,6 +462,7 @@ namespace NP.Model
/// 직무분야 /// 직무분야
/// </summary> /// </summary>
public String typejob { get; set; } public String typejob { get; set; }
public String typejobitem { get; set; }
public String typejobs { get; set; } public String typejobs { get; set; }
/// <summary> /// <summary>
/// 집합교육출석필수 /// 집합교육출석필수
@ -1256,6 +1257,9 @@ namespace NP.Model
/// 직무분야 /// 직무분야
/// </summary> /// </summary>
public String typejobname { get; set; } public String typejobname { get; set; }
/// 전문분야
/// </summary>
public String typejobitemname { get; set; }
/// <summary> /// <summary>
/// 등급 /// 등급
/// </summary> /// </summary>
@ -1272,6 +1276,8 @@ namespace NP.Model
public int typeman { get; set; } public int typeman { get; set; }
public int typeedu { get; set; } public int typeedu { get; set; }
public int typegrade { get; set; } public int typegrade { get; set; }
public int typejobitem { get; set; }
public string typejobitems { get; set; }
public int typejob { get; set; } public int typejob { get; set; }
public Int64 pplno { get; set; } public Int64 pplno { get; set; }
/// <summary> /// <summary>
@ -4240,6 +4246,10 @@ namespace NP.Model
/// </summary> /// </summary>
public int typejob { get; set; } public int typejob { get; set; }
/// <summary> /// <summary>
/// 전문분야
/// </summary>
public int typejobitem { get; set; }
/// <summary>
/// 기술인분류 /// 기술인분류
/// </summary> /// </summary>
public String typemanName { get; set; } public String typemanName { get; set; }

1
Model/PPLog.cs
View File

@ -19,6 +19,7 @@ namespace NP.Model
public int? typeedu { get; set; } public int? typeedu { get; set; }
public int? typegrade { get; set; } public int? typegrade { get; set; }
public int? typejob { get; set; } public int? typejob { get; set; }
public int? typejobItem { get; set; }
public int? cgno { get; set; } public int? cgno { get; set; }
public Int64? cmisno { get; set; } public Int64? cmisno { get; set; }
public int? isrebate { get; set; } public int? isrebate { get; set; }

1
Model/VMBase.cs
View File

@ -64,6 +64,7 @@ namespace NP.Model
public IList<ComCode> ComCodes3 { get; set; } public IList<ComCode> ComCodes3 { get; set; }
public IList<ComCode> ComCodes4 { get; set; } public IList<ComCode> ComCodes4 { get; set; }
public IList<ComCode> ComCodes5 { get; set; } public IList<ComCode> ComCodes5 { get; set; }
public IList<ComCode> ComCodes6 { get; set; }
public ComCode ComCode { get; set; } public ComCode ComCode { get; set; }
public String savedata { get; set; } public String savedata { get; set; }