ปรับปรุง ปรับเลื่อน ค่าตอบแทน

Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs

@@ -87,6 +87,26 @@ namespace TodoAPI2.Models
             i.item_managed_by = all_emp.ToList();
             i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
+            var data_fiscal_year = (from f_y in _repository.Context.eva_adjust_postponement
+                                    group f_y by f_y.fiscal_year into new_group
+                                    orderby new_group.Key descending
+                                    select new
+                                    {
+                                        fiscal_year = new_group.Key
+                                    }
+                                    ).ToList();
+            var result = new List<external_linkageViewModel>();
+            foreach (var x in data_fiscal_year)
+            {
+                result.Add(new external_linkageViewModel
+                {
+                    external_id = x.fiscal_year,
+                    external_code = x.fiscal_year.ToString(),
+                    external_name = x.fiscal_year.ToString()
+                });
+            }
+
+            i.item_fiscal_year = result;
 
             return i;
         }
@@ -104,6 +124,15 @@ namespace TodoAPI2.Models
                                         fiscal_year = new_group.Key
                                     }
                                     ).ToList();
+            var result = new List<external_linkageViewModel>();
+            foreach(var x in data_fiscal_year)
+            {
+                result.Add(new external_linkageViewModel { 
+                    external_id = x.fiscal_year, 
+                    external_code = x.fiscal_year.ToString(), 
+                    external_name = x.fiscal_year.ToString()
+                });
+            }
 
             var i = new eva_adjust_postponement_normalWithSelectionViewModel();
             var temp = create.GetListBySearch(new eva_create_evaluationSearchModel());
@@ -112,6 +141,7 @@ namespace TodoAPI2.Models
             i.item_managed_by = all_emp.ToList();
             i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
+            i.item_fiscal_year = result;
 
             return i;
         }

Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs

@@ -7,6 +7,7 @@ namespace TodoAPI2.Models
 {
     public class eva_adjust_postponement_normalWithSelectionViewModel: eva_adjust_postponement_normalViewModel
     {
+        public List<external_linkageViewModel> item_fiscal_year { get; set; }
         public List<eva_create_evaluationViewModel> item_create_evaluation_id { get; set; }
         public List<external_employeeViewModel> item_managed_by { get; set; }
         public List<external_linkageViewModel> item_org_id { get; set; }

Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml

@@ -86,7 +86,7 @@
 
             <div class="form-group col-md-3">
                 <label id='lab_s_eva_adjust_postponement_normal_fiscal_year' for='s_eva_adjust_postponement_normal_fiscal_year'>ปีงบประมาณ </label>
-                <input class="form-control" type="number" id="s_eva_adjust_postponement_normal_fiscal_year" iLabel="ปีงบประมาณ " iRequire="true" iGroup="s_eva_adjust_postponement_normal" title='ปีงบประมาณ ' placeholder='ปีงบประมาณ ' />
+                <select class="form-control" id="s_eva_adjust_postponement_normal_fiscal_year" iLabel="ปีงบประมาณ " iRequire="false" iGroup="s_eva_adjust_postponement_normal" title='ปีงบประมาณ ' placeholder='ปีงบประมาณ '></select>
             </div>
 
             <div class="form-group col-md-3">

wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js

@@ -13,7 +13,7 @@ eva_adjust_postponement_normalSearchObject.org_id = $("#s_eva_adjust_postponemen
 }
 
 function eva_adjust_postponement_normal_FeedDataToSearchForm(data) {
-$("#s_eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
+    DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_fiscal_year"), data, "id", "external_name", "item_fiscal_year", data.fiscal_year);
     $("#s_eva_adjust_postponement_normal_theRound").val(data.theRound);
     DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
 
@@ -122,8 +122,7 @@ var eva_adjust_postponement_normal_customValidation = function (group) {
 };
 
 function eva_adjust_postponement_normal_PutUpdate() {
-	if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation))
+    if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) {
-    {
         return;
     }