diff --git a/BO/Views/Shared/Partial/ScdScript.cshtml b/BO/Views/Shared/Partial/ScdScript.cshtml index 88bbfca..0e87bda 100644 --- a/BO/Views/Shared/Partial/ScdScript.cshtml +++ b/BO/Views/Shared/Partial/ScdScript.cshtml @@ -45,22 +45,24 @@ ulScd.empty(); var seq = 0; let tempVal = ""; + let tempVal2 = ""; $.each(capResult.obj, function (i, d) { var li = $("
  • "); + tempVal2 = d.comment == null ? "" : "
    (" + d.comment + ")" //if (d.isEnd == true) { //li.append(""); //} //else { if (d.quota != 0) { if (d.remainPeople <= 0) { - li.append(""); + li.append(""); } else { if (seq == 0) { - li.append(""); + li.append(""); } else { - li.append(""); + li.append(""); } } } diff --git a/BO/Views/cm/cmregeduschedule.cshtml b/BO/Views/cm/cmregeduschedule.cshtml index 085ff1f..e6dbf0e 100644 --- a/BO/Views/cm/cmregeduschedule.cshtml +++ b/BO/Views/cm/cmregeduschedule.cshtml @@ -76,7 +76,7 @@ }
    일정등록
    -
    교육일정등록 @(cmino)
    +
    교육일정등록
    @@ -181,7 +181,7 @@ @*@Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary() { { "checked", Model.CM.studyplace }, { "name", "istudyplace" }, { "isreadonly", 0 } })*@ @foreach (var item in Model.ComCodes.Where(w => w.cgroup == "studyplace")) { - + studyplaceseq++; } @@ -190,6 +190,10 @@ + + + +
    제한인원 @Html.TextBox("iquota", "", new { @class = "form-control disp-init int nocomma text-center", @style = "width: 80px;", @maxlength = "5" })
    안내문구@Html.TextBox("icomment", "", new { @class = "form-control disp-init", @style = "width: 98%;", @maxlength = "30" })
    저장 @@ -305,7 +309,8 @@ estart2: estart, eend2: eend, quota: _isonline ? 99999 : getv("iquota"), - sseq : getv("sseq"), + sseq: getv("sseq"), + comment: getv("icomment"), studyplace: _isonline ? null : $(":input:radio[name=istudyplace]:checked").val() }, "cbcminningscdsave", null, null, null, true); } @@ -417,6 +422,7 @@ setv("iquota", getint(d.quota)); setv("sseq", getint(d.sseq)); + setv("icomment", d.comment); if (d.studyplace != null) { $("input:radio[name=istudyplace][value=" + d.studyplace + "]").attr("checked", true); } diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 6f1283e..8199faa 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -545,7 +545,7 @@ select a.* from ( select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.sseq - ,a.cmisno value,date_format(a.estart,'%Y-%m-%d') text + ,a.cmisno value,date_format(a.estart,'%Y-%m-%d') text, a.comment ,b.scdtype ,case when b.scdtype =1 then '온라인' else c.cname end studyplacename ,(select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0) regmem @@ -583,10 +583,16 @@ SELECT * FROM (SELECT LAST_INSERT_ID(0) col1) a WHERE col1 > 0; - insert into cminningscd(cmino,estart,eend,quota,studyplace,sseq,) - values(#cmino#,#estart#,#eend#,#quota#,#studyplace#,#sseq#,) + insert into cminningscd(cmino,estart,eend,quota,studyplace,sseq,comment,) + values(#cmino#,#estart#,#eend#,#quota#,#studyplace#,#sseq#,#comment#,) SELECT last_insert_id() + + update cminningscd a + set ,cmino=#cmino#,estart=#estart#,eend=#eend#,quota=#quota# + ,studyplace=#studyplace#,sseq=#sseq#,comment=#comment# + where a.cmisno=#cmisno# + update cminning a left outer join ( @@ -599,11 +605,6 @@ ,isscd = #isscd#,scdtype=#scdtype# where a.cmino=#cmino# and b.cmino is null - - update cminningscd a - set ,cmino=#cmino#,estart=#estart#,eend=#eend#,quota=#quota#,studyplace=#studyplace#,sseq=#sseq# - where a.cmisno=#cmisno# - update cminningscd a set ,quota=99999,studyplace=null @@ -1890,11 +1891,11 @@ select - a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth + a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment ,a.studyplace, a.studyplacename,a.remainPeople ,a.isselected, a.cmno,a.pcmno,a.cgcode @@ -2023,6 +2026,7 @@ ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople ,a.studyplace, e.cname studyplacename ,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode + ,a.comment from cminningscd a left outer join cminning c on c.cmino = a.cmino left outer join cm d on d.cmno = c.cmno diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index d9f06c7..c4fb22e 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -479,7 +479,6 @@ ulScd.append(li); } - $.each(capResult.obj, function (i, d) { var li = $("
  • "); var pData = $("

    "); @@ -490,12 +489,13 @@ var radioEduDay = "(" + d.comment + ")" if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null && d.studyplacename != '') { strStudyPlacename = '[' + d.studyplacename + '교육장]'; } if (d.isEnd == true) { - pData.html("" + radioEduDay + " disabled> " + d.scdInfoSummary + ""); + pData.html("" + radioEduDay + " disabled> " + d.scdInfoSummary + comment + ""); } else { /* by 인덕 @@ -550,7 +550,7 @@ if (d.remainPeople <= 0) { // remainPeople(등록가능인원수) <= 0 spanApplyClassN.text("접수마감"); aApplyClass.append(spanApplyClassN); - pData.html("

  • "); if (d.cmisno == 12763) { @@ -235,25 +236,25 @@ if (d.quota != 0) { if (d.remainPeople <= 0) { - pData.html(""); + pData.html(""); } else { if (d.isselected == 1) { //spanApplyClass.text("수강신청"); //aApplyClass.append(spanApplyClass); - pData.html(""); + pData.html(""); } else { //spanApplyClass.text("수강신청"); //aApplyClass.append(spanApplyClass); - pData.html(""); + pData.html(""); //pData.append(aApplyClass); } } } else { if (d.isselected == 1) { - pData.html(""); + pData.html("" + comment +""); } //else { // pData.html(""); @@ -306,6 +307,7 @@ //var seq = 0; $.each(capResult.obj, function (i, d) { + let comment = d.comment == null ? "" : "(" + d.comment + ")" var li = $("
  • "); if (d.isEnd == true) { //li.append(" " + d.scdInfoSummary + ""); @@ -317,9 +319,9 @@ } else { if (d.isselected == 1) { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + ""); } else { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + ""); } //if (seq == 0) { // li.append(" " + d.scdInfoSummary + ""); @@ -331,9 +333,9 @@ } else { if (d.isselected == 1) { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + comment +""); } else { - li.append(" " + d.scdInfoSummary + ""); + li.append(" " + d.scdInfoSummary + comment +""); } //if (seq == 0) { // li.append(" " + d.scdInfoSummary + ""); diff --git a/Model/CM.cs b/Model/CM.cs index a655e39..0c03fc1 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -4165,6 +4165,7 @@ namespace NP.Model /// public Int64 pcmno { get; set; } public Int64 cgcode { get; set; } + public String comment { get; set; } // 안내문구 } ///