KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<기능개선> 

1. PMS NO : 8403
2. (주요)작업내용 
(1) 일정옆에 문구추가 일괄 커밋
This commit is contained in:
jity7777 2023-11-08 04:19:25 +00:00
parent c700bfcf19
commit 3360d19b4f
6 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Views/Shared/Partial/ScdScript.cshtml
View File

@ -45,22 +45,24 @@
ulScd.empty();
var seq = 0;
let tempVal = "";
let tempVal2 = "";
$.each(capResult.obj, function (i, d) {
var li = $("<li />");
tempVal2 = d.comment == null ? "" : "<br><span style='margin-left:12px'>(" + d.comment + ")</span>"
//if (d.isEnd == true) {
//li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "'><span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label></label>");
//}
//else {
if (d.quota != 0) {
if (d.remainPeople <= 0) {
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label>" + tempVal2 +"</label>");
}
else {
if (seq == 0) {
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' data-date='" + d.estartShortDateString + "' data-scdInfoSummary='" + d.scdInfoSummary + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음, " + d.intv1 + "명 출결완료)</label></label>");
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' data-date='" + d.estartShortDateString + "' data-scdInfoSummary='" + d.scdInfoSummary + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음, " + d.intv1 + "명 출결완료)</label>" + tempVal2+"</label>");
}
else {
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' data-date='" + d.estartShortDateString + "' data-scdInfoSummary='" + d.scdInfoSummary + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음, " + d.intv1 + "명 출결완료)</label></label>");
li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' data-date='" + d.estartShortDateString + "' data-scdInfoSummary='" + d.scdInfoSummary + "'>" + d.scdInfoSummary + "<label style='color: red'> (" + d.remainPeople + "명 남음, " + d.intv1 + "명 출결완료)</label>" + tempVal2 +"</label>");
}
}
}

12
BO/Views/cm/cmregeduschedule.cshtml
View File

@ -76,7 +76,7 @@
}
<div class="tar buttonbox"><a href="#" onclick="regscd(0,0,@(Model.CMInnings.Count() > 0 ? Model.CMInnings.FirstOrDefault().scdtype : -1));" class="btn btn-s-xs btn-info">일정등록</a></div>
<section class="panel panel-default" style="border-top: 1px solid #ddd; margin-top: 5px;">
<header class="panel-heading"><strong><i class="fa fa-bars"></i> 교육일정등록 @(cmino)<span class=""></span></strong></header>
<header class="panel-heading"><strong><i class="fa fa-bars" cmino="@(cmino)"></i> 교육일정등록<span class=""></span></strong></header>
<div class="table-responsive" id="excel1">
<table class="table table-striped b-t b-light">
<thead>
@ -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"))
{
<span><input type="radio" name="istudyplace" id="istudyplace_@item.ccode" @(studyplaceseq == 0 ? "checked" : "") value="@item.ccode" /><label style="vertical-align: sub;" for="istudyplace_@item.ccode">&nbsp;@item.cname</label></span>
<span><input type="radio" name="istudyplace" id="istudyplace_@item.ccode" @(studyplaceseq == 0 ? "checked" : "") value="@item.ccode" /><label style="vertical-align: sub;" for="istudyplace_@item.ccode">&nbsp;@item.cname</label></span>
studyplaceseq++;
}
</td>
@ -190,6 +190,10 @@
<th class="req">제한인원</th>
<td>@Html.TextBox("iquota", "", new { @class = "form-control disp-init int nocomma text-center", @style = "width: 80px;", @maxlength = "5" })</td>
</tr>
<tr >
<th>안내문구</th>
<td>@Html.TextBox("icomment", "", new { @class = "form-control disp-init", @style = "width: 98%;", @maxlength = "30" })</td>
</tr>
</table>
<div class="findboxbtnbox">
<a href="#" class="btn btn-primary" onclick="savescd();">저장</a>
@ -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);
}

38
Dao/MyBatis/Maps/CM.xml
View File

