diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 99f1d3c..631d304 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -462,6 +462,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from (select 1 col1) a where a.col1=0 @@ -478,13 +480,15 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a where a.lectno=#lectno# and a.userno=#userno# union all select b.extype dtype ,b.exname strval,b.exno intval10 - ,case when b.testsdate < now() and b.testedate > now() then a.attrate else -1 end intval,b.econdition intval2 + ,case when a.cdt < now() and a.edate > now() then a.attrate else -1 end intval,b.econdition intval2 ,case when c.eend is null then 0 else 1 end intval3 ,a.attrate intval5 ,null intval4 @@ -495,7 +499,9 @@ ,a.sdate time2 ,b.testsdate ,b.testedate - ,b.cmisno intval11 + ,ifnull(b.cmisno,0) intval11 + ,a.cdt time3 + ,a.edate time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmex b on b.cmno=a.cmno and b.isdel=0 @@ -519,6 +525,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0 @@ -541,6 +549,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0 @@ -563,6 +573,7 @@ ,case when case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end <= ifnull(e.ex0lectpoint,0) then 1 else 0 end = 1 and case when case when a.isrebate = 1 then f.finalcutrfd else f.finalcut end <= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1 then 1 else 0 end ispass + ,ifnull(c.cmisno, 0) scdcmisno ,c.testsdate ,c.testedate ,a.cdt lectcdt @@ -1999,6 +2010,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from (select 1 col1) a where a.col1=0 @@ -2015,6 +2028,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a where a.lectno=#lectno# and a.userno=#userno# @@ -2033,6 +2048,8 @@ ,b.testsdate ,b.testedate ,b.cmisno intval11 + ,a.cdt time3 + ,a.edate time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmex b on b.cmno=a.cmno and b.isdel=0 @@ -2056,6 +2073,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0 @@ -2078,6 +2097,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0 diff --git a/Dao/bin/Debug/MyBatis/Maps/CRoom.xml b/Dao/bin/Debug/MyBatis/Maps/CRoom.xml index f31174b..d5792a5 100644 --- a/Dao/bin/Debug/MyBatis/Maps/CRoom.xml +++ b/Dao/bin/Debug/MyBatis/Maps/CRoom.xml @@ -462,6 +462,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from (select 1 col1) a where a.col1=0 @@ -478,13 +480,15 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a where a.lectno=#lectno# and a.userno=#userno# union all select b.extype dtype ,b.exname strval,b.exno intval10 - ,case when b.testsdate < now() and b.testedate > now() then a.attrate else -1 end intval,b.econdition intval2 + ,case when a.cdt < now() and a.edate > now() then a.attrate else -1 end intval,b.econdition intval2 ,case when c.eend is null then 0 else 1 end intval3 ,a.attrate intval5 ,null intval4 @@ -495,7 +499,9 @@ ,a.sdate time2 ,b.testsdate ,b.testedate - ,b.cmisno intval11 + ,ifnull(b.cmisno,0) intval11 + ,a.cdt time3 + ,a.edate time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmex b on b.cmno=a.cmno and b.isdel=0 @@ -519,6 +525,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0 @@ -541,6 +549,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0 @@ -563,6 +573,7 @@ ,case when case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end <= ifnull(e.ex0lectpoint,0) then 1 else 0 end = 1 and case when case when a.isrebate = 1 then f.finalcutrfd else f.finalcut end <= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1 then 1 else 0 end ispass + ,ifnull(c.cmisno, 0) scdcmisno ,c.testsdate ,c.testedate ,a.cdt lectcdt @@ -1999,6 +2010,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from (select 1 col1) a where a.col1=0 @@ -2015,6 +2028,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a where a.lectno=#lectno# and a.userno=#userno# @@ -2033,6 +2048,8 @@ ,b.testsdate ,b.testedate ,b.cmisno intval11 + ,a.cdt time3 + ,a.edate time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmex b on b.cmno=a.cmno and b.isdel=0 @@ -2056,6 +2073,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0 @@ -2078,6 +2097,8 @@ ,null testsdate ,null testedate ,0 intval11 + ,null time3 + ,null time4 from lect a inner join cm a2 on a2.cmno=a.cmno inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0 diff --git a/Dao/bin/Debug/NP.Model.dll b/Dao/bin/Debug/NP.Model.dll index bb03f17..3b4857a 100644 Binary files a/Dao/bin/Debug/NP.Model.dll and b/Dao/bin/Debug/NP.Model.dll differ diff --git a/Dao/bin/Debug/NP.Model.pdb b/Dao/bin/Debug/NP.Model.pdb index 168a0a9..098b802 100644 Binary files a/Dao/bin/Debug/NP.Model.pdb and b/Dao/bin/Debug/NP.Model.pdb differ diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index c5ecd59..2ee52b5 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -480,7 +480,8 @@ namespace NP.FO.Controllers { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }; - + + //시험일정이 있는지 체크 var scd_cmisno = Dao.Get("cr.myestimation.excnt", p3); if ((int)scd_cmisno.FirstOrDefault() > 0) { sqlId = "cr.myestimation.ex"; diff --git a/FO/Views/CRoom/Estimation.cshtml b/FO/Views/CRoom/Estimation.cshtml index f4792ed..5a423da 100644 --- a/FO/Views/CRoom/Estimation.cshtml +++ b/FO/Views/CRoom/Estimation.cshtml @@ -112,31 +112,59 @@ // 2025-12-30 / KHJ / 추가개발건 // currentProgresRate(현재 진도율) >= intval2(제한시간) && 시험 응시 시작일 ~ 시험 응시 종료일 - if ((currentProgresRate >= d.intval2) && IsDateInRange(d.testsdate, d.testedate)) { - - - @* - *@ - @**@ - - - - @IsDateInRange(d.testsdate, d.testedate) - @GetEvaStatusText(d.intval, d.intval2, d.intval3, d.intval4, currentLectIsComplete) - - + // testsdate(시험응시 시작일), testedate(시험응시 종료일), inval11(교육일정코드_cmisno), strval2(강의시작일), strval3(강의종료일) + if (d.intval11 > 0) { // 교육일정코드_cmisno 있을 시 + if ((currentProgresRate >= d.intval2) && IsDateInRange(d.testsdate, d.testedate)) { + + + @* + *@ + @**@ + + + + @GetEvaStatusText(d.intval, d.intval2, d.intval3, d.intval4, currentLectIsComplete) + + + } else { + + + + + + @*onclick="msg('24년 8월 22일 부터 건설기술진흥법 변경으로
집체교육 당일 교육장에서 시험평가가 진행됩니다.')"*@ + = d.intval2 ? "02" : "01")"> + @(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >= d.intval2 ? "[참여가능]" : "[참여불가]") + + + } } else { - - - - - - @*onclick="msg('24년 8월 22일 부터 건설기술진흥법 변경으로
집체교육 당일 교육장에서 시험평가가 진행됩니다.')"*@ - = d.intval2 ? "02" : "01")"> - @(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >= d.intval2 ? "[참여가능]" : "[참여불가]") - - + if ((currentProgresRate >= d.intval2) && IsDateInRange(d.time3, d.time4)) { + + + @* + *@ + @**@ + + + + @GetEvaStatusText(d.intval, d.intval2, d.intval3, d.intval4, currentLectIsComplete) + + + } else { + + + + + + @*onclick="msg('24년 8월 22일 부터 건설기술진흥법 변경으로
집체교육 당일 교육장에서 시험평가가 진행됩니다.')"*@ + = d.intval2 ? "02" : "01")"> + @(d.intval4 == 1 ? "[평가완료]" : d.intval3 == 1 ? "[참여완료]" : d.intval3 == 0 && d.intval >= d.intval2 ? "[참여가능]" : "[참여불가]") + + + } } } else { // 과제 등... diff --git a/FO/Views/CRoom/EstimationExam.cshtml b/FO/Views/CRoom/EstimationExam.cshtml index 6b86185..4323e48 100644 --- a/FO/Views/CRoom/EstimationExam.cshtml +++ b/FO/Views/CRoom/EstimationExam.cshtml @@ -1,6 +1,12 @@ @model NP.Model.VMCRoom @{ + string exDate = ""; + if (Model.LectEX.scdcmisno > 0) { + exDate = Model.LectEX.lectcdt.ToString("yyyy-MM-dd 00:00") + " ~ " + Model.LectEX.scdeend.ToString("yyyy-MM-dd hh:mm") + "까지(진도율 " + Model.LectEX.econdition + "%이상 응시가능)"; + } else { + exDate = Model.LectEX.lectcdt.ToString("yyyy-MM-dd 00:00") + " ~ " + Model.LectEX.edate.Value.ToString("yyyy-MM-dd hh:mm") + "까지(진도율 " + Model.LectEX.econdition + "%이상 응시가능)"; + } }

