From a0305a30f991d98843518bf6eb918b5251c5be07 Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Tue, 20 Oct 2020 08:44:00 +0000
Subject: [PATCH]

---
 BO/Views/cm/cmregest.cshtml | 21 ++++++++++++++-------
 Dao/MyBatis/Maps/CM.xml     |  7 ++++---
 Model/CM.cs                 |  2 ++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/BO/Views/cm/cmregest.cshtml b/BO/Views/cm/cmregest.cshtml
index 179a9bc..25a214d 100644
--- a/BO/Views/cm/cmregest.cshtml
+++ b/BO/Views/cm/cmregest.cshtml
@@ -55,12 +55,12 @@
             <tr class="auto" id="trestrfd" style="@(Model.CM.isrefund == 1?"":"display:none;")">
                 <th rowspan="2">환급</th>
                 <th>비율(점수)</th>
-                <td><input type="text" class="form-control int nocomma" maxlength="100"     name="attendrfd" id="attendrfd" value="@Model.CMEV.attendrfd" /></td>
-                <td><input type="text" class="form-control int nocomma" maxlength="100"     name="midrfd" id="midrfd" value="@Model.CMEV.midrfd" /></td>
-                <td><input type="text" class="form-control int nocomma" maxlength="100"     name="finalrfd" id="finalrfd" value="@Model.CMEV.finalrfd" /></td>
-                <td><input type="text" class="form-control int nocomma" maxlength="100"     name="subjectrfd" id="subjectrfd" value="@Model.CMEV.subjectrfd" /></td>
-                <td><input type="text" class="form-control int nocomma" maxlength="100"     name="discussrfd" id="discussrfd" value="@Model.CMEV.discussrfd" /></td>
-                <td style="display:none;"><input type="text" class="form-control int nocomma" maxlength="100"     name="etcrfd" id="etcrfd" value="@Model.CMEV.etcrfd" /></td>
+                <td><input type="text" class="form-control int nocomma" maxlength="100" name="attendrfd" id="attendrfd" value="@Model.CMEV.attendrfd" /></td>
+                <td><input type="text" class="form-control int nocomma" maxlength="100" name="midrfd" id="midrfd" value="@Model.CMEV.midrfd" /></td>
+                <td><input type="text" class="form-control int nocomma" maxlength="100" name="finalrfd" id="finalrfd" value="@Model.CMEV.finalrfd" /></td>
+                <td><input type="text" class="form-control int nocomma" maxlength="100" name="subjectrfd" id="subjectrfd" value="@Model.CMEV.subjectrfd" /></td>
+                <td><input type="text" class="form-control int nocomma" maxlength="100" name="discussrfd" id="discussrfd" value="@Model.CMEV.discussrfd" /></td>
+                <td style="display:none;"><input type="text" class="form-control int nocomma" maxlength="100" name="etcrfd" id="etcrfd" value="@Model.CMEV.etcrfd" /></td>
                 <td><input type="text" class="form-control int nocomma tot" maxlength="100" name="totrfd" id="totrfd" value="@(Model.CMEV.attendrfd+Model.CMEV.midrfd+Model.CMEV.finalrfd+Model.CMEV.subjectrfd+Model.CMEV.discussrfd+Model.CMEV.etcrfd)" readonly="readonly" /></td>
             </tr>
             <tr id="trestcutrfd" style="@(Model.CM.isrefund == 1?"":"display:none;")">
@@ -75,7 +75,11 @@
             </tr>
         </table>
     </section>
-    <div style="padding-left: 50px; font-weight: bold;">
+    @if (Model.CM.cshape == 2)//혼합유형
+    {
+        <label><input type="checkbox" name="isoffabs" id="isoffabs" @(Model.CMEV.isoffabs != 0 ? "checked" : "") /> 집합교육 출석 필수</label>
+    }
+    <div style="padding-left: 0px; font-weight: bold;">
         ※ 비율의 합은 100%가 되어야 하며, 합계(총점) 수료기준은 반드시 입력하셔야 합니다.<br />
         ※ 수료기준은 각 평가기준별 받아야하는 최소 점수를 의미합니다.<br /><br />
     </div>
@@ -182,9 +186,12 @@
                     }
                 });
             }
