내용 모르곘음 오래된것 커밋

This commit is contained in:
iyak 2025-06-16 00:53:54 +00:00
parent 2ca780ee2b
commit 37c92988b8
7 changed files with 97 additions and 149 deletions

View File

@ -658,17 +658,7 @@ namespace NP.BO.Controllers
if (searchCheck) if (searchCheck)
{ {
if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 vm.Lects = Dao.Get<Lect>("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<Lect>("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<Lect>("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" } });
}
else
{
// 사용안함
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll2", 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" } });
}
} }
else else
{ {
@ -751,6 +741,12 @@ namespace NP.BO.Controllers
return View(vm); return View(vm);
} }
/// <summary>
/// 교육운영 > 성적처리 (전체)
/// </summary>
/// <param name="vm"></param>
/// <param name="searchGo"></param>
/// <returns></returns>
public ActionResult gradeall(VMLect vm, string searchGo) public ActionResult gradeall(VMLect vm, string searchGo)
{ {
searchGo = string.IsNullOrWhiteSpace(searchGo) ? "" : (searchGo == "1" ? "T" : "F"); searchGo = string.IsNullOrWhiteSpace(searchGo) ? "" : (searchGo == "1" ? "T" : "F");
@ -793,6 +789,7 @@ namespace NP.BO.Controllers
if (!string.IsNullOrEmpty(vm.stringval11)) if (!string.IsNullOrEmpty(vm.stringval11))
{ {
var mobile_temp = vm.stringval11.Replace("-", ""); var mobile_temp = vm.stringval11.Replace("-", "");
if (mobile_temp.Length == 10) if (mobile_temp.Length == 10)
{ {
vm.stringval11 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 3) + "-" + mobile_temp.Substring(6); vm.stringval11 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 3) + "-" + mobile_temp.Substring(6);
@ -801,14 +798,27 @@ namespace NP.BO.Controllers
{ {
vm.stringval11 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 4) + "-" + mobile_temp.Substring(7); vm.stringval11 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 4) + "-" + mobile_temp.Substring(7);
} }
ht["mobile"] = vm.stringval11; ht["mobile"] = vm.stringval11;
} }
// [메일 이슈 - 박상완] 성적처리(전체)화면에서 기본값 제거 : 클릭시 전체현황 조회되는거 없애주세요. 클릭해야 검색할수 있도록 // [메일 이슈 - 박상완] 성적처리(전체)화면에서 기본값 제거 : 클릭시 전체현황 조회되는거 없애주세요. 클릭해야 검색할수 있도록
// 검색이 모두 빈 값이면 상태 param 0 으로 처리. // 검색이 모두 빈 값이면 상태 param 0 으로 처리.
if (String.IsNullOrEmpty(vm.stringval) && String.IsNullOrEmpty(vm.stringval2) && String.IsNullOrEmpty(vm.stringval3) && String.IsNullOrEmpty(vm.stringval4)
&& String.IsNullOrEmpty(vm.stringval5) && String.IsNullOrEmpty(vm.stringval6) && String.IsNullOrEmpty(vm.stringval7) && String.IsNullOrEmpty(vm.stringval8) // hs - 가독성이 좋지않아 if문에서 bool로 추출
&& String.IsNullOrEmpty(vm.stringval9) && String.IsNullOrEmpty(vm.stringval10) && String.IsNullOrEmpty(vm.stringval11)) bool isStringValEmpty = string.IsNullOrEmpty(vm.stringval) &&
string.IsNullOrEmpty(vm.stringval2) &&
string.IsNullOrEmpty(vm.stringval3) &&
string.IsNullOrEmpty(vm.stringval4) &&
string.IsNullOrEmpty(vm.stringval5) &&
string.IsNullOrEmpty(vm.stringval6) &&
string.IsNullOrEmpty(vm.stringval7) &&
string.IsNullOrEmpty(vm.stringval8) &&
string.IsNullOrEmpty(vm.stringval9) &&
string.IsNullOrEmpty(vm.stringval10) &&
string.IsNullOrEmpty(vm.stringval11);
if (isStringValEmpty)
{ {
ht.Add("ustatus", 0); ht.Add("ustatus", 0);
} }
@ -829,76 +839,49 @@ namespace NP.BO.Controllers
vm.excellog.userip = GetUserIP(); vm.excellog.userip = GetUserIP();
} }
ViewBag.userno = SUserInfo.UserNo; ViewBag.userno = SUserInfo.UserNo;
if ((searchGo == "T" || vm.isexceldown == 1 && SUserInfo.UserType != 97) || SUserInfo.UserType == 97) if ((searchGo == "T" || vm.isexceldown == 1 && SUserInfo.UserType != 97) || SUserInfo.UserType == 97)
{ {
switch (vm.tabidx) switch (vm.tabidx)
{ {
case 0: case 0:
//ht.Add("ustatus", 1);
ht.Add("orderby", "ua.asname,ua.asno,u.username"); ht.Add("orderby", "ua.asname,ua.asno,u.username");
if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163 vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", ht);
// pms6473 => 엑셀다운로드에서 수료번호의 "제" 와 "호" 글자를 제거해달라는 요청
if (vm.Lects.Any())
{ {
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", ht); vm.Lects = vm.Lects.Select(x =>
// pms6473 => 엑셀다운로드에서 수료번호의 "제" 와 "호" 글자를 제거해달라는 요청
if (vm.Lects.Any())
{ {
vm.Lects = vm.Lects.Select(x => x.completeno = (x.completeno != null) ? x.completeno.Replace("제", "").Replace("호", "") : "";
{ return x;
x.completeno = (x.completeno != null) ? x.completeno.Replace("제", "").Replace("호", "") : ""; }).ToList();
return x; }
}).ToList();
}
if (vm.isexceldown == 1) if (vm.isexceldown == 1)
{ {
return ExportExcel( return ExportExcel(
new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" 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", "zstring0","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime" , "typemanname","typejobname", "zstring0","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime"
, "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point" , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point"
,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone"
,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association"
,"pcgname","cgname","studyplacename","tyear", "iscompletename" ,"pcgname","cgname","studyplacename","tyear", "iscompletename"
} }
, vm.Lects , vm.Lects
, $"성적처리전체{DateTime.Now.Year}{DateTime.Now.Month}{DateTime.Now.Day}" , $"성적처리전체{DateTime.Now.Year}{DateTime.Now.Month}{DateTime.Now.Day}"
, null , null
, ",2,4" , ",2,4"
, vm.excellog); , vm.excellog);
}
} }
else
{
//사용안함
vm.Lects = Dao.Get<Lect>("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", "zstring3", "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()); vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
break; break;
case 2: case 2:
@ -954,15 +937,8 @@ namespace NP.BO.Controllers
{ {
vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "lectno", vm.longval } }).First(); vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "lectno", vm.longval } }).First();
vm.LectInningPages = Dao.Get<LectInningPage>("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno }, { "isscd", 0 } }); vm.LectInningPages = Dao.Get<LectInningPage>("lect.lectinningpages", new System.Collections.Hashtable() { { "lectno", vm.Lect.lectno }, { "isscd", 0 } });
vm.Lect.sstime = DateTime.Now; // (검색) 시작일 - 현재시간
// [이슈_602 / 박상완] 활동이력 탭에서 '검색' 시 데이터 로드 할 수 있도록 변경 vm.Lect.setime = DateTime.Now.AddHours(1); // (검색) 종료일 - 현재시간 + 1시간
// 파라미터 userno 를 -1으로 변경
// [이슈 404 오류] 첫 페이지 조회시 쿼리문 조회 불필요
//vm.PageLogs = Dao.Get<PageLog>("lect.pagelogs", new System.Collections.Hashtable() { { "start", vm.Lect.sstime }, { "end", vm.Lect.setime.Value.ToString("yyyy-MM-dd 23:59:59") }, { "userno", -1 }, { "logsite", 1 } });
// [이슈_602 / 박상완] YYYY-MM-DD 로 검색하는 부분을 조회일 하루로 기본값 부탁드립니다. 예) 오늘 조회 시 : 2021-12-27 ~ 2021-12-27
vm.Lect.sstime = DateTime.Now; // (검색) 시작일 - 현재시간
vm.Lect.setime = DateTime.Now.AddHours(1); // (검색) 종료일 - 현재시간 + 1시간
return View(vm); return View(vm);
} }
@ -972,27 +948,18 @@ namespace NP.BO.Controllers
{ {
vm.pagerowcount = 50; vm.pagerowcount = 50;
vm.stringval4 = "1"; vm.stringval4 = "1";
//vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
//vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
} }
if (vm.isexceldown == 1) if (vm.isexceldown == 1)
{ {
vm.pagerowcount = 1000000; vm.pagerowcount = 1000000;
} }
var ht = SetHash(vm, false); var ht = SetHash(vm, false);
//if (vm.stringval == null)
//{
// vm.stringval = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd");
// vm.stringval2 = DateTime.Now.ToString("yyyy-MM-dd");
//}
ht.Add("cdts", vm.stringval); ht.Add("cdts", vm.stringval);
ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59")); ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
//ht.Add("pstatusin", vm.stringval3);
//ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1"); string pstatusall = null;
//ht.Add("rstatusin", vm.stringval5);
String pstatusall = null;
if (vm.stringval3 != null) if (vm.stringval3 != null)
{ {
pstatusall = " and ((p.pstatus in (" + vm.stringval3 + ") and (pr.rstatus is null or p.rstatus = 0))"; pstatusall = " and ((p.pstatus in (" + vm.stringval3 + ") and (pr.rstatus is null or p.rstatus = 0))";

View File

@ -2,7 +2,6 @@
<form id="mform" method="post"> <form id="mform" method="post">
<input type="hidden" id="mform_tabidx" name="tabidx" value="@Model.tabidx" /> <input type="hidden" id="mform_tabidx" name="tabidx" value="@Model.tabidx" />
<section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1"> <section class="panel panel-default clearfix devsearch" data-cleartbody="tbody1">
@*@Html.Partial("./Partial/SearchCaption")*@
<div class="table-responsive"> <div class="table-responsive">
<table class="table b-t b-light viewtable"> <table class="table b-t b-light viewtable">
<colgroup> <colgroup>
@ -83,7 +82,7 @@
<td> <td>
@{ @{
Dictionary<int, string> attendance = new Dictionary<int, string>() Dictionary<int, string> attendance = new Dictionary<int, string>()
{ {
{ 0, "전체"} { 0, "전체"}
, { 1, "해당없음"} , { 1, "해당없음"}
, { 2, "대상자(미입력/출석/결석)"} , { 2, "대상자(미입력/출석/결석)"}
@ -130,16 +129,12 @@
} }
</ul> </ul>
@*Html.Partial("gradeall" + (Model.tabidx == 2 || Model.tabidx == 3 ? 2 : Model.tabidx), Model)*@
@{ @{
string callpage = "gradeall" + (Model.tabidx == 2 || Model.tabidx == 3 ? 2 : Model.tabidx); string callpage = "gradeall" + (Model.tabidx == 2 || Model.tabidx == 3 ? 2 : Model.tabidx);
//List<int> usernos = new List<int>() { 27460, 31049, 110, 163 };
//if (usernos.Contains(ViewBag.userno) && Model.tabidx == 0)
//{
// callpage += "_1";
//}
} }
<input type="hidden" id="callPageName" value="@callpage" />
@Html.Partial(callpage, Model) @Html.Partial(callpage, Model)
<script> <script>
@ -183,18 +178,6 @@
} }
} }
/*
let chkVal = $("#stringval").val()
let chkVal2 = $("#stringval3").val()
let chkVal3 = $("#stringval7").val()
if (chkVal != "" || chkVal2 != "" || chkVal3 != "") {
submit();
}
else {
msg("교육종료일, 교육생, 과정명 중 한가지이상 필수로 입력해 주세요 ")
}
*/
submit(); submit();
} }

