From 1b31ac3228d2c05e8eeb9f096595926f9b232475 Mon Sep 17 00:00:00 2001 From: ksjihd163 Date: Tue, 23 Aug 2022 03:38:22 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=20{=EC=B6=94=EA=B0=80=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?=EC=BB=B7=EB=B0=8B}=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20{=ED=91=9C=EA=B8=B0?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EB=B3=80=EA=B2=BD=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=9E=85=EB=8B=88=EB=8B=A4=20}=20=20-=20=20{=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EA=B0=9C=EB=B0=9C=20nas=EC=97=90=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EA=B3=BC=20pms6551,=206486,6481,6305}=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=EB=90=9C=20=EB=82=B4=EC=9A=A9=EB=93=A4?= =?UTF-8?q?=EC=9E=85=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dao/MyBatis/Maps/Lect.xml | 155 +++++++++++++++++++++++---- Dao/MyBatis/Maps/Pay.xml | 79 ++++++++------ FO/Controllers/CourseController.cs | 8 +- FO/Controllers/FOBaseController.cs | 2 +- FO/Controllers/MyController.cs | 108 ++++++++++++++++++- FO/Views/CRoom/Boards.cshtml | 7 +- FO/Views/Course/ApplyAgree.cshtml | 72 ++++++++----- FO/Views/Course/ApplyComplete.cshtml | 53 +++++---- FO/Views/Course/ApplyEdu.cshtml | 70 +++++++----- FO/Views/Course/ApplyPay.cshtml | 53 +++++---- FO/Views/Course/SmartSearch.cshtml | 45 +++++--- FO/Views/Home/Index.cshtml | 2 +- FO/Views/My/Document.cshtml | 144 +++++++++++++++++-------- FO/Views/My/Index.cshtml | 83 ++++++++++---- FO/Views/My/Lecture.cshtml | 59 +++++----- FO/Views/My/LectureOn.cshtml | 63 ++++++----- FO/Views/My/Paies.cshtml | 7 +- FO/Views/My/PayInfo.cshtml | 10 +- FO/Views/My/Ready.cshtml | 52 +++++---- FO/css/mypage.css | 35 +++--- FO/css/style.css | 59 +++++++--- FO/js/mypage.js | 13 ++- Model/BaseModel.cs | 14 +++ Model/CM.cs | 11 +- Model/Pay.cs | 9 +- 25 files changed, 846 insertions(+), 367 deletions(-) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 931226d..a354016 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1367,6 +1367,10 @@ ,a.time3,a.time4 ,a.time5,a.time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from( select 1 dtype ,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7 @@ -1376,9 +1380,25 @@ ,c.cname strval,null strval2,null strval3 ,c.rstime time,c.retime time2 ,b.cdt time3,f.estart time4 - ,case when l.sdate is null then c.sstime else l.sdate end time5,case when l.edate is null then c.setime else l.edate end time6 + ,CASE + WHEN l.sdate IS NULL then + (case + when c.cshape ='1' then f.estart + else l.cdt + end) + ELSE l.sdate + end AS time5 + + ,case + when l.edate is null then f.eend + else l.edate + end time6 ,case when b.pstatus = 1 then 99 else b.pstatus end as sortpstatus ,row_number() over(order by sortpstatus, c.retime, b.payno,a.pino) rno + ,l.iscomplete + ,c.studytime, + cc.cname studyplacename, + cmis.studyplace from payitem a inner join pay b on b.payno=a.payno and b.pstatus in (21,22,51,55) and b.rstatus < 2 inner join cm c on c.cmno=a.itemno and c.rstime < and c.retime > @@ -1386,9 +1406,11 @@ inner join term d on d.tmno=c.tmno left outer join payrfd e on e.payno=a.payno and e.payno=a.payno and e.rstatus=0 left outer join cminningscd f on f.cmisno = l.cmisno + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = l.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0 and 1 = case when c.retime = '2099-12-31 23:59:59' and l.stime is not null then 0 else 1 end - order by sortpstatus, c.retime, b.payno,a.pino + order by sortpstatus, c.retime desc, b.payno,a.pino ) a union all select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 @@ -1398,22 +1420,44 @@ ,a.time3,a.time4 ,a.time5,a.time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 2 dtype ,c.tyear intval,c.tseq intval2,b.cshape intval3,0 intval4,0 intval5,a.isrebate intval6,a.cmno intval7,0 intval8 ,a.lectno longval,0 longval2 ,b.cname strval,null strval2,null strval3 - ,case when a.sdate is null then b.sstime else a.sdate end as time - ,case when a.edate is null then b.setime else a.edate end as time2 + ,case + WHEN a.sdate IS NULL then + (case + when b.cshape ='1' then d.estart + else a.cdt + end) + ELSE a.sdate + end AS time + + ,case + when a.edate is null then d.eend + else a.edate + end time2 + ,d.estart time3,d.eend time4 ,e.cdt time5,null time6 ,row_number() over(order by b.setime desc) rno ,case when d.eend is not null then d.eend else a.edate end as sortedate + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join pay e on e.payno = a.payno inner join cm b on b.cmno=a.cmno inner join term c on c.tmno=b.tmno left outer join cminningscd d on a.cmisno = d.cmisno + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.status=1 and a.ischanged=0 and (case when a.sdate is null then b.sstime else a.sdate end) < order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc @@ -1426,6 +1470,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 3 dtype ,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1435,10 +1483,17 @@ ,case when a.edate is null then b.setime else a.edate end as time2 ,row_number() over(partition by a.cmno order by c.iseq) rno2 ,row_number() over(order by b.setime) rno + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join cm b on b.cmno=a.cmno inner join cminning c on c.cmno=b.cmno and c.isonline=1 and c.isscd = 0 left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2 + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' + where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null and a.sdate < and a.edate > ) a @@ -1451,6 +1506,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 3 dtype ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1460,11 +1519,17 @@ ,case when a.edate is null then b.setime else a.edate end as time2 ,row_number() over(partition by a.cmno order by c.iseq) rno2 ,row_number() over(order by b.setime) rno + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cminning c on c.cmno=b.cmno and c.isonline=0 and c.isscd = 0 + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate < and a.edate > ) a @@ -1477,6 +1542,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 3 dtype ,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1486,10 +1555,16 @@ ,case when a.edate is null then b.setime else a.edate end as time2 ,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2 ,row_number() over(order by b.setime) rno + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition <= a.attrate + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null and a.sdate < and a.edate > @@ -1503,6 +1578,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 3 dtype ,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1512,11 +1591,17 @@ ,case when a.edate is null then b.setime else a.edate end as time2 ,row_number() over(partition by a.cmno order by c.cdt) rno2 ,row_number() over(order by b.setime) rno + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition <= a.attrate left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null and a.sdate < and a.edate > ) a @@ -1529,6 +1614,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 3 dtype ,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1538,11 +1627,17 @@ ,case when a.edate is null then b.setime else a.edate end as time2 ,row_number() over(partition by a.cmno order by c.cdt) rno2 ,row_number() over(order by b.setime) rno + ,a.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition <= a.attrate left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0 + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = a.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null and a.sdate < and a.edate > ) a @@ -1555,6 +1650,10 @@ ,null time3, null time4 ,null time5, null time6 ,a.rno + ,a.iscomplete + ,a.studytime, + a.studyplacename studyplacename, + a.studyplace from ( select 4 dtype ,a.scdno intval,a.dday intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,b.cmno intval7,0 intval8 @@ -1562,9 +1661,15 @@ ,b.cname strval,null strval2,null strval3 ,a.atime time,c.edate time2 ,row_number() over(order by a.atime desc) rno + ,c.iscomplete + ,b.studytime, + cc.cname studyplacename, + cmis.studyplace from alarms a inner join cm b on b.cmno=a.cmexno inner join lect c on c.cmno=b.cmno and c.userno=a.userno and c.status=1 and c.ischanged=0 + LEFT OUTER JOIN cminningscd cmis ON cmis.cmisno = c.cmisno + LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.scdno < 9 and a.isdel=0 order by a.atime desc limit 5 @@ -1574,7 +1679,7 @@ update alarms set isdel=1 where alno=#alno# and userno=#userno# update pay set @@ -953,8 +959,13 @@ order by d.rfdno,b.rstatus,ispast,b.pino - delete from payrfd where payno=#payno#; - insert into payrfd(payno,rtext,bankname,bankno,bankowner,isowner,rstatus,ruser,rphone,rreason,fgnor,fgnob,ramt,) + + delete from payrfditem + where rfdno in (select rfdno from payrfd where payno =#payno#); + + delete from payrfd where payno=#payno#; + + insert into payrfd(payno,rtext,bankname,bankno,bankowner,isowner,rstatus,ruser,rphone,rreason,fgnor,fgnob,ramt,) select distinct #payno#,#rtext#,#bankname# ,HEX(AES_ENCRYPT(#bankno#, )) ,#bankowner#,#isowner#,#rstatus#,#ruser# diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 2ca2e73..c4ff613 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -943,7 +943,7 @@ namespace NP.FO.Controllers foreach (var item in cmInningscdTmp) { vm.SelectCMInningscd = item; - if (item.studyplace != null) + if (vm.CM.cshape == 1) { item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); } @@ -1032,7 +1032,7 @@ namespace NP.FO.Controllers foreach (var item in cmInningscdTmp) { vm.SelectCMInningscd = item; - if (item.studyplace != null) + if (vm.CM.cshape == 1) { item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); } @@ -1189,7 +1189,7 @@ namespace NP.FO.Controllers foreach (var item in cmInningscdTmp) { vm.SelectCMInningscd = item; - if (item.studyplace != null) + if (vm.CM.cshape == 1) { item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); } @@ -1245,7 +1245,7 @@ namespace NP.FO.Controllers foreach (var item in cmInningscdTmp) { vm.SelectCMInningscd = item; - if (item.studyplace != null) + if (vm.CM.cshape == 1) { item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); } diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs index 07ad682..deb74c4 100644 --- a/FO/Controllers/FOBaseController.cs +++ b/FO/Controllers/FOBaseController.cs @@ -797,7 +797,7 @@ namespace NP.FO.Controllers foreach (var item in cmInningscdTmp) { vm.SelectCMInningscd = item; - if (item.studyplace != null) + if (vm.CM.cshape == 1) { item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일")); } diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs index aca500b..43198c4 100644 --- a/FO/Controllers/MyController.cs +++ b/FO/Controllers/MyController.cs @@ -48,6 +48,40 @@ namespace NP.FO.Controllers //신청중인강좌 없고 고객사사이트가 아니면 수강완료한 강좌 중 후행과정 -> 선행과정 -> 직급추천과정 2개 출력 vm.CMs = Dao.Get("lect.myrecomm", SUserInfo.UserNo); } + //20220803 + vm.Lects = Dao.Get("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } }); + + foreach (var item in vm.Datas) + { + //time5 = lect.sdate / time6 = lect.edate / pstatus=intval4 + if (item.intval4 == 22) + { + item.lectStatus = "미입금"; + } + else + { + // 입금상태 + if(item.time5 > DateTime.Now) + { + item.lectStatus = "입교확정"; + } + else if(item.time5 <= DateTime.Now && item.time2 >= DateTime.Now ) + { + item.lectStatus = "교육진행중"; + } + /*else if (item.time6 < DateTime.Now) + { + if (item.iscomplete == null || item.iscomplete == 0) + { + item.lectStatus = "미수료"; + } + else + { + item.lectStatus = "수료"; + } + }*/ + } + } return View(vm); } public ActionResult BoardList(VMCC vm) @@ -138,7 +172,7 @@ namespace NP.FO.Controllers } public ActionResult Ready(VMMy vm) { - vm.PIs = Dao.Get("pay.mypayitems", new System.Collections.Hashtable() { {"userno", SUserInfo.UserNo } }); + vm.PIs = Dao.Get("pay.mypayitems", new System.Collections.Hashtable() { {"userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } }); return View(vm); } public ActionResult ReadyPay(VMPay vm) @@ -163,16 +197,60 @@ namespace NP.FO.Controllers hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null); hsData.Add("cshape", vm.stringval); vm.Lects = Dao.Get("lect.mylectures", hsData); + + foreach (var item in vm.Lects) + { + if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now) + { + item.lectStatus = "미수료"; + } + else if (item.iscomplete == 1 && item.edate < DateTime.Now) + { + item.lectStatus = "수료"; + } + else if (item.sdate > DateTime.Now) + { + item.lectStatus = "입교확정"; + } + else if (item.sdate <= DateTime.Now) + { + item.lectStatus = "교육진행중"; + } + } + return View(vm); } public ActionResult LectureOn(VMMy vm) { + vm.cmm = Dao.Get("cm.cms", new System.Collections.Hashtable()).FirstOrDefault(); Hashtable hsData = new Hashtable(); hsData.Add("userno", SUserInfo.UserNo); hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null); //hsData.Add("cshape", 2); - hsData.Add("issubtable", 1); + hsData.Add("issubtable", 1); vm.Lects = Dao.Get("lect.mylectures", hsData); + + + foreach (var item in vm.Lects) + { + if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now) + { + item.lectStatus = "미수료"; + } + else if (item.iscomplete == 1 && item.edate < DateTime.Now) + { + item.lectStatus = "수료"; + } + else if (item.sdate > DateTime.Now) + { + item.lectStatus = "입교확정"; + } + else if (item.sdate <= DateTime.Now) + { + item.lectStatus = "교육진행중"; + } + } + return View(vm); } public ActionResult CertPrint(VMMy vm) @@ -473,6 +551,32 @@ namespace NP.FO.Controllers vm.Lects = Dao.Get("lect.lecture.document.past", ht); } + + foreach (var item in vm.Lects) + { + if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now) + { + item.lectStatus = "미수료"; + } + else if (item.iscomplete == 1 && item.edate < DateTime.Now) + { + item.lectStatus = "수료"; + } + else if (/*item.sdate == null &&*/ item.pstatus == 22) + { + item.lectStatus = "미입금"; + } + else if (item.sdate > DateTime.Now) + { + item.lectStatus = "입교확정"; + } + else if (item.sdate <= DateTime.Now) + { + item.lectStatus = "교육진행중"; + } + + } + return View(vm); } } diff --git a/FO/Views/CRoom/Boards.cshtml b/FO/Views/CRoom/Boards.cshtml index 1bd8a84..9f8f9b7 100644 --- a/FO/Views/CRoom/Boards.cshtml +++ b/FO/Views/CRoom/Boards.cshtml @@ -17,14 +17,14 @@
@foreach (var b in Model.Boards.Where(w => w.pbno == null)) { -
+
Q. @Html.Raw(b.subject ?? "")
- +
@@ -55,8 +55,10 @@ else }
+ @foreach (var b in Model.Boards) { + if (ViewBag.SSUserNo == b.cno) { + } }
@@ -73,6 +75,7 @@ else
if (Model.BM.bmtype > 0) diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml index 8b48e03..082c495 100644 --- a/FO/Views/Course/ApplyAgree.cshtml +++ b/FO/Views/Course/ApplyAgree.cshtml @@ -17,31 +17,43 @@

