diff --git a/BO/BO.csproj b/BO/BO.csproj index 607738f..ccc2b6b 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -703,6 +703,8 @@ + + diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 5648e51..0d04352 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -588,6 +588,7 @@ namespace NP.BO.Controllers { vm.tabidx = 4; } + ViewBag.userno = SUserInfo.UserNo; switch (vm.tabidx) { case 0: @@ -626,7 +627,7 @@ namespace NP.BO.Controllers if (searchCheck) { - if (SUserInfo.UserNo != 27460) + if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163) { vm.Lects = Dao.Get("grade.lectgradesToAll", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); //vm.Lects = Dao.Get("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } }); @@ -783,7 +784,8 @@ namespace NP.BO.Controllers vm.excellog.userno = SUserInfo.UserNo; vm.excellog.userip = GetUserIP(); } - if(searchGo == "T" || vm.isexceldown == 1) + ViewBag.userno = SUserInfo.UserNo; + if (searchGo == "T" || vm.isexceldown == 1) { switch (vm.tabidx) { @@ -791,31 +793,51 @@ namespace NP.BO.Controllers //ht.Add("ustatus", 1); ht.Add("orderby", "ua.asname,ua.asno,u.username"); - if (SUserInfo.UserNo != 27460) + if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163) { vm.Lects = Dao.Get("grade.lectgradesToAll", ht); - } - else - { - vm.Lects = Dao.Get("grade.lectgradesToAll2", ht); - } - if (vm.isexceldown == 1) - { - return ExportExcel( - new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" + + if (vm.isexceldown == 1) + { + return ExportExcel( + new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간" , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가" ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처" ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회" ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"}, - new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" + new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime" , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point" ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" ,"pcgname","cgname","studyplacename","tyear", "iscompletename" }, - vm.Lects, - "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, ",2,4", vm.excellog); + vm.Lects, + "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, ",2,4", vm.excellog); + } + } + else + { + vm.Lects = Dao.Get("grade.lectgradesToAll2", ht); + + if (vm.isexceldown == 1) + { + return ExportExcel( + new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" + , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간" + , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가" + ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처" + ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회" + ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"}, + new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" + , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime" + , "attrate", "exfpoint", "subjectpoint", "tpointstr", "isoffabsstr", "rsCount" + ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" + ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" + ,"pcgname","cgname","studyplacename","tyear", "iscompletename" }, + vm.Lects, + "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, ",2,4", vm.excellog); + } } vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); break; diff --git a/BO/Views/croom/grade.cshtml b/BO/Views/croom/grade.cshtml index 9ea6ad9..ac47246 100644 --- a/BO/Views/croom/grade.cshtml +++ b/BO/Views/croom/grade.cshtml @@ -37,7 +37,17 @@ @*
  • 토론
    • *@ } -@Html.Partial("grade" + (Model.tabidx==2 || Model.tabidx == 3 ? 2 : Model.tabidx), Model) +@*Html.Partial("grade" + (Model.tabidx==2 || Model.tabidx == 3 ? 2 : Model.tabidx), Model)*@ +@{ + string callpage = "grade" + (Model.tabidx == 2 || Model.tabidx == 3 ? 2 : Model.tabidx); + List usernos = new List() { 27460, 31049, 110, 163 }; + if(usernos.Contains(ViewBag.userno) && Model.tabidx == 0) + { + callpage += "_1"; + } +} +@Html.Partial(callpage, Model) +
    @Html.Partial("./Partial/DForm", Model, new ViewDataDictionary { { "preform", 1 } })
    @section styles{ - + diff --git a/FO/Web.config b/FO/Web.config index 17520dd..edcdb65 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -41,8 +41,8 @@ - - + + diff --git a/FO/js/site.js b/FO/js/site.js index 7c9dbeb..0141708 100644 --- a/FO/js/site.js +++ b/FO/js/site.js @@ -1143,4 +1143,10 @@ function goremote() { } function checkall(c, cssclass) { $("input[type=checkbox]." + cssclass).prop("checked", $(c).prop("checked")); +} + +function strEnConvert(str) { + let rslt = str.replace(/&#/gi, "%26%23"); + + return rslt; } \ No newline at end of file diff --git a/Model/BaseModel.cs b/Model/BaseModel.cs index 279daed..9e26311 100644 --- a/Model/BaseModel.cs +++ b/Model/BaseModel.cs @@ -170,9 +170,11 @@ namespace NP.Model //public Int64? longv1 { get; set; } //public Int64? longv2 { get; set; } //public Int64? longv3 { get; set; } - //public double? dblv1 { get; set; } - //public double? dblv2 { get; set; } - //public double? dblv3 { get; set; } + public double? dblv1 { get; set; } + public double? dblv2 { get; set; } + public double? dblv3 { get; set; } + public double? dblv4 { get; set; } + public double? dblv5 { get; set; } public String zstring0 { get; set; } public String zstring1 { get; set; } diff --git a/Model/CM.cs b/Model/CM.cs index 62be8f1..4c127da 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -1356,13 +1356,17 @@ namespace NP.Model public int? scdtype { get; set; } public int? isoffabs { get; set; } + public String ex0point { get { return ex0cnt < 1 ? "-" : ex0lectcnt < 1 && ex0cnt > 0 ? "미제출" : ex0lectpoint.ToString(); } + } + + // 최종평가(구) public String ex1point { get @@ -1370,6 +1374,8 @@ namespace NP.Model return ex1cnt < 1 ? "-" : ex1lectcnt < 1 && ex1cnt < 0 ? "미제출" : ex1lectpoint.ToString(); } } + + // 과제점수(구) public String sd0point { get @@ -1384,6 +1390,8 @@ namespace NP.Model return sd1cnt < 1 ? "-" : sd1lectcnt < 1 && sd1cnt > 0 ? "미제출" : sd1lectpoint.ToString(); } } + + // 강의평가(구) public String rs0point { get @@ -1391,6 +1399,8 @@ namespace NP.Model return rs0lectcnt + " / " + rs0cnt; } } + + // 총점(구) public String tpointstr { get @@ -1398,6 +1408,34 @@ namespace NP.Model return ((apoint + mpoint + fpoint + spoint + dpoint)).ToString(); } } + + // 최종평가(신) + public String exfpoint + { + get + { + return ex1cnt <= 0 ? "-" : dblv2 < 0 && ex1cnt > 0 ? "미제출" : dblv2.ToString(); // 시험은 미시험/재응시는 항목이 없으므로 -1값 + } + } + + // 과제(신) + public String subjectpoint + { + get + { + return sd0cnt <= 0 ? "-" : dblv3 < 1 && sd0cnt > 0 ? "미제출" : dblv3.ToString(); // 과제는 1보다 적을 경우 미제출 + } + } + + // 강의평가 + public String rsCount + { + get + { + return "( " + (rs0lectcnt > 0 ? 1 : 0) + " / " + (rs0cnt > 0 ? 1 : 0) + " )"; + } + } + public String isoffabsstr { get