View File

@ -7,7 +7,6 @@
<div style="padding: 5px 10px; text-align: right;"> <div style="padding: 5px 10px; text-align: right;">
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
@Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내") @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내")
@*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
<a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a> <a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
@if (Model.IsAdmin) @if (Model.IsAdmin)
{ {
@ -37,7 +36,6 @@
<th>교육시작일</th> <th>교육시작일</th>
<th>교육종료일</th> <th>교육종료일</th>
<th>진도율</th> <th>진도율</th>
@*<th>진행평가</th>*@
<th>최종평가</th> <th>최종평가</th>
<th>과제</th> <th>과제</th>
<th style="display:none;">토론</th> <th style="display:none;">토론</th>
@ -94,31 +92,33 @@
{ {
<td class="link text-center">@d.attrate %</td> <td class="link text-center">@d.attrate %</td>
} }
@*<td>@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>*@
@*최종평가*@ @*최종평가*@
<td>@(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td> <td>@(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>
@*과제*@ @*과제*@
<td>@(d.sd0cnt < 1 ? "-" :d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td> <td>@(d.sd0cnt < 1 ? "-" :d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td>
@*토론*@ @*토론*@
<td style="display:none;">@( d.sd1cnt < 1 ? "-" :d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td> <td style="display:none;">@( d.sd1cnt < 1 ? "-" :d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td>
@*환산점수*@ @*환산점수*@
<td> <td>
@(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString()) @(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString())
<input type="hidden" id="tpointList" value="(a:@d.apoint / m:@d.mpoint / f:@d.fpoint / s:@d.spoint / d:@d.dpoint)"> <input type="hidden" id="tpointList" value="(a:@d.apoint / m:@d.mpoint / f:@d.fpoint / s:@d.spoint / d:@d.dpoint)">
</td> </td>
@if (d.isoffabs == 1)
<td class="link text-center"><a href="javascript:;" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td>
@*@if (d.isoffabs == 1)
{ {
<td class="link text-center"><a href="#" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td> <td class="link text-center"><a href="#" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td>
} }
else else
{ {
<td class="text-center">-</td> <td class="text-center">-</td>
} }*@
@*<td>@(d.rs0lectcnt) / @(d.rs0cnt)</td>*@
<td>@(d.rs0lectcnt > 0 ? 1 : 0) / @(d.rs0cnt > 0 ? 1 : 0)</td> <td>@(d.rs0lectcnt > 0 ? 1 : 0) / @(d.rs0cnt > 0 ? 1 : 0)</td>
@if (!ViewBag.IsSubAdmin96) @if (!ViewBag.IsSubAdmin96)
{ {

View File

@ -7,8 +7,8 @@
<div style="padding: 5px 10px; text-align: right;"> <div style="padding: 5px 10px; text-align: right;">
@Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } }) @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
@Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내") @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내")
@*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@ <a href="javascript:;" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
<a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
@if (Model.IsAdmin) @if (Model.IsAdmin)
{ {
<a href="#" class="btn btn-primary" onclick="save();">수료확인</a> <a href="#" class="btn btn-primary" onclick="save();">수료확인</a>
@ -37,7 +37,6 @@
<th>교육시작일</th> <th>교육시작일</th>
<th>교육종료일</th> <th>교육종료일</th>
<th>진도율</th> <th>진도율</th>
@*<th>진행평가</th>*@
<th>최종평가</th> <th>최종평가</th>
<th>과제</th> <th>과제</th>
<th style="display:none;">토론</th> <th style="display:none;">토론</th>
@ -97,8 +96,6 @@
<td class="link text-center">@d.attrate %</td> <td class="link text-center">@d.attrate %</td>
} }
@*<td>@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>*@
@*최종평가*@ @*최종평가*@
<td>@(d.exfpoint)</td> <td>@(d.exfpoint)</td>
@ -114,15 +111,16 @@
<input type="hidden" id="tpointList" value="(a:@d.apoint / m:@d.mpoint / f:@d.fpoint / s:@d.spoint / d:@d.dpoint)"> <input type="hidden" id="tpointList" value="(a:@d.apoint / m:@d.mpoint / f:@d.fpoint / s:@d.spoint / d:@d.dpoint)">
</td> </td>
@if (d.isoffabs == 1) @*@if (d.isoffabs == 1)
{ {
<td class="link text-center"><a href="#" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td> <td class="link text-center"><a href="#" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td>
} }
else else
{ {
<td class="text-center">-</td> <td class="text-center">-</td>
} }*@
@*<td>@(d.rs0lectcnt) / @(d.rs0cnt)</td>*@ <td class="link text-center"><a href="#" onclick="save4(@d.cmno,@d.lectno);">@d.istatusname</a></td>
<td>@d.rsCount</td> <td>@d.rsCount</td>
@if (!ViewBag.IsSubAdmin96) @if (!ViewBag.IsSubAdmin96)
{ {
@ -169,10 +167,6 @@
<td colspan="2"> <td colspan="2">
<select id="cmisno" class="form-control" onchange="getoff()"> <select id="cmisno" class="form-control" onchange="getoff()">
<option value="">신청교육일</option> <option value="">신청교육일</option>
@*@foreach(var d in Model.CMinningscds)
{
<option value="@d.cmisno">@d.estart.ToString("yyyy-MM-dd")</option>
}*@
</select> </select>
</td> </td>
</tr> </tr>
@ -274,7 +268,6 @@
} }
function cbauthkey() { function cbauthkey() {
if (capResult.code == 1000) { if (capResult.code == 1000) {
@*var pop = window.open('@ViewBag.fronturl/Open/CertPrint?userno=@ViewBag.SSUserNo&authtype=' + _authtype + '&randkey=' + capResult.obj, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");*@
var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+_lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0"); var pop = window.open('@ViewBag.reporturl/certification.aspx?lectno='+_lectno, "certprint", "width=" + (screen.availWidth) + ", height=" + (screen.availHeight) + ", scrollbars=yes, resizable=yes, status=no, location=no, left=0, top=0");
if (pop == null) { if (pop == null) {
msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요."); msg("팝업이 차단되어 있습니다. 차단을 해제해 주세요.");
@ -364,17 +357,12 @@
} }
var lis = ""; var lis = "";
$.each($("#tbodyoff tr"), function (i, r) { $.each($("#tbodyoff tr"), function (i, r) {
//if ($(r).find("input.att:checked").val() != $(r).attr("data-attorg")) {
lis += ";" + $(r).attr("data-no") + ":" + $(r).find("input.att:checked").val(); lis += ";" + $(r).attr("data-no") + ":" + $(r).find("input.att:checked").val();
//}
}); });
//if (lis == "") {
// msg2("저장했습니다.");
//} else {
data.append("lis", lis.substr(1)); data.append("lis", lis.substr(1));
data.append("fgnooff", _fgno); data.append("fgnooff", _fgno);
capfile("/acommon/offattsave", data, "cboffattsave", false, null, true, true); capfile("/acommon/offattsave", data, "cboffattsave", false, null, true, true);
//}
} }
} }
function cboffattsave() { function cboffattsave() {
@ -383,4 +371,3 @@
} else { msgdev(true); } } else { msgdev(true); }
} }
</script> </script>

View File

@ -254,20 +254,29 @@ namespace NP.FO.Controllers
return View(vm); return View(vm);
} }
/// <summary>
/// 마이페이지 > 나의강의실 > 교육일정변경
/// </summary>
/// <param name="vm"></param>
/// <returns></returns>
public ActionResult LectureOn(VMMy vm) public ActionResult LectureOn(VMMy vm)
{ {
vm.cmm = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable()).FirstOrDefault(); vm.cmm = Dao.Get<CM>("cm.cms", new Hashtable()).FirstOrDefault();
Hashtable hsData = new Hashtable(); Hashtable hsData = new Hashtable();
hsData.Add("userno", SUserInfo.UserNo); hsData.Add("userno", SUserInfo.UserNo);
hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null); hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
//hsData.Add("cshape", 2); //hsData.Add("cshape", 2);
hsData.Add("issubtable", 1); hsData.Add("issubtable", 1);
vm.Lects = Dao.Get<Lect>("lect.mylectures2", hsData); vm.Lects = Dao.Get<Lect>("lect.mylectures2", hsData);
foreach (var item in vm.Lects) foreach (var item in vm.Lects)
{ {
item.intv1 = 0; item.intv1 = 0;
if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now) if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
{ {
item.lectStatus = "미수료"; item.lectStatus = "미수료";

View File

@ -255,8 +255,8 @@
if (Model.CRoomLectSdInfo != null) if (Model.CRoomLectSdInfo != null)
{ {
lectsdInfo = Model.CRoomLectSdInfo lectsdInfo = Model.CRoomLectSdInfo
.Where(x => x.lectno == d.longval) .Where(x => x.lectno == d.longval && x.cmno == d.intval7)
.SingleOrDefault(); .FirstOrDefault();
} }
if (lectsdInfo != null && lectsdInfo.lectno > 0) if (lectsdInfo != null && lectsdInfo.lectno > 0)

View File

@ -33,5 +33,7 @@ namespace NP.Model
public DateTime checktime { get; set; } public DateTime checktime { get; set; }
/// <summary>현재 기간내 수강여부</summary> /// <summary>현재 기간내 수강여부</summary>
public bool iscurrentlecture { get; set; } public bool iscurrentlecture { get; set; }
/// <summary>과정번호 (과정키)</summary>
public int cmno { get; set; }
} }
} }