신청강좌

-
    +
      • - - @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") - - @{ - string strStudyPlaceTmp = ""; - if (Model.SelectCMInningscd.studyplace != null) - { - strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); - } - else - { - strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); - } - - //Model.SelectCMInningscd.eend2 교육종료일 - string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", +

        + + @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") + + @{ + string strStudyPlaceTmp = ""; + string strStudyPlaceTmp2 = ""; + string strEduInfo = ""; + if (Model.SelectCMInningscd.studyplace != null) + { + strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename); + strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname); + } + else + { + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); + } + if (Model.CM.cshape == 1) + { + strEduInfo = string.Format("교육기간 {0} | {2}시간과정 | {3}과정
        교육비 : {4}원", Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); - } - -

        + } + else + { + //Model.SelectCMInningscd.eend2 교육종료일 + strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정
        교육비 : {4}원", + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); + } } + +
        + +

      @@ -120,13 +132,17 @@ }

      - ※ 반드시 확인하세요
      - - 실제 이수해야 할 내용과 신청내용이 다른 경우 교육인정 및 수정이 불가능 하오니 정확하게 확인 해주세요.
      - - 상기 신청내용의 등급이 직무분야의 등급으로 맞게 기재되어 있는지 확인해주세요.(전문분야 등급 아님)
      - - 건설사업관리기술인은 감리업무를 수행하는 기술인을 말합니다.
      - - 승급교육일 경우 등급은 승급 후 등급이 기재되어야 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.
      - - 승급교육 또는 계속교육을 인정받으려면 기본교육 및 최초교육을 먼저 이수하여야 합니다.
      -

      + +
      + ※ 반드시 확인하세요
      + - 실제 이수해야 할 내용과 신청내용이 다른 경우 교육인정 및 수정이 불가능 하오니 정확하게 확인 해주세요.
      + - 상기 신청내용의 등급이 직무분야의 등급으로 맞게 기재되어 있는지 확인해주세요.(전문분야 등급 아님)
      + - 건설사업관리기술인은 감리업무를 수행하는 기술인을 말합니다.
      + - 승급교육일 경우 등급은 승급 후 등급이 기재되어야 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.
      + - 승급교육 또는 계속교육을 인정받으려면 기본교육 및 최초교육을 먼저 이수하여야 합니다.
      + - 모든 최초,승급,계속 교육 등은 직무분야 교육이며전문분야 관련으로 따로 이수하여야 할 교육은 없습니다. +       +

      @if (Model.CM.cshape == 1) { @@ -158,7 +174,7 @@ ※ 위 4가지 조건 모두 만족하셔야 수료가 가능합니다.
      ※ 하루 최대 학습 시간은 10차시 입니다.
      - ※ 현재 코로나로 인하여 기존 (동영상강의 시청 27시간 + 현장집체7시간 참석)에서 한시적으로 (동영상강의 시청 35시간)으로 진행합니다. + ※ 현재 코로나로 인하여 기존 (동영상강의 시청 28시간 + 현장집체7시간 참석)에서 한시적으로 (동영상강의 시청 35시간)으로 진행합니다. @*※ 국토부 장관이 인정하는 사유로 집체교육을 실시 하지 못할 시 에는 동영상강의로 대체되며 7시간을 100% 이수하셔야 수료가 가능합니다.
      *@

      diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml index b5f05b4..06e02ad 100644 --- a/FO/Views/Course/ApplyComplete.cshtml +++ b/FO/Views/Course/ApplyComplete.cshtml @@ -19,30 +19,43 @@ else var isallday = !string.IsNullOrEmpty(Model.CM.retimeymd) ? (Model.CM.retimeymd == "2099-12-31" ? true : false) : false;

      신청강좌

      -
        +
          • - - @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") - - @{ - string strStudyPlaceTmp = ""; - if (Model.SelectCMInningscd.studyplace != null) - { - strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); - } - else - { - strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); - } - - //Model.SelectCMInningscd.eend2 교육종료일 - string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", +

            + + @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") + + @{ + string strStudyPlaceTmp = ""; + string strStudyPlaceTmp2 = ""; + string strEduInfo = ""; + if (Model.SelectCMInningscd.studyplace != null) + { + strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename); + strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname); + } + else + { + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); + } + if (Model.CM.cshape == 1) + { + strEduInfo = string.Format("교육기간 {0} | {2}시간과정 | {3}과정
            교육비 : {4}원", Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); - } - -

            + + } + else + { + //Model.SelectCMInningscd.eend2 교육종료일 + strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정
            교육비 : {4}원", + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); + } + } +
            +

            +

          diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 94c4758..e30a91c 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -30,31 +30,44 @@

          신청강좌

          -
            +
              • - - @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") - - @{ - string strStudyPlaceTmp = ""; - if (Model.SelectCMInningscd.studyplace != null) - { - strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); - } - else - { - strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); - } - //Model.SelectCMInningscd.eend2 교육종료일 - string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", +

                + + @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") + + @{ + string strStudyPlaceTmp = ""; + string strStudyPlaceTmp2 = ""; + string strEduInfo = ""; + if (Model.SelectCMInningscd.studyplace != null) + { + strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename); + strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname); + } + else + { + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); + } + if (Model.CM.cshape == 1) + { + strEduInfo = string.Format("교육기간 {0} | {2}시간과정 | {3}과정
                교육비 : {4}원", Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); - } - -

                + }else { + //Model.SelectCMInningscd.eend2 교육종료일 + strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정
                교육비 : {4}원", + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); + } + } + + +
                + +

              @@ -83,7 +96,7 @@ @if (Model.CM.isaccommodation == 1 && Model.SelectCMInningscd.studyplace == "19") { -

              합숙여부 (영천교육장만 합숙가능)

              +

              합숙여부 (영천교육장만 합숙가능)

              • @@ -96,7 +109,7 @@ @if (Model.CM.isrefund == 1) { -

                환급여부선택 (고용보험 가입자만 환급가능)

                +

                환급여부선택 (고용보험 가입자만 환급가능)

                @@ -137,25 +150,25 @@ @if (Model.CM.isrefund == 1) {
                -

                환급금 수령계좌 등록 (법인계좌만 입력가능)

                +

                환급금 수령계좌 등록 (법인계좌만 입력가능)

                *는 필수 입력사항입니다.

                - + - + - + - +
                은행명
                계좌번호
                예금주
                고용보험관리번호
                @@ -389,6 +402,11 @@ @Html.Partial("./Partial/filescript") } - + + @if (ViewBag.isPayTest == "1") { //테스트일 경우 - + + } else { diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml index fb9708c..fcbb428 100644 --- a/FO/Views/My/Index.cshtml +++ b/FO/Views/My/Index.cshtml @@ -45,11 +45,11 @@
                -
                수강 가능한 과정 (입금이 완료되어 교육진행이 가능한 과정입니다.)
                +
                ■ 수강 가능한 과정 (입금이 완료되어 교육진행이 가능한 과정입니다.)
                더보기
                -

                ※ 이미 수료된 과정은 수강과정 메뉴에서 확인 가능합니다.

                -

                ※ 교육비 환불 신청은 결제관리 메뉴에서 가능합니다.

                +

                ※ 이미 수료된 과정은 수강과정 메뉴에서 확인 가능합니다.
                ※ 교육비 환불 신청은 결제관리 메뉴에서 가능합니다.

                +
                }
                -
                신청중인 과정 (신청되어 있는 과정이며 입금완료 시 수강 중인 과정으로 이동합니다.)
                더보기
                -

                ※ 온라인교육은 입금완료 시 바로 동영상 강의 시청이 가능합니다.

                -

                ※ 교육신청 취소는 신청과정 메뉴에서 가능 합니다.

                +
                ■ 신청중인 과정 (신청되어 있는 과정이며 입금완료 시 수강 중인 과정으로 이동합니다.)
                더보기
                +

                ※ 온라인교육은 입금완료 시 바로 동영상 강의 시청이 가능합니다.
                ※ 교육신청 취소는 신청과정 메뉴에서 가능 합니다.

                +
                - +
                @@ -23,28 +23,34 @@ @@ -69,7 +75,14 @@
                -
                교육일정변경
                + @if (Model.cmm.cshape == 1) + { +
                교육장교육 일정변경
                + } + else if (Model.cmm.cshape == 2) + { +
                교육종료일(수료일자) 변경
                + }
                @@ -87,11 +100,11 @@ } @section scripts{ - diff --git a/FO/css/mypage.css b/FO/css/mypage.css index 85e1fe5..d2bad56 100644 --- a/FO/css/mypage.css +++ b/FO/css/mypage.css @@ -86,18 +86,20 @@ .mpgcList li a h5 b {display:block; height:20px; line-height:20px; float:left;} .mpgcList li a h5 span.inline {display: inline-block; float: none; vertical-align: middle; margin-top: -3px;} .mpgcList li a h5 em {font-size:14pt; color:#238dfa; margin-right:10px; font-style:normal;} -.mpgcList li a h5 span {padding:0 10px; color:#fff; margin-right:5px; font-weight:300; font-size:10pt;background-color: #333583} +.mpgcList li a h5 span {padding:0 10px; color:#fff; margin-right:5px; font-weight:300; font-size:10pt;/*background-color: #333583*/} .mpgcList li a h5 span.mpglLable1 {background:#333583;} .mpgcList li a h5 span.mpglLable2 {background:#77b743;} +.mpgcList li a h5 span.nav_blu {background-color:#333583;} +.mpgcList li a h5 span.nav_grn {background-color:#77b743;} .mpgcList li a h5 b {font-size:14pt; font-weight:400;} .mpgcList li a dl {padding-top:10px;} .mpgcList li a dl:after {content:""; display:table; clear:both;} -.mpgcList li a dl dt {float:left; font-size:11pt; padding-right:10px; margin-right:10px; position:relative; color:#238dfa;} +.mpgcList li a dl dt {float:left; font-size:11pt; padding-right:10px; margin-right:10px; position:relative; color:/*#238dfa*/red;} .mpgcList li a dl dt:after {content:""; display:block; width:1px; height:14px; background:#d6d6d6; position:absolute; right:0; top:50%; margin-top:-7px;} .mpgcList li a dl dd {float:left; font-size:11pt; color:#888} .mpgcList li a dl dt.mpglSta1 {color:#ff0000;} .mpgcList li a dl dt.mpglSta2 {color:#333;} -.mpgcList li a dl dt.mpglSta3 {color:#00aeea;} +.mpgcList li a dl dt.mpglSta3 {color:/*#00aeea*/red;} .mpgnCont {background:#f9f9f9; margin-bottom:50px; padding:30px 20px;} .mpgNoti .mpgnCont:last-child {margin-bottom:0;} .mpgnList {} @@ -275,8 +277,11 @@ .ltaList h5 span, .ltaList h5 b {font-size:13pt; display:inline-block; vertical-align:middle; height:20px; line-height:20px; margin-right:5px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .ltaList h5 em {color:#238dfa; font-style:normal;} -.ltaList h5 span {color:#fff; background:#333583; padding:0 10px; font-size:10pt;} +.ltaList h5 span {color:#fff; /*background:#333583; */padding:0 10px; font-size:10pt;} +.ltaList h5 span.nav_blu {background-color:#333583;} +.ltaList h5 span.nav_grn {background-color:#77b743;} .ltaList h5 span.ppl {background:#a404b2} + .ltaList h5 strong {font-weight: 400;font-size: 11pt;line-height: 20px;vertical-align: middle;color: #0000ff;} .ltaList h5 b {font-weight:400; margin-right:0;} .ltaList h5 a.tstlTitle {font-size:13pt; display:inline-block; vertical-align:middle; height:20px; line-height:20px; margin-right:5px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .ltaList h5 a.print {display:inline-block; height:30px; line-height:30px; background:#000; color:#fff; font-size:10pt; padding:0 15px; margin-left:10px;} @@ -291,7 +296,7 @@ .ltaDl dt.ltaDlbk {color:#383838;} .ltaDl dt.ltaDlppl, .ltaDl dt.ltaDlppl a {color:#333583; font-size:12pt; font-weight:500;} -.ltaDl dd {color:#888; margin-right:20px;} +.ltaDl dd {color:#888;} .ltaDl dd a {font-size:12pt; color:#888;} .ltaDl dd span {color:#ff0000; font-size:12pt;} .ltaDl dd:last-child {margin-right:0;} @@ -367,7 +372,7 @@ .ltaBtn {text-align:left;} .ltaBtn select {float:left; min-width:80px; height:30px;} .ltaBtn > span, - .ltaBtn > a {float:left; font-size:11pt; height:30px; line-height:30px;} + .ltaBtn > a {float:left; font-size:11pt; height:30px; line-height:30px; text-align:center;} .ltaBtn dl {width:auto; float:left; padding:5px 0;} .ltaBtn dl:after {content:""; display:table; clear:both;} .ltaBtn dl dd {float:left; margin:0; margin-right:5px;} @@ -410,7 +415,7 @@ .mpgPop {position:fixed; top:0; left:0; right:0; bottom:0; background:rgba(0,0,0,0.7); z-index:100;} .mpgPop > div {display:table; width:100%; height:100%;} .mpgPop > div > div {display:table-cell; width:100%; vertical-align:middle;} -.mpgPopWrap {width:100%; max-width:440px; max-height:100%; margin:0 auto; background:#fff; position:relative;} +.mpgPopWrap {width:100%;max-width:500px; max-height:100%; margin:0 auto; background:#fff; position:relative;} .mpgPopWrap.wdth430 {max-width:430px;} .mpgPopWrap.wdth580 {max-width:580px;} .mpgPopWrap.wdth650 {max-width:650px;} @@ -532,9 +537,11 @@ .bskList tbody td h5 span, .bskList tbody td h5 b {display:inline-block; vertical-align:middle; height:20px; line-height:20px; font-weight:400;} .bskList tbody td h5 a {height:30px; line-height:30px; display:inline-block; vertical-align:middle; margin-left:10px; background:#000; color:#fff; font-size:10pt; width:100px; text-align:center;} -.bskList tbody td h5 span {margin-right:5px; width:40px; text-align:center; color:#fff; font-size:10pt;} +.bskList tbody td h5 span {margin-right:5px; text-align:center; color:#fff; font-size:10pt;padding: 0 3px;} .bskList tbody td h5 span.blu {background:#238dfa;} -.bskList tbody td h5 span.ppl {background:#333583;} +/*.bskList tbody td h5 span.ppl {background:#333583;}*/ +.bskList tbody td h5 span.nav_blu {background-color:#333583;} +.bskList tbody td h5 span.nav_grn {background-color:#77b743;} .bskList tbody td h5 span.grn {background:#77b743;} .bskList tbody td h5 span.org {background:#f36f21;} .bskList tbody td h5 span.bk {background:#000;} @@ -719,9 +726,11 @@ .payTlist h5 {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .payTlist h5 span, .payTlist b {display:inline-block; vertical-align:middle; height:20px; line-height:20px; font-weight:400;} -.payTlist h5 span {margin-right:5px; width:40px; text-align:center; color:#fff; font-size:10pt;} +.payTlist h5 span {margin-right:5px; /*width:40px;*/ text-align:center; color:#fff; font-size:10pt; padding:0 8px;} .payTlist h5 span.blu {background:#238dfa;} -.payTlist h5 span.ppl {background:#333583;} +/*.payTlist h5 span.ppl {background:#333583;}*/ +.payTlist h5 span.nav_blu {background-color:#333583;} +.payTlist h5 span.nav_grn {background-color:#77b743;} .payTlist h5 span.grn {background:#77b743;} .payTlist h5 span.org {background:#f36f21;} .payTlist h5 span.bk {background:#000;} @@ -1025,8 +1034,8 @@ .mpgpBtn {width: 50px; height: 30px; line-height: 28px; font-size: 10pt;} } - - +.warningbutton {padding: 5px 10px; background: #ffffff; border: 1px solid black;} +.lectstatus{color:red;} diff --git a/FO/css/style.css b/FO/css/style.css index d6d67a3..5993d4b 100644 --- a/FO/css/style.css +++ b/FO/css/style.css @@ -78,6 +78,13 @@ body { .mt0 { margin-top: 0 !important; } +.red { + color: red; +} + +.blu { + color: #0047a7; +} /* GNB */ @@ -9918,7 +9925,8 @@ span.org { .smtlCont { position: relative; padding: 30px 20px; - padding-right: 240px; + padding-right: 300px; + word-break: keep-all; } .smtList.pop .smtlCont { @@ -9995,7 +10003,7 @@ span.org { position: absolute; right: 20px; top: 50%; - margin-top: -25px; + /*margin-top: -25px;*/ } .smtlBtn:after { @@ -10007,6 +10015,7 @@ span.org { .smtlBtn li { float: left; margin-right: 10px; + font-size: 18px } .smtlBtn li:last-child { @@ -10026,7 +10035,10 @@ span.org { border: solid 1px #0047a7; color: #0047a7; } - +.smtlChk label { + cursor: auto; + font-size: 15pt; +} .smtlBtn li a.smtlBtn02 { border: solid 1px #383838; background: #383838; @@ -10084,42 +10096,50 @@ span.org { padding: 0 20px; } - .smtlChk > li { - padding: 30px 0; + .smtlChk li { + padding: 30px; border-bottom: solid 1px #eaeaea; position: relative; - padding-left: 30px; - padding-right: 140px; + line-height: 1.8em; } - .smtlChk > li:last-child { + .smtlChk li:last-child { border-bottom: none; } - .smtlChk > li input[type="checkbox"] { + .smtlChk li input[type="checkbox"] { position: absolute; left: 0; top: 50%; margin-top: -9px; } - .smtlChk > li > p { + .smtlChk li p { } - .smtlChk > li > p span { + .smtlChk li p span { } - .smtlChk > li > p span.blu { + .smtlChk li p span.blu { color: #0047a7; } - .smtlChk > li > p span.gry { + .smtlChk li p span.gry { color: #666; } - .smtlChk > li > p span.red { + .smtlChk li p span.red { color: #f00; } + .smtlChk li p span.cshapelabel { + color: #fff; + /* background: #333583;*/ + padding: 0 10px; + font-size: 10pt; + margin-left: 5px; + } + .smtlChk li p span.nav_blu {background-color:#333583;color: #fff;padding: 0 10px; font-size: 11pt;margin-left: 5px;} + .smtlChk li p span.nav_grn {background-color:#77b743;color: #fff;padding: 0 10px; font-size: 11pt; margin-left: 5px;} .smtlChkBtn { display: block; @@ -10154,6 +10174,11 @@ span.org { background: #f4f4f4; color: #929292; } + .smtlChkBtn.smtlChk05 { + border: solid 1px #f4f4f4; + background: red; + color: #fff; + } @media (max-width:900px) { @@ -10299,19 +10324,19 @@ span.org { padding: 0 10px; } - .smtlChk > li { + .smtlChk li { padding: 20px 0; padding-right: 0; } - .smtlChk > li input[type="checkbox"] { + .smtlChk li input[type="checkbox"] { position: absolute; left: 0; top: 20px; margin-top: 3px; } - .smtlChk > li > p { + .smtlChk li p { padding-left: 30px; } diff --git a/FO/js/mypage.js b/FO/js/mypage.js index 8ec4efd..5d7b91a 100644 --- a/FO/js/mypage.js +++ b/FO/js/mypage.js @@ -65,18 +65,21 @@ $(document).ready(function () { if (complete != undefined && complete == 0) { - msg("해당 과정은 미 수료 상태 입니다." + - "교육일정변경 메뉴에서 교육일정을 변경 해주세요." + - "※ 미 수료 상태로 교육시작일 이후 1년 경과 시 교육이 취소되어 일정변경이 불가합니다." + - "※ 확인 클릭 시 교육일정변경 메뉴로 이동합니다." + msg("해당 과정은 미 수료 상태 입니다.
                " + + "교육일정변경 메뉴에서 교육일정을 변경 해주세요.

                " + + "※ 미 수료 상태로 교육시작일 이후 1년 경과 시 교육이 취소되어 일정변경이 불가합니다.
                " + + "※ 확인 클릭 시 교육일정변경 메뉴로 이동합니다.", null, null, null, "location.href='" + '/My/LectureOn' + "'" ); + return false; } if (href != undefined && href != null && href.toLowerCase().indexOf("croom/index?croomlectno=") != -1) { var cshape = $(this).data("cshape"); if (cshape != undefined && cshape == 1) { - msg("해당 과정은 교육장에 직접 오셔서 수강하는 과정 입니다." + + msg("해당 과정은 교육장에 직접 오셔서 수강하는 과정 입니다.
                " + "교육기간을 확인하시고 시작일에 해당 교육장으로 입교 부탁 드립니다."); + /*location.href = '/My/LectureOn';*/ + return false; } else if (cshape != undefined && cshape == 2) { diff --git a/Model/BaseModel.cs b/Model/BaseModel.cs index 427fd3d..9306011 100644 --- a/Model/BaseModel.cs +++ b/Model/BaseModel.cs @@ -490,6 +490,20 @@ namespace NP.Model public class Data : BaseModel { + /// + /// 20220804 비교구문 추가 + /// + public int? iscomplete { get; set; } + /// + /// 20220804 비교구문 추가 + /// + public string lectStatus { get; set; } + /// + /// 20220804 비교구문 추가 + /// + public int studytime { get; set; } + public int? studyplace { get; set; } + public string studyplacename { get; set; } public int dtype { get; set; } public int intval { get; set; } public int intval2 { get; set; } diff --git a/Model/CM.cs b/Model/CM.cs index 8ff0740..d7d1940 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -67,7 +67,7 @@ namespace NP.Model public int cmno { get; set; } public String cmnos { get; set; } public int orgcmno { get; set; } - + public int ccode { get; set; } /// /// 과정여부 0:강좌,1:과정,2:패키지 /// @@ -970,6 +970,13 @@ namespace NP.Model } } + /// + /// 수강상태 + /// 20220803 + /// + public string lectStatus { get; set; } + public string studychange { get; set; } + /// /// 수료여부 null:미처리,0:미수료,1:수료 /// @@ -999,7 +1006,7 @@ namespace NP.Model { get { - return isrebate == 1 ? "환급" : "비환급"; + return isrebate == 1 ? "환급과정" : "비환급과정"; } } /// diff --git a/Model/Pay.cs b/Model/Pay.cs index b9e3917..894d98c 100644 --- a/Model/Pay.cs +++ b/Model/Pay.cs @@ -538,7 +538,7 @@ namespace NP.Model /// /// 학습장소 /// - public int studyplace { get; set; } + public int? studyplace { get; set; } /// /// 학습장소명 /// @@ -554,7 +554,7 @@ namespace NP.Model { get { - return sdate == null ? "-" : sdate.Value.ToString("yy-MM-dd"); + return sdate == null ? "-" : sdate.Value.ToString("yyyy년 MM월 dd일"); } } /// @@ -568,7 +568,7 @@ namespace NP.Model { get { - return edate == null ? "-" : edate.Value.ToString("yy-MM-dd"); + return edate == null ? "-" : edate.Value.ToString("yyyy년 MM월 dd일"); } } /// @@ -596,7 +596,7 @@ namespace NP.Model { get { - return cmieend == null ? "-" : cmieend.Value.ToString("yy-MM-dd"); + return cmieend == null ? "-" : cmieend.Value.ToString("yyyy년 MM월 dd일"); } } /// @@ -639,6 +639,7 @@ namespace NP.Model public int attrate { get; set; } public String userpno { get; set; } + public string studytime { get; set; } } ///
                - @if(d.cshape == 1) + + @d.cshapename + @if (d.studyplace == null) { - @d.tyear-@(d.tseq)기 + @d.studyplacename 교육장 } - @d.cshapename - @Html.Raw(d.isrebate == 1 ? "환급" : "") + else if (d.studyplace != null) + { + @d.studyplacename 교육장 + } + @d.cname (@(d.classno))
                -
                DateTime.Now ? "ltaDlblue" : "ltaDlred")">@(d.edate > DateTime.Now ? "교육기간 학습중" : d.edate.Value.AddYears(1) > DateTime.Now ? "복습가능" : "종료")
                +
                + @d.lectStatus +
                @*교육기간 : @(string.Format("{0} ~ {1}", d.cshape == 1 ? d.sdate.Value.ToString("yy-MM-dd") : d.cdt.ToString("yy-MM-dd") , d.edate.Value.ToString("yy-MM-dd")))*@ - 교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yy-MM-dd"), d.edate.Value.ToString("yy-MM-dd"))) + 교육기간 : @(string.Format("{0} ~ {1}", d.sdate.Value.ToString("yyyy년 MM월 dd일"), d.edate.Value.ToString("yyyy년 MM월 dd일")))
                - @if(d.cshape != 1) + @if (d.cshape != 1) { -
                복습기간 : @(d.edate.Value.AddYears(1).ToString("yy-MM-dd"))까지
                - } - @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01")) - { -
                @(d.scdtype == 1 ? "교육종료일" : "집체교육일") : @(string.Format("{0}", d.estart.ToString("yy-MM-dd")))
                +
                교육종료일 : @(string.Format("{0}", d.estart.ToString("yyyy년 MM월 dd일")))
                +
                } +
                @d.studytime 시간과정
                + @Html.Raw(d.isrebate == 1 ? "환급과정" : "비환급과정")