diff --git a/BO/Views/croom/grade4.cshtml b/BO/Views/croom/grade4.cshtml index 6500cd4..16dd93c 100644 --- a/BO/Views/croom/grade4.cshtml +++ b/BO/Views/croom/grade4.cshtml @@ -1,43 +1,47 @@ -@model NP.Model.VMLect -@{ +@model NP.Model.VMLect +@{ int idx = 1; }
-@if (Model.CMSDs.Count() < 1) -{ - @:*등록된 과제가 없습니다. -} -else -{ - - - - - - - @foreach (var e in Model.CMSDs) - { - - - - -
회차선택 - -
+ }
@@ -66,22 +70,22 @@ else -@foreach (var d in Model.LectSDs) -{ - - - @d.rnorvt - @d.isrebatename - @d.asname - @d.usernameid - @d.sdstatename - @d.cpoint2 - @d.feedbox - @d.copyratename - @Html.Raw(d.submittimeip) - @Html.Raw(d.checktimeip) - -} + @foreach (var d in Model.LectSDs) + { + + + @d.rnorvt + @d.isrebatename + @d.asname + @d.usernameid + @d.sdstatename + @d.cpoint2 + @d.feedbox + @d.copyratename + @Html.Raw(d.submittimeip) + @Html.Raw(d.checktimeip) + + }
@@ -89,9 +93,10 @@ else @Html.Partial("./Partial/dform", Model)
-

개별 과제제출 내용닫기

-
- @*
제목
*@ +
+

개별 과제제출 내용닫기

+
+ @*
제목
*@ @@ -103,25 +108,47 @@ else - + - + - + + + + +
제출자
첨부파일 + +
+
+
점수
피드백
참고사항
-


-
- ◀이전 - 저장 - 다음▶ -    닫기 -
-

+


+
+ ◀이전 + 저장 + 다음▶ +    닫기 +
+

+ + + + + + + +

일괄평가닫기

@@ -145,16 +172,50 @@ else

+@Html.Partial("./Partial/FileScript") diff --git a/BO/Views/croom/gradeall4.cshtml b/BO/Views/croom/gradeall4.cshtml index fb11804..037a7e4 100644 --- a/BO/Views/croom/gradeall4.cshtml +++ b/BO/Views/croom/gradeall4.cshtml @@ -100,39 +100,61 @@
-

개별 과제제출 내용닫기

-
- - - - - - - - - - - - - - - - - - - - - - -
제출자
제출내용
첨부파일
점수
피드백
-


-
- ◀이전 - 저장 - 다음▶ -    닫기 -
-

+
+

개별 과제제출 내용닫기

@*PMS 6987관련 페이지*@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
제출자
제출내용
첨부파일 + +
+
+
점수
피드백
참고사항
+


+
+ ◀이전 + 저장 + 다음▶ +    닫기 +
+

+ + + + + + + +
+ +@Html.Partial("./Partial/FileScript") diff --git a/BO/Web.config b/BO/Web.config index 9b979cd..4eec37f 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 b534711..dbff3c2 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -232,9 +232,9 @@ namespace NP.Base.Controllers /// /// [HttpPost] - public JsonResult DeleteFile(Int64 key = 0, String fName = "", Int64 fgno = 0, int isSingleFile = 0, String log = "") + public JsonResult DeleteFile(Int64 key = 0, String fName = "", Int64 fgno = 0, int isSingleFile = 0, String log = "", String datakey = null) { - var rtn = DropFile(key, fName); + var rtn = DropFile(key, fName, datakey); if (rtn < 1) { throw new System.ArgumentNullException("nodata"); diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 2e738dd..5c8896e 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -833,7 +833,9 @@ namespace NP.Base.Controllers pagenum = pagenum < 1 ? 1 : pagenum; pagerowcount = pagerowcount < 1 ? PageRowCount : pagerowcount; - return JsonBack(Dao.Get("lect.lectsds.all", new System.Collections.Hashtable() { { "estate", sdstate }, { "pagenum", pagenum }, { "pagerowsize", pagerowcount }, { "edate", edate },{"sdateall",sdateall },{"edateall",edateall }, { "cshape", cshape }, { "cname", cname }, { "cnamestr", cnamestr }, { "iscomplete", iscomplete }, { "studyplace", studyplace }, { "searchtype", searchtype }, {"searchtext",searchtext } ,{"sdtype",sdtype },{"asname",asname }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 }, })); + var result = Dao.Get("lect.lectsds.all", new System.Collections.Hashtable() { { "estate", sdstate }, { "pagenum", pagenum }, { "pagerowsize", pagerowcount }, { "edate", edate }, { "sdateall", sdateall }, { "edateall", edateall }, { "cshape", cshape }, { "cname", cname }, { "cnamestr", cnamestr }, { "iscomplete", iscomplete }, { "studyplace", studyplace }, { "searchtype", searchtype }, { "searchtext", searchtext }, { "sdtype", sdtype }, { "asname", asname }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 }, }); + + return JsonBack(result); } /// /// 과제제출상세정보 @@ -856,6 +858,12 @@ namespace NP.Base.Controllers { d.uno = SUserInfo.UserNo; d.uip = GetUserIP(); d.isproduct = GetConfig("isstaging") == "1" ? (int?)null : 1; + if (Request.Files.GetMultiple("fgno").Where(w => !string.IsNullOrEmpty(w.FileName)).Count() > 0) + { + //d.fgno = SetFile(Request.Files.GetMultiple("fgno").Where(w => !string.IsNullOrEmpty(w.FileName)).ToList(), d.fgno ?? 0, "lectsd", "fgno"); + d.fgno = SetFile(Request.Files.GetMultiple("fgno").Where(w => !string.IsNullOrEmpty(w.FileName)).ToList(), d.fgno ?? 0, "lectsd", "fgno", 1, "XX", false, true, d.cmno, d.userno); + } + return JsonOK(Dao.Save("lect.lectsd"+(d.ccount == 1 ? "2" : "")+".save" + (string.IsNullOrEmpty(d.lectnos) ? "" : "batch"), d)); } /// diff --git a/Base/Controller/BasePartialController.cs b/Base/Controller/BasePartialController.cs index 3ca4827..bad2176 100644 --- a/Base/Controller/BasePartialController.cs +++ b/Base/Controller/BasePartialController.cs @@ -468,7 +468,7 @@ namespace NP.Base } return SetFile(fs, fgno, tablename, columnname, fseq, FGKey, false, false, 0); } - protected long? SetFile(IList upFiles, long fgno, String tablename, String columnname, int fseq = 1, String FGKey = "XX", bool iscontents = false, bool issubject = false, int cmno = 0) + protected long? SetFile(IList upFiles, long fgno, String tablename, String columnname, int fseq = 1, String FGKey = "XX", bool iscontents = false, bool issubject = false, int cmno = 0, long userno = 0) { try { @@ -483,7 +483,7 @@ namespace NP.Base var fg = Dao.Get("sys.file.getfgnobyfgkey", FGKey).FirstOrDefault(); fgno = fg == null ? 0 : fg.fgno; } - var finfos = new NP.Model.File() { fgno = fgno, tablename = tablename, columnname = columnname, uno = SUserInfo.UserNo, uip = GetUserIP() }; + var finfos = new NP.Model.File() { fgno = fgno, tablename = tablename, columnname = columnname, uno = userno > 0 ? userno : SUserInfo.UserNo, uip = GetUserIP() }; finfos.Files = new List(); var _month = DateTime.Now.ToString("yyyyMM"); if (issubject) diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 4caa8bf..c3153ee 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1890,7 +1890,7 @@ select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth ,a.remainPeople - ,a.isselected, + ,a.isselected ,case when a.remainPeople <= 0 then 0 else 1 end isend from ( @@ -1920,7 +1920,7 @@ select a.* from ( select - a.cmno,a.pcmno,a.cgcode + a.cmno,a.pcmno ,a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth ,a.remainPeople ,a.isselected @@ -1937,12 +1937,12 @@ ,a.studyplace,case when c.scdtype =1 then '온라인' else e.cname end studyplacename ,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected ,c.scdtype - ,d.cmno,d.pcmno,cg.cgcode + ,d.cmno,d.pcmno ,d.cshape from cminningscd a left outer join cminning c on c.cmino = a.cmino left outer join cm d on d.cmno = c.cmno - left outer join cg cg on d.cgno = cg.cgno + left outer join comcode e on e.ccode = a.studyplace c.cmno=#cmno# @@ -1965,7 +1965,7 @@ select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth ,a.studyplace, a.studyplacename,a.remainPeople - ,a.isselected, a.cmno,a.pcmno,a.cgcode + ,a.isselected ,case when a.estart < date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second) from cminningscd a left outer join cminning c on c.cmino = a.cmino left outer join cm d on d.cmno = c.cmno - left outer join cg cg on d.cgno = cg.cgno + left outer join comcode e on e.ccode = a.studyplace left outer join lect f on f.lectno = #lectno# diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index bc5a316..c52cb64 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1190,64 +1190,101 @@ 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 - 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# - and g.cshape = #cshape# - and g.cname like concat('%',#cname#,'%') - and g.cname like concat('%',#cname#,'%') - and ifnull(a.iscomplete,0) = #iscomplete# - and h.studyplace = #studyplace# - and d.username like concat('%',#usernamestr#,'%') - and d.userid like concat('%',#useridstr#,'%') - and b.sdtype=#sdtype# - and a.cmno=#cmno# - and a.isrebate=#isrebate# - + + 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# + + + and g.cshape = #cshape# + + + and g.cname like concat('%',#cname#,'%') + + + and g.cname like concat('%',#cname#,'%') + + + and ifnull(a.iscomplete,0) = #iscomplete# + + + and h.studyplace = #studyplace# + + + and d.username like concat('%',#usernamestr#,'%') + + + and d.userid like concat('%',#useridstr#,'%') + + + and b.sdtype=#sdtype# + + + and a.cmno=#cmno# + + + and a.isrebate=#isrebate# + + + and c.submittime is null and c.submittime is not null - - - + + + + and d.username like concat('%',#searchtext#,'%') and d.userid like concat('%',#searchtext#,'%') - - and (case when g.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00') - and (case when g.cshape = 2 then h.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59') - and e.asname like concat('%',#asname#,'%') - and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%') - and d.status = #ustatus# + + + and (case when g.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00') + + + and (case when g.cshape = 2 then h.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59') + + + and e.asname like concat('%',#asname#,'%') + + + and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%') + + + and d.status = #ustatus# + + ) a order by rno update lectsd set - ,iscopy=#iscopy#,cpoint=#cpoint# - ,feedb=#feedb# - ,checktime=case when #cpoint# is not null or #feedb# is not null then now() else checktime end - ,checkip=case when #cpoint# is not null or #feedb# is not null then #uip# else checkip end - where lectno=#lectno# and sdno=#sdno#; + ,iscopy=#iscopy#,cpoint=#cpoint# + ,feedb=#feedb# + ,memo=#memo# + ,checktime=case when #cpoint# is not null or #feedb# is not null then now() else checktime end + ,checkip=case when #cpoint# is not null or #feedb# is not null then #uip# else checkip end + ,fgno=#fgno# + where lectno=#lectno# and sdno=#sdno#; - insert into lectsd (lectno,sdno,atext,fgno,copyrate,iscopy,cpoint,feedb,submittime,submitip,checktime,checkip,) - select #lectno#,#sdno#,null,null,null,#iscopy#,#cpoint#,#feedb#,null,null - ,case when #cpoint# is not null or #feedb# is not null then now() else null end - ,case when #cpoint# is not null or #feedb# is not null then #uip# else null end - , + insert into lectsd (lectno,sdno,atext,fgno,copyrate,iscopy,cpoint,feedb,memo,submittime,submitip,checktime,checkip,) + select #lectno#,#sdno#,null,#fgno#,null,#iscopy#,#cpoint#,#feedb#,#memo#,null,null + ,case when #cpoint# is not null or #feedb# is not null then now() else null end + ,case when #cpoint# is not null or #feedb# is not null then #uip# else null end + , from (select 1 col1) a left outer join lectsd b on b.lectno=#lectno# and b.sdno=#sdno# where b.lectno is null diff --git a/Dao/MyBatis/Maps/board.xml b/Dao/MyBatis/Maps/board.xml index cb12fd7..2c9417c 100644 --- a/Dao/MyBatis/Maps/board.xml +++ b/Dao/MyBatis/Maps/board.xml @@ -185,7 +185,8 @@ ,e.asname ,c.bmno,c.bmname,c.isuseopening,c.isreply ,f.opname - ,b.bno,b.pbno,b.subject,b.istop,b.issecr,b.cdt,d.username cnoname,b.rcount,b.fgno,b.fgnothumb,b.cmno + + ,b.bno,b.pbno,b.subject,b.istop,b.issecr,b.cdt,d.username cnoname,d.userid cnoid, b.rcount,b.fgno,b.fgnothumb,b.cmno ,g.cname,g.classno ,h.tyear,h.tseq from ( diff --git a/FO/Spring/ControllersDev.xml b/FO/Spring/ControllersDev.xml index a77a8ba..39f4d4c 100644 --- a/FO/Spring/ControllersDev.xml +++ b/FO/Spring/ControllersDev.xml @@ -8,7 +8,7 @@ - + diff --git a/Model/CM.cs b/Model/CM.cs index 27e3bcb..83ef8c5 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -3726,6 +3726,10 @@ namespace NP.Model /// 1000 피드백 /// public String feedb {get;set;} + /// + /// 1000 참고사항 + /// + public String memo { get; set; } public String feedbox { get