@ -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 @@
</insert>
<insert id="cm.cminningscd.in" parameterClass="cminningscd">
SELECT * FROM (SELECT LAST_INSERT_ID(0) col1) a WHERE col1 > 0;
insert into cminningscd(cmino,estart,eend,quota,studyplace,sseq,<include refid="sql.inc"></include>)
values(#cmino#,#estart#,#eend#,#quota#,#studyplace#,#sseq#,<include refid="sql.inv"></include>)
insert into cminningscd(cmino,estart,eend,quota,studyplace,sseq,comment,<include refid="sql.inc"></include>)
values(#cmino#,#estart#,#eend#,#quota#,#studyplace#,#sseq#,#comment#,<include refid="sql.inv"></include>)
<selectKey type="post" property="cmisno" resultClass="long">SELECT last_insert_id()</selectKey>
</insert>
<update id="cm.cminningscd.up" parameterClass="cminningscd">
update cminningscd a
set <include refid="sql.up"></include>,cmino=#cmino#,estart=#estart#,eend=#eend#,quota=#quota#
,studyplace=#studyplace#,sseq=#sseq#,comment=#comment#
where a.cmisno=#cmisno#
</update>
<update id="cm.cminnings.up" parameterClass="cminning">
update cminning a
left outer join (
@ -599,11 +605,6 @@
,isscd = #isscd#,scdtype=#scdtype#
where a.cmino=#cmino# and b.cmino is null
</update>
<update id="cm.cminningscd.up" parameterClass="cminningscd">
update cminningscd a
set <include refid="sql.up"></include>,cmino=#cmino#,estart=#estart#,eend=#eend#,quota=#quota#,studyplace=#studyplace#,sseq=#sseq#
where a.cmisno=#cmisno#
</update>
<update id="cm.cminningscd.clear" parameterClass="cminning">
update cminningscd a
set <include refid="sql.up"></include>,quota=99999,studyplace=null
@ -1890,11 +1891,11 @@
<select id="cm.cminningscds.applyedu.admin" parameterClass="hashtable" resultClass="cminningscd">
select a.*
from (
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
<!--,case when a.remainPeople &lt;= 0 then 0 else 1 end isend-->
select
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
,a.remainPeople
,a.isselected
<!--,case when a.remainPeople &lt;= 0 then 0 else 1 end isend-->
, 1 isend
from
(
@ -1902,6 +1903,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,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
,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
@ -1924,7 +1926,7 @@
select a.*
from (
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.remainPeople
,a.isselected
<!--,case when a.remainPeople &lt;= 0 then 0 else 1 end isend-->
@ -1935,6 +1937,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,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
,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
@ -1967,7 +1970,7 @@
from (
select
a.cmno,a.pcmno,a.cgcode
,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.remainPeople
,a.isselected
<!--211220.통합테스트목록(643) 4일부터로 변경-->
@ -1984,7 +1987,7 @@
,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.cshape
,d.cshape,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
@ -2009,7 +2012,7 @@
<select id="cm.cminningscds.applyedu.lectno" parameterClass="hashtable" resultClass="cminningscd">
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
<!--211220.통합테스트목록(644) 이미지난 교육종료일 변경불가-->
@ -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

14
FO/Views/Course/SmartSearch.cshtml
View File

@ -479,7 +479,6 @@
ulScd.append(li);
}
$.each(capResult.obj, function (i, d) {
var li = $("<li />");
var pData = $("<p />");
@ -490,12 +489,13 @@
var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' ";
/*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ") + "' ";*/
var strStudyPlacename = "";
let comment = d.comment == null ? "" : "<span style='margin-left:12px'>(" + d.comment + ")</span>"
if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null && d.studyplacename != '') {
strStudyPlacename = '[' + d.studyplacename + '교육장]';
}
if (d.isEnd == true) {
pData.html("<label>"+ "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + comment + "</span></span>");
}
else {
/* by 인덕
@ -550,7 +550,7 @@
if (d.remainPeople <= 0) { // remainPeople(등록가능인원수) <= 0
spanApplyClassN.text("접수마감");
aApplyClass.append(spanApplyClassN);
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </span>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수마감] </span>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + comment + "</span></span>");
pData.append(spanApplyClassN);
}
else {
@ -559,22 +559,22 @@
if (d.quota != 0) {
if (d.isselected == 1) { // isselected = (cm.setime('%Y%m%d',학습종료) == cminningscd.estart('%Y%m%d',교육시작) ? 1 : 0)
// 사용안하는것 추측됨
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + " checked> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span></span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + " checked> " + d.scdInfoSummary + comment + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span></span>");
pData.append(aApplyClass);
}
else {
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + "'> " + d.scdInfoSummary + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span> " + "</span>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " <span style='color: red'>[접수중] </span>" + radioEduDay + "'> " + d.scdInfoSummary + comment + "<span style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</span> " + "</span>");
pData.append(aApplyClass);
}
}
else {
// 사용안하는것 추측됨
if (d.isselected == 1) { // isselected = (cm.setime('%Y%m%d',학습종료) == cminningscd.estart('%Y%m%d',교육시작) ? 1 : 0)
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + " checked> " + d.scdInfoSummary + comment + "</label></label>");
pData.append(spanApplyClass);
}
else {
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
pData.html("<label>" + "<span style='color:blue'>" + strStudyPlacename + "</span>" + " " + radioEduDay + "'> " + d.scdInfoSummary + comment + "</label></label>");
pData.append(aApplyClass);
}
}

18
FO/Views/My/LectureOn.cshtml
View File

@ -197,6 +197,7 @@
let noDisPlay = true;
$.each(capResult.obj, function (i, d) {
let comment = d.comment == null ? "" : "<br><span style='margin-left:39px'>(" + d.comment + ")</span>"
var li = $("<li />");
if (d.cmisno == 12763) {
@ -235,25 +236,25 @@
if (d.quota != 0) {
if (d.remainPeople <= 0) {
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span>" + comment +"</label>");
}
else {
if (d.isselected == 1) {
//spanApplyClass.text("수강신청");
//aApplyClass.append(spanApplyClass);
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중]&nbsp;&nbsp;&nbsp;&nbsp; </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:;'> (" + d.remainPeople + "명 남음)</label></label>");
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중]&nbsp;&nbsp;&nbsp;&nbsp; </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:;'> (" + d.remainPeople + "명 남음)</label>" + comment +"</label>");
}
else {
//spanApplyClass.text("수강신청");
//aApplyClass.append(spanApplyClass);
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] &nbsp;&nbsp;&nbsp;&nbsp;</label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] &nbsp;&nbsp;&nbsp;&nbsp;</label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:;'> (" + d.remainPeople + "명 남음)</label> " + comment +"</label>");
//pData.append(aApplyClass);
}
}
}
else {
if (d.isselected == 1) {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label>" + comment +"</label>");
}
//else {
// pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
@ -306,6 +307,7 @@
//var seq = 0;
$.each(capResult.obj, function (i, d) {
let comment = d.comment == null ? "" : "<span style='margin-left:12px'>(" + d.comment + ")</span>"
var li = $("<li />");
if (d.isEnd == true) {
//li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (종료)</label>");
@ -317,9 +319,9 @@
}
else {
if (d.isselected == 1) {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)"+comment+"</label>");
} else {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)" + comment +"</label>");
}
//if (seq == 0) {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label>");
@ -331,9 +333,9 @@
}
else {
if (d.isselected == 1) {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + comment +"</label>");
} else {
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + "</label>");
li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "'> " + d.scdInfoSummary + comment +"</label>");
}
//if (seq == 0) {
// li.append("<input type='radio' name='rdoScds' value='" + d.cmisno + "' checked> " + d.scdInfoSummary + "</label>");

1
Model/CM.cs
View File

@ -4165,6 +4165,7 @@ namespace NP.Model
/// </summary>
public Int64 pcmno { get; set; }
public Int64 cgcode { get; set; }
public String comment { get; set; } // 안내문구
}
/// <summary>