() { 27460, 31049, 110, 163 };
+ //if (usernos.Contains(ViewBag.userno) && Model.tabidx == 0)
+ //{
+ // callpage += "_1";
+ //}
}
@Html.Partial(callpage, Model)
diff --git a/BO/Views/croom/gradeall0_1.cshtml b/BO/Views/croom/gradeall0_1.cshtml
index ba9944d..e9c5aab 100644
--- a/BO/Views/croom/gradeall0_1.cshtml
+++ b/BO/Views/croom/gradeall0_1.cshtml
@@ -82,7 +82,9 @@
}
else
{
- | @d.edate.Value.ToShortDateString() |
+
+ @((d.cshape == 0 && d.isrebate == 0 ? (d.payoktime).AddDays((double)d.studydays) : d.edate).Value.ToShortDateString())
+ |
}
@*진도율*@
@@ -98,19 +100,19 @@
@*@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString()) | *@
@*최종평가*@
- @(d.exfpoint) |
+ @(d.exfpoint) |
@*과제*@
- @d.subjectpoint |
+ @d.subjectpoint |
@*토론*@
@( d.sd1cnt < 1 ? "-" : d.sd1cnt > 0 && d.dblv4 < 1 ? "미제출//" : d.dblv4.ToString()) |
@*환산점수*@
-
- @d.tpoint
-
- |
+
+ @d.tpoint
+
+ |
@if (d.isoffabs == 1)
{
diff --git a/BO/Web.config b/BO/Web.config
index 4eec37f..9b979cd 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -55,8 +55,8 @@
-
-
+
+
diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs
index 7a6cf16..be03788 100644
--- a/Base/Controller/ACommon.cs
+++ b/Base/Controller/ACommon.cs
@@ -1788,14 +1788,32 @@ namespace NP.Base.Controllers
d.sedatestring = string.Format("{0}-{1}-{2}", d.sedatestring.Substring(0, 4), d.sedatestring.Substring(4, 2), d.sedatestring.Substring(6, 2));
d.sedate = Convert.ToDateTime(d.sedatestring);
}
- if (string.IsNullOrEmpty(d.username.Trim()))
- {
- return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 이름이 공란입니다." });
- }
- else if(string.IsNullOrEmpty(d.userpno.Trim()))
+
+ if(string.IsNullOrEmpty(d.userpno.Trim()))
{
return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 주민번호가 공란입니다." });
}
+ else if (string.IsNullOrEmpty(d.cgname.Trim()))
+ {
+ return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 과정명이 공란입니다." });
+ }
+ else if (string.IsNullOrEmpty(d.completeno.Trim()))
+ {
+ return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 수료번호가 공란입니다." });
+ }
+ else if (string.IsNullOrEmpty(d.ssdatestring.Trim()))
+ {
+ return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육시작일이 공란입니다." });
+ }
+ else if (string.IsNullOrEmpty(d.sedatestring.Trim()))
+ {
+ return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육종료일이 공란입니다." });
+ }
+ /*
+ else if (string.IsNullOrEmpty(d.username.Trim()))
+ {
+ return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 이름이 공란입니다." });
+ }
else if (!long.TryParse(d.brno.Trim(), out tryParseResult))
{
return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 사업자등록번호는 숫자만 입력가능합니다." });
@@ -1824,6 +1842,7 @@ namespace NP.Base.Controllers
{
return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육년도는 숫자만 입력가능합니다." });
}
+ */
d.uno = SUserInfo.UserNo;
d.uip = GetUserIP();
}
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 6d47078..84d3217 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -978,7 +978,7 @@
,CAST(AES_DECRYPT(UNHEX(ppl.mphone), ) AS char) mphone
,CAST(AES_DECRYPT(UNHEX(ppl.taxemail), ) AS char) taxemail
,u.username,u.userid,u.slevel,u.uduty
- ,b.iscomplete,b.completetime,b.completeno,b.sdate,b.edate
+ ,b.iscomplete,b.completetime,b.completeno,b.sdate,b.edate, c.studydays
,concat(substring(CAST(AES_DECRYPT(UNHEX(u.userpno),) as char),1,6),'-',substring(CAST(AES_DECRYPT(UNHEX(u.userpno),) as char),7,7)) userpno
,CAST(AES_DECRYPT(UNHEX(u.mobile), ) AS char) mobile
,b.cmisno
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index a0379cf..9016a1c 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1078,19 +1078,25 @@
,g.cname studyplacename
,a.iscomplete
,row_number() over(order by $orderby$d.username) rno
- ,count(a.cdt) over() pagetotalcount
- ,cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) as mobile
- from lect a
- inner join cmex b on b.isdel=0 and b.cmno = a.cmno
- inner join cm b2 on b2.cmno = b.cmno
- inner join pay p on p.payno = a.payno
- left outer join lectex c on c.lectno = a.lectno and c.exno =b.exno
- inner join users d on d.userno = a.userno
- left outer join assign e on e.asno = d.asno
- left outer join cminningscd f on f.cmisno = a.cmisno
- left outer join comcode g on g.ccode = f.studyplace and g.isuse =1
- where a.status=1 and a.ischanged=0
- and b.extype = #extype#
+ ,count(a.cdt) over() pagetotalcount
+ ,cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) as mobile
+ from lect a
+ inner join cmex b on b.isdel=0 and b.cmno = a.cmno
+ inner join cm b2 on b2.cmno = b.cmno
+ inner join pay p on p.payno = a.payno
+ left outer join lectex c on c.lectno = a.lectno and c.exno =b.exno
+ inner join users d on d.userno = a.userno
+ left outer join assign e on e.asno = d.asno
+ left outer join cminningscd f on f.cmisno = a.cmisno
+ left outer join comcode g on g.ccode = f.studyplace and g.isuse =1
+
+ left outer join cmev ce on b2.cmno=ce.cmno
+ left outer join lect l on a.lectno = l.lectno
+ left outer join cminningscd cis on l.cmisno = cis.cmisno
+ left outer join lectinning li on a.lectno = li.lectno and cis.cmino = li.cmino
+
+ where a.status=1 and a.ischanged=0
+ and b.extype = #extype#
and a.cmno = #cmno#
and a.isrebate=#isrebate#
and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#)
@@ -1117,6 +1123,19 @@
and e.asname like concat('%',#asname#,'%')
and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%'))
and d.status = #ustatus#
+
+
+
+ ifnull(ce.isoffabs,0) = 0
+
+ ifnull(ce.isoffabs,0) = 1
+
+ ifnull(ce.isoffabs,0) = 1 and li.istatus is null
+
+ ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 2
+
+ ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 0
+
) a
order by a.rno
@@ -1408,10 +1427,16 @@
inner join users d on d.userno = a.userno
left outer join assign e on e.asno = d.asno
left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno )
- left outer join cminningscd h on h.cmisno = a.cmisno
- left outer join comcode i on i.ccode = h.studyplace and i.isuse=1
- where a.status=1 and a.ischanged=0
-
+ left outer join cminningscd h on h.cmisno = a.cmisno
+ left outer join comcode i on i.ccode = h.studyplace and i.isuse=1
+
+ left outer join cmev ce on a.cmno=ce.cmno
+
+
+ left outer join lectinning li on a.lectno = li.lectno and h.cmino = li.cmino
+
+ where a.status=1 and a.ischanged=0
+
and date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') = #edate#
@@ -1477,7 +1502,20 @@
and d.status = #ustatus#
-
+
+
+
+ ifnull(ce.isoffabs,0) = 0
+
+ ifnull(ce.isoffabs,0) = 1
+
+ ifnull(ce.isoffabs,0) = 1 and li.istatus is null
+
+ ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 2
+
+ ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 0
+
+
) a
order by rno
diff --git a/FO/Views/CRoom/Index.cshtml b/FO/Views/CRoom/Index.cshtml
index 22ab650..616e0b4 100644
--- a/FO/Views/CRoom/Index.cshtml
+++ b/FO/Views/CRoom/Index.cshtml
@@ -65,7 +65,7 @@
{
- @if (Model.Lect.isoffabs != null && Model.Lect.typeedu != 32)
+ @if (Model.Lect.isoffabs != null && Model.Lect.isoffabs == 1)
{
집체교육 안내
diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml
index 66dd2a3..b0c4e42 100644
--- a/FO/Views/Home/Index.cshtml
+++ b/FO/Views/Home/Index.cshtml
@@ -297,6 +297,11 @@
$("#indexForm").submit();
});
+ $("#msSel6 span").on("change", function () {
+ $("#msSel6 span").text("전문분야")
+ $("#msSel6").removeClass("active").addClass("disable")
+ })
+
$(".msBtn").click(function () {
if (@ViewBag.SSUserNo <= 0) {
msg("로그인 후 진행 할 수 있습니다.", null, null, null, "location.href='" + '/Account/Index' + "'");
@@ -368,6 +373,45 @@
});
function schIpt(num, code, name) {
+
+ switch (num) {
+ case '1':
+ $('#msSel2 > span').text("기술인분류");
+ $('#msSel2').removeClass('active');
+ $('#msSel2').addClass('disable');
+ $("#sch2").val("")
+ $("#sch3").val("")
+ $("#sch4").val("")
+ $("#sch5").val("")
+ $("#sch6").val("")
+ case '2':
+ $('#msSel3 > span').text("교육목적");
+ $('#msSel3').removeClass('active');
+ $('#msSel3').addClass('disable');
+ $("#sch3").val("")
+ $("#sch4").val("")
+ $("#sch5").val("")
+ $("#sch6").val("")
+ case '3':
+ $('#msSel4 > span').text("현재등급");
+ $('#msSel4').removeClass('active');
+ $('#msSel4').addClass('disable');
+ $("#sch4").val("")
+ $("#sch5").val("")
+ $("#sch6").val("")
+ case '4':
+ $('#msSel5 > span').text("직무분야");
+ $('#msSel5').removeClass('active');
+ $('#msSel5').addClass('disable');
+ $("#sch5").val("")
+ $("#sch6").val("")
+ case '5':
+ $('#msSel6 > span').text("전문분야");
+ $('#msSel6').removeClass('active');
+ $('#msSel6').addClass('disable');
+ $("#sch6").val("")
+ }
+
$('#sch' + num).val(code);
$('#msSel' + num + '>span').text(name);
$('.msSel > div').slideUp(300);
@@ -375,7 +419,6 @@
$('#msSel' + (Number(num) + 1)).removeClass('disable');
$('#msSel' + (Number(num) + 1)).addClass('active');
-
let tempCnt = 0;
$('#msSel' + (Number(num) + 1) + ' div ul li').each(function () {
if ($(this).css("display") != 'none') {
@@ -474,6 +517,12 @@
if (num == 5) {
$("#msSel6 > div > div > ul > li").hide();
+ $("[id='lijob" + code + "']").css("display", "")
+
+ if ($("#msSel6 span").text() != "전문분야") {
+ $("#msSel6 span").text("전문분야")
+ }
+
if ($("#msSel6").attr("class").indexOf("disable") > -1) {
//해당 div도 같이 숨김 --> javascript:schIpt('5', '57', '품질관리');">품질관리
$("#msSel6 > div").css("display", "none");
@@ -517,6 +566,8 @@
//msSel5Code = code;
$("[id='lijob" + code + "']").css("display", "")
+ $("#msSel6 span").text("전문분야")
+ $("#msSel6").removeClass("active").addClass("disable")
}
$('#sch' + num).val(code);
diff --git a/Model/CM.cs b/Model/CM.cs
index f31de32..a655e39 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -1135,6 +1135,7 @@ namespace NP.Model
}
}
public DateTime? edate { get; set; }
+ public Double? studydays { get; set; }
public String edateymd
{
get { return edate != null ? Convert.ToDateTime(edate).ToShortDateString() : null; }