https://app.clickup.com/t/cqr5xv เมนูบัญชีเงินเดือนขั้นต่ำขั้นสูงของพนักงานเนติบัณฑิตยสภา - เพิ่มฟิลล์ในการเก็บกรอบเงินเดือนสูงสุด(1 ขั้น)ของกรอบเงินเดือน

Migrations/20210824033819_UpdateCylindar.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class UpdateCylindar : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "salary_max",
+                table: "eva_salary_cylinder",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "salary_max",
+                table: "eva_salary_cylinder");
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -937,6 +937,8 @@ namespace tb320eva.Migrations
 
                     b.Property<int?>("position_type");
 
+                    b.Property<decimal?>("salary_max");
+
                     b.Property<decimal?>("temporary_min");
 
                     b.Property<decimal?>("themax");

Models/eva_salary_cylinder/eva_salary_cylinderEntity.cs

@@ -33,5 +33,7 @@ namespace TodoAPI2.Models
         public decimal? position_allowance { get; set; }
 
         public decimal? monthly_compensation { get; set; }
+
+        public decimal? salary_max { get; set; }
     }
 }

Models/eva_salary_cylinder/eva_salary_cylinderInputModel.cs

@@ -34,6 +34,8 @@ namespace TodoAPI2.Models
 
         public decimal? monthly_compensation { get; set; }
 
+        public decimal? salary_max { get; set; }
+
         public string active_mode { get; set; }
     }
 }

Models/eva_salary_cylinder/eva_salary_cylinderService.cs

@@ -108,6 +108,7 @@ namespace TodoAPI2.Models
                     cost_living = m_eva_salary_cylinder.cost_living,
                     position_allowance = m_eva_salary_cylinder.position_allowance,
                     monthly_compensation = m_eva_salary_cylinder.monthly_compensation,
+                    salary_max = m_eva_salary_cylinder.salary_max,
 
                     position_type_external_linkage_external_name = fk_external_linkageResult1.external_name,
                     position_level_external_linkage_external_name = fk_external_linkageResult2.external_name,
@@ -152,6 +153,7 @@ namespace TodoAPI2.Models
                     cost_living = m_eva_salary_cylinder.cost_living,
                     position_allowance = m_eva_salary_cylinder.position_allowance,
                     monthly_compensation = m_eva_salary_cylinder.monthly_compensation,
+                    salary_max = m_eva_salary_cylinder.salary_max,
 
                     position_type_external_linkage_external_name = fk_external_linkageResult1.external_name,
                     position_level_external_linkage_external_name = fk_external_linkageResult2.external_name,
@@ -212,6 +214,7 @@ namespace TodoAPI2.Models
                 existingEntity.cost_living = model.cost_living;
                 existingEntity.position_allowance = model.position_allowance;
                 existingEntity.monthly_compensation = model.monthly_compensation;
+                existingEntity.salary_max = model.salary_max;
 
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
@@ -238,6 +241,7 @@ namespace TodoAPI2.Models
                         existingEntity.cost_living = i.cost_living;
                         existingEntity.position_allowance = i.position_allowance;
                         existingEntity.monthly_compensation = i.monthly_compensation;
+                        existingEntity.salary_max = i.salary_max;
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }

Models/eva_salary_cylinder/eva_salary_cylinderViewModel.cs

@@ -32,6 +32,8 @@ namespace TodoAPI2.Models
 
         public decimal? monthly_compensation { get; set; }
 
+        public decimal? salary_max { get; set; }
+
         public string position_type_external_linkage_external_name { get; set; }
         public string position_level_external_linkage_external_name { get; set; }
 

Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml

