추가개발1229_2

BO/Controllers/cmController.cs

@@ -931,7 +931,7 @@ namespace NP.BO.Controllers
 
             //교육일정이 존재하는지 조회
             var scd = Dao.Get<int>("cm.cminnigscd.exists", new Hashtable() { { "cmno", vm.CM.cmno } });
-            ViewBag.Scd = scd.FirstOrDefault();
+            ViewBag.InningScd = scd.FirstOrDefault();
 
             return View("cmregexset", vm);
         }

BO/Views/cm/cmregeduschedule.cshtml

@@ -469,6 +469,8 @@
                 $("input:radio[name=istudyplace][value=" + d.studyplace + "]").attr("checked", true);
             }
             //교강사 체크
+			$(".chkInstructor").prop("checked", false);
+
             $.each($(".chkInstructor"), function (i, item) {
                 if (d.instructors != null) {
                     let tc = d.instructors.split(',');

BO/Views/cm/cmregexset.cshtml

@@ -1,9 +1,14 @@
 @model NP.Model.VMCM
 @{ 
 	int esTsCnt = 0;
+    int scdType = 0;    //교육회차 scdtype = 0(교육장_오프라인),1(온라인대체)
 	if (Model.ESTs != null) {
 		esTsCnt = Model.ESTs.Count;
 	}
+
+	if (Model.CMInnings != null) {
+		scdType = Convert.ToInt32(Model.CMInnings.FirstOrDefault().scdtype);
+	}
 }
 <!-- div[id=container] -->
 <div style="@(Model.CM.cmno < 1 ? "display: none;" : "")">
@@ -21,8 +26,9 @@
 <!-- // div[id=container] -->
 <!-- form[id=mform] -->
 <form id="mform" method="post" class="form-horizontal">
-	<input type="hidden" id="hdnScdCnt" value="@ViewBag.Scd" />
+	<input type="hidden" id="hdnScdCnt" value="@ViewBag.InningScd" />
 	<input type="hidden" id="hdnExCnt" value="@esTsCnt" />
+	<input type="hidden" id="hdnScdType" value="@scdType" />
 	<!-- section[class=panel panel-default] -->
 	<section class="panel panel-default" style="border-top: 1px solid #ddd; margin-top: 5px;">
 		<div class="panel-body">
@@ -276,15 +282,16 @@
         @*/* 평가 추가 함수 */*@
         function add(idx, no)
         {
-            if ($("#hdnScdCnt").val() == 0) {
+            if (@Model.CMInnings.Count == 0) {
                 msg("교육일정 탭에서 교육회차를 먼저 등록해주세요.");
                 return;
             }
 
-            var inningcnt = @Model.CMInnings.Count; //온라인대체
+            if ($("#hdnScdType").val() == 1) {
-            if (no == 0 && inningcnt > 0 && parseInt($("#hdnExCnt").val()) > 0) {
+				if (no == 0 && parseInt($("#hdnExCnt").val()) > 0) {
-				msg2("온라인 100%인 교육은 1개의 최종평가만 등록 가능합니다.");
+					msg2("온라인 100%인 교육은 1개의 최종평가만 등록 가능합니다.");
-				return;
+					return;
+				}
 			}
 
             if (idx == 0) {

BO/bin/MyBatis/Maps/CM.xml

@@ -1433,11 +1433,11 @@
 
             insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
             select #cmno#, ndno, <include refid="sql.inv"></include>
-            from cmncsd
+			from cmncsd
-            where cmno = #orgcmno#;
+			where cmno = #orgcmno#;
 
-            insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
+			insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
-            select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
+			select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
             from cminningscd a
             inner join temp_cminning_mapping t on a.cmino = t.old_cmino
             where a.cmino in (select old_cmino from temp_cminning_mapping);

Base/bin/Debug/MyBatis/Maps/CM.xml

@@ -1433,11 +1433,11 @@
 
             insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
             select #cmno#, ndno, <include refid="sql.inv"></include>
-            from cmncsd
+			from cmncsd
-            where cmno = #orgcmno#;
+			where cmno = #orgcmno#;
 
-            insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
+			insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
-            select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
+			select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
             from cminningscd a
             inner join temp_cminning_mapping t on a.cmino = t.old_cmino
             where a.cmino in (select old_cmino from temp_cminning_mapping);

Dao/MyBatis/Maps/CM.xml

@@ -1433,11 +1433,11 @@
 
             insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
             select #cmno#, ndno, <include refid="sql.inv"></include>
-            from cmncsd
+			from cmncsd
-            where cmno = #orgcmno#;
+			where cmno = #orgcmno#;
 
-            insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
+			insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
-            select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
+			select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
             from cminningscd a
             inner join temp_cminning_mapping t on a.cmino = t.old_cmino
             where a.cmino in (select old_cmino from temp_cminning_mapping);

Dao/bin/Debug/MyBatis/Maps/CM.xml

@@ -1433,11 +1433,11 @@
 
             insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
             select #cmno#, ndno, <include refid="sql.inv"></include>
-            from cmncsd
+			from cmncsd
-            where cmno = #orgcmno#;
+			where cmno = #orgcmno#;
 
-            insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
+			insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
-            select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
+			select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
             from cminningscd a
             inner join temp_cminning_mapping t on a.cmino = t.old_cmino
             where a.cmino in (select old_cmino from temp_cminning_mapping);