diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 3e38d6f..8ae54e4 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -418,6 +418,7 @@ namespace NP.BO.Controllers case 0: { ViewBag.fronturl = GetConfig("fronturl"); + ViewBag.reporturl = GetConfig("reporturl"); if (Dao.Get("cm.cmev", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno } }).Count > 0) { vm.CMEV = Dao.Get("cm.cmev", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno } }).First(); diff --git a/BO/Views/croom/grade.cshtml b/BO/Views/croom/grade.cshtml index 8c6c210..22b788f 100644 --- a/BO/Views/croom/grade.cshtml +++ b/BO/Views/croom/grade.cshtml @@ -23,6 +23,7 @@ @section scriptsHeader{ @Html.Partial("./Partial/semscript") @Html.Partial("./Partial/FileScript") + @Html.Partial("./Partial/ScriptDate") } @section scripts{ diff --git a/BO/Views/croom/grade1.cshtml b/BO/Views/croom/grade1.cshtml index 1e8e54b..0bd3f76 100644 --- a/BO/Views/croom/grade1.cshtml +++ b/BO/Views/croom/grade1.cshtml @@ -61,7 +61,14 @@ @foreach (var d in Model.CMInnings) { - + if (Model.CM.cshape == 2) + { + + } + else + { + + } } diff --git a/BO/Web.config b/BO/Web.config index 66525ac..660b234 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -32,10 +32,11 @@ + - + diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 01ded64..6a1397f 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -922,6 +922,10 @@ namespace NP.Base.Controllers { return JsonOK(Dao.Save("pay.unpaymoney", new Hashtable() { { "payno", payno },{ "payoktime", payoktime}, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); } - + [HttpPost] + public JsonResult LectTimeChange(Int64 lectno, DateTime? completetime, Int64 cshape) + { + return JsonOK(Dao.Save("lect.completetime.change", new Hashtable() { { "lectno", lectno }, { "completetime", completetime }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); + } } } \ No newline at end of file diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index cc9b507..0d2e4ca 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -245,7 +245,7 @@ select a.lectno,b.userno ,row_number() over(order by $orderby$c.cname,c.cmno,u.username ) rno ,count(a.lectno) over() pagetotalcount - ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete + ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime ,p.payoktime ,c.sstime,c.cmno,c.cname,c.classno ,b.attrate diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index adb12f4..7789514 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1297,6 +1297,11 @@ order by a.idx,b.retime limit 2 + + update lect set + ,completetime=#completetime# + where lectno=#lectno# and iscomplete=1; + diff --git a/Model/CM.cs b/Model/CM.cs index 10842c6..479e3da 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -1052,6 +1052,7 @@ namespace NP.Model public String lectnos { get; set; } public String cmnos { get; set; } public int ispassat { get; set; } + public DateTime? completetime { get; set; } } /// /// 자격검정시험