diff --git a/BO/Views/cm/cmregeduschedule.cshtml b/BO/Views/cm/cmregeduschedule.cshtml
index 80f9efd..7f06ed0 100644
--- a/BO/Views/cm/cmregeduschedule.cshtml
+++ b/BO/Views/cm/cmregeduschedule.cshtml
@@ -44,15 +44,18 @@
- @foreach (var item in Model.CMInnings)
+ @if(Model.CMInnings.Count() > 0)
{
-
- | @item.iseq @(item.istaste == 1 ? "(S)" : "") |
- @item.isonlinename |
- @item.ititle |
- @item.username |
- @item.udtymd |
-
+ foreach (var item in Model.CMInnings)
+ {
+
+ | @item.iseq @(item.istaste == 1 ? "(S)" : "") |
+ @item.isonlinename |
+ @item.ititle |
+ @item.username |
+ @item.udtymd |
+
+ }
}
diff --git a/BO/Views/croom/encourageset.cshtml b/BO/Views/croom/encourageset.cshtml
index 99e0e0a..8e49eac 100644
--- a/BO/Views/croom/encourageset.cshtml
+++ b/BO/Views/croom/encourageset.cshtml
@@ -30,7 +30,7 @@
@(i < 2 ? "진도율 80% 미만" : i == 2 || i == 3 ? "미응시자 대상" : i == 4 || i == 5 ? "미제출자 대상" : i == 6 ? "미참여자 대상" : i == 7 ? "교육일" : i == 8 ? "시험일" : "") |
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "special", "fromto" }, { "start", 1 }, { "end", 10 }, { "name", "dday" }, { "selected", scdlect.dday } }) 일 남음 |
매일 @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "special", "fromto" }, { "start", 0 }, { "end", 23 }, { "name", "dtime" }, { "selected", scdlect.dtime } }) 시 |
- |
+ |
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:사용;0:미사용" }, { "checked", scdlect.isuse }, { "name", "isuse" + i } }) |
}
@@ -90,7 +90,8 @@
return false;
}
sd += ";" + $(r).attr("data-no") + ":" + $(r).find("td.dday select").val() + ":" + $(r).find("td.dtime select").val() + ":" + ($(r).find("td.talkemail input.istalk").prop("checked") ? 1 : 0) + ":" +
- ($(r).find("td.talkemail input.isemail").prop("checked") ? 1 : 0) + ":" + $(r).find("td.isuse input:checked").val();
+ ($(r).find("td.talkemail input.isemail").prop("checked") ? 1 : 0) + ":" + $(r).find("td.isuse input:checked").val() + ":" +
+ ($(r).find("td.talkemail input.issms").prop("checked") ? 1 : 0);
});
if (isvalid && confirm("저장하시겠습니까?")) {
capp("/acommon/scdlectsave", { sd: sd.substr(1) }, "cbscdlectsave");
diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index aaf13ed..fb54723 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -154,7 +154,7 @@ namespace NP.Base.Controllers
foreach (var s in sd.Split(';'))
{
var v = s.Split(':');
- scd.Ds.Add(new SCDLect() { scdno = GetInt(v[0]), dday = GetInt(v[1]), dtime = GetInt(v[2]), istalk = GetInt(v[3]), isemail = GetInt(v[4]), isuse = GetInt(v[5]) });
+ scd.Ds.Add(new SCDLect() { scdno = GetInt(v[0]), dday = GetInt(v[1]), dtime = GetInt(v[2]), istalk = GetInt(v[3]), isemail = GetInt(v[4]), isuse = GetInt(v[5]), issms= GetInt(v[6]) });
}
return JsonOK(Dao.Save("lect.scdlect.save", scd));
}
diff --git a/Dao/DB/DB1.Scheme.txt b/Dao/DB/DB1.Scheme.txt
index b1bd647..7387ece 100644
--- a/Dao/DB/DB1.Scheme.txt
+++ b/Dao/DB/DB1.Scheme.txt
@@ -1101,6 +1101,7 @@ create table scdlect (
,dtime tinyint not null
,istalk tinyint not null
,isemail tinyint not null
+ ,issms tinyint not null
,isuse tinyint not null
,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL
,primary key(scdno));
@@ -1112,6 +1113,7 @@ create table scdlectlog (
,dtime tinyint not null
,istalk tinyint not null
,isemail tinyint not null
+ ,issms tinyint not null
,isuse tinyint not null
,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL);
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 25ecafb..add5718 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -255,8 +255,8 @@
,a.dpoint=b.dpoint
,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint
where a.status=1 and a.ischanged=0
- and a.cmno in ($cmnos$)
- and a.lectno in ($lectnos$)
+ and a.cmno in ($cmnos$)
+ and a.lectno in ($lectnos$)