+            var chked = $("#isoffabs").is(':checked');
+            setv("isoffabs", chked == true? 1 : 0);
             if (isok && confirm("평가기준/비율을 저장하시겠습니까?")) {
                 cap("/acommon/cmevsave", "mform", "cbsave");
             }
+            
         }
         function cbsave() {
             if (capResult.code == 1000) {
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 03eaef7..e593f5f 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -555,7 +555,7 @@
 
         <select id="cm.cmev" parameterClass="int" resultClass="cmev">
             select a.cmno,a.attend,a.attendcut,a.attendrfd,a.attendcutrfd,a.mid,a.midcut,a.midrfd,a.midcutrfd,a.final,a.finalcut,a.finalrfd,a.finalcutrfd,a.subject,a.subjectcut,a.subjectrfd
-                ,a.subjectcutrfd,a.discuss,a.discusscut,a.discussrfd,a.discusscutrfd,a.etc,a.etccut,a.etcrfd,a.etccutrfd,a.cut,a.cutrfd
+                ,a.subjectcutrfd,a.discuss,a.discusscut,a.discussrfd,a.discusscutrfd,a.etc,a.etccut,a.etcrfd,a.etccutrfd,a.cut,a.cutrfd,a.isoffabs
             from cmev a where a.cmno=#cmno#
         </select>
         <select id="cm.est" parameterClass="int" resultClass="est">
@@ -585,8 +585,8 @@
             order by estkind,rno
         </select>
         <update id="cm.cmevsave" parameterClass="hashtable">
-            insert into cmev (cmno,attend,attendcut,attendrfd,attendcutrfd,mid,midcut,midrfd,midcutrfd,final,finalcut,finalrfd,finalcutrfd,subject,subjectcut,subjectrfd,subjectcutrfd,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd,<include refid="sql.inc"></include>)
-            select #cmno#,#attend#,#attendcut#,#attendrfd#,#attendcutrfd#,#mid#,#midcut#,#midrfd#,#midcutrfd#,#final#,#finalcut#,#finalrfd#,#finalcutrfd#,#subject#,#subjectcut#,#subjectrfd#,#subjectcutrfd#,#discuss#,#discusscut#,#discussrfd#,#discusscutrfd#,#etc#,#etccut#,#etcrfd#,#etccutrfd#,#cut#,#cutrfd#,<include refid="sql.inv"></include>
+            insert into cmev (cmno,attend,attendcut,attendrfd,attendcutrfd,mid,midcut,midrfd,midcutrfd,final,finalcut,finalrfd,finalcutrfd,subject,subjectcut,subjectrfd,subjectcutrfd,discuss,discusscut,discussrfd,discusscutrfd,etc,etccut,etcrfd,etccutrfd,cut,cutrfd,isoffabs,<include refid="sql.inc"></include>)
+          select #cmno#,#attend#,#attendcut#,#attendrfd#,#attendcutrfd#,#mid#,#midcut#,#midrfd#,#midcutrfd#,#final#,#finalcut#,#finalrfd#,#finalcutrfd#,#subject#,#subjectcut#,#subjectrfd#,#subjectcutrfd#,#discuss#,#discusscut#,#discussrfd#,#discusscutrfd#,#etc#,#etccut#,#etcrfd#,#etccutrfd#,#cut#,#cutrfd#,#isoffabs#,<include refid="sql.inv"></include>
             from (select 1 col1) a
             left outer join cmev b on b.cmno=#cmno#
             where b.cmno is null;
@@ -618,6 +618,7 @@
             ,etccutrfd      =#etccutrfd#
             ,cut            =#cut#
             ,cutrfd         =#cutrfd#
+            ,isoffabs       =#isoffabs#
             where #cmno# &gt; 0 and cmno=#cmno#
         </update>
 
diff --git a/Model/CM.cs b/Model/CM.cs
index 95ddb2b..86fc44d 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -397,6 +397,7 @@ namespace NP.Model
         public String typeedu { get; set; }
         public String typegrade { get; set; }
         public String typejob { get; set; }
+        public int? isoffabs { get; set; }
     }
 
     [Serializable]
@@ -1383,6 +1384,7 @@ namespace NP.Model
         /// 수료기준(환급)(총점)
         /// </summary>
         public int cutrfd { get; set; }
+        public int isoffabs { get; set; }
 
         public String ev0
         {