시험안내

@@ -10,7 +16,7 @@ @**@ - + @if (Model.LectEX.estart != null) @@ -50,32 +56,49 @@ } @section scripts{ - + } \ No newline at end of file diff --git a/Model/CM.cs b/Model/CM.cs index a6baccf..9d0fa1d 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -3483,7 +3483,7 @@ namespace NP.Model /// /// 응시시작 /// - public DateTime? estart { get; set; } + //public DateTime? estart { get; set; } public String estartymd { @@ -3650,7 +3650,7 @@ namespace NP.Model public String studyplacename{get; set;} public String cname { get; set; } public DateTime payoktime { get; set; } - public Int64 cmisno { get; set; } + //public Int64 cmisno { get; set; } public String leststr { get @@ -3764,6 +3764,7 @@ namespace NP.Model public DateTime scdestart { get; set; } /// 교육일정 종료일 public DateTime scdeend { get; set; } + public int scdcmisno { get; set; } } [Serializable] public class LectEXQ : LectEX diff --git a/Model/bin/Debug/NP.Model.dll b/Model/bin/Debug/NP.Model.dll index bb03f17..3b4857a 100644 Binary files a/Model/bin/Debug/NP.Model.dll and b/Model/bin/Debug/NP.Model.dll differ diff --git a/Model/bin/Debug/NP.Model.pdb b/Model/bin/Debug/NP.Model.pdb index 168a0a9..098b802 100644 Binary files a/Model/bin/Debug/NP.Model.pdb and b/Model/bin/Debug/NP.Model.pdb differ diff --git a/Model/obj/Debug/NP.Model.dll b/Model/obj/Debug/NP.Model.dll index bb03f17..3b4857a 100644 Binary files a/Model/obj/Debug/NP.Model.dll and b/Model/obj/Debug/NP.Model.dll differ diff --git a/Model/obj/Debug/NP.Model.pdb b/Model/obj/Debug/NP.Model.pdb index 168a0a9..098b802 100644 Binary files a/Model/obj/Debug/NP.Model.pdb and b/Model/obj/Debug/NP.Model.pdb differ
평가점수@(Model.LectEX.tpoint + "점")
제한시간@(Model.LectEX.etime == 0 ? "제한없음" : string.Format("{0} 분", Model.LectEX.etime))
응시기간@(Model.LectEX.sdate.Value.ToString("yy-MM-dd hh:mm")) ~ @(Model.LectEX.edate.Value.ToString("yy-MM-dd hh:mm"))까지(진도율 @(Model.LectEX.econdition)%이상 응시가능)
응시기간@(Model.LectEX.lectcdt.ToString("yyyy-MM-dd 00:00")) ~ @(Model.LectEX.scdeend.ToString("yyyy-MM-dd hh:mm"))까지(진도율 @(Model.LectEX.econdition)%이상 응시가능)
응시기간@exDate
재응시여부@(Model.LectEX.isreexamable == 0 ? "불가능" : "가능")
응시상태@(Model.LectEX.estart == null ? ("응시전" + (Model.LectEX.recount > 0 ? string.Format(" (재응시승인 {0}회)", Model.LectEX.recount) : "")) : Model.LectEX.eend != null ? "응시완료" : Model.LectEX.rtime < 1 ? "응시시간초과" : ("응시시작 (남은시간 " + Model.LectEX.rtime + "분)" + (Model.LectEX.relaylimit.Value <= Model.LectEX.entercount ? ", [이어보기 초과]" : "")))