@@ -32,28 +32,28 @@
                         <div class='row'>
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_salary_cylinder_temporary_min" for="eva_salary_cylinder_temporary_min">ขั้นต่ำชั่วคราว</label>
-                                <input  class="form-control" type="number" id="eva_salary_cylinder_temporary_min" iLabel="ขั้นต่ำชั่วคราว" iRequire="true" iGroup="eva_salary_cylinder" />
+                                <input class="form-control" type="number" id="eva_salary_cylinder_temporary_min" iLabel="ขั้นต่ำชั่วคราว" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_salary_cylinder_themin" for="eva_salary_cylinder_themin">ขั้นต่ำ</label>
-                                <input  class="form-control" type="number" id="eva_salary_cylinder_themin" iLabel="ขั้นต่ำ" iRequire="true" iGroup="eva_salary_cylinder" />
+                                <input class="form-control" type="number" id="eva_salary_cylinder_themin" iLabel="ขั้นต่ำ" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
                         </div>
                         <div class='row'>
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_salary_cylinder_themax" for="eva_salary_cylinder_themax">ขั้นสูง</label>
-                                <input  class="form-control" type="number" id="eva_salary_cylinder_themax" iLabel="ขั้นสูง" iRequire="true" iGroup="eva_salary_cylinder" />
+                                <input class="form-control" type="number" id="eva_salary_cylinder_themax" iLabel="ขั้นสูง" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_salary_cylinder_middle" for="eva_salary_cylinder_middle">ค่ากลาง</label>
-                                <input  class="form-control" type="number" id="eva_salary_cylinder_middle" iLabel="ค่ากลาง" iRequire="true" iGroup="eva_salary_cylinder" />
+                                <input class="form-control" type="number" id="eva_salary_cylinder_middle" iLabel="ค่ากลาง" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
                         </div>
                         <div class='row'>
                             <div class="form-group col-md-4">
-                                <label id="lab_eva_salary_cylinder_cost_living " for="eva_salary_cylinder_cost_living ">ค่าครองชีพ</label>
+                                <label id="lab_eva_salary_cylinder_cost_living" for="eva_salary_cylinder_cost_living ">ค่าครองชีพ</label>
                                 <input class="form-control" type="number" id="eva_salary_cylinder_cost_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
                             <div class="form-group col-md-4">
@@ -66,7 +66,12 @@
                                 <input class="form-control" type="number" id="eva_salary_cylinder_monthly_compensation" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_salary_cylinder" />
                             </div>
                         </div>
-
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_salary_cylinder_salary_max" for="eva_salary_cylinder_salary_max">กรอบวงเงินสูงสุด(1 ขั้น) </label>
+                                <input class="form-control" type="number" id="eva_salary_cylinder_salary_max" iLabel="กรอบวงเงินสูงสุด(1 ขั้น) " iRequire="false" iGroup="eva_salary_cylinder" />
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -123,6 +128,7 @@
                     <th><label id='h_eva_salary_cylinder_middle'>ค่ากลาง</label></th>
                     <th><label id='h_eva_salary_cylinder_position_allowance'>เงินประจำตำแหน่ง</label></th>
                     <th><label id='h_eva_salary_cylinder_monthly_compensation'>ค่าตอบแทนรายเดือน</label></th>
+                    <th><label id='h_eva_salary_cylinder_salary_max'>กรอบวงเงินสูงสุด(1 ขั้น) </label></th>
                 </tr>
             </thead>
             <tbody></tbody>

wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js

@@ -28,6 +28,7 @@ function eva_salary_cylinder_FeedDataToForm(data) {
     $("#eva_salary_cylinder_cost_living").val(data.cost_living);
     $("#eva_salary_cylinder_position_allowance").val(data.position_allowance);
     $("#eva_salary_cylinder_monthly_compensation").val(data.monthly_compensation);
+    $("#eva_salary_cylinder_salary_max").val(data.salary_max);
 }
 
 function eva_salary_cylinder_GetFromForm() {
@@ -42,6 +43,7 @@ function eva_salary_cylinder_GetFromForm() {
     eva_salary_cylinderObject.cost_living = $("#eva_salary_cylinder_cost_living").val();
     eva_salary_cylinderObject.position_allowance = $("#eva_salary_cylinder_position_allowance").val();
     eva_salary_cylinderObject.monthly_compensation = $("#eva_salary_cylinder_monthly_compensation").val();
+    eva_salary_cylinderObject.salary_max = $("#eva_salary_cylinder_salary_max").val();
 
     return eva_salary_cylinderObject;
 }
@@ -175,6 +177,7 @@ var eva_salary_cylinder_setupTable = function (result) {
             { "data": "middle" },
             { "data": "position_allowance" },
             { "data": "monthly_compensation" },
+            { "data": "salary_max" },
         ],
         "columnDefs": [
             {