ปรับปรุงหน้าจอ ประวัติการแก้ไข

Models/eva_create_evaluation_detail_history/eva_create_evaluation_detail_historyEntity.cs

@@ -27,8 +27,10 @@ namespace TodoAPI2.Models
 
         public int? action_emp_id { get; set; }
 
+        public int? history_group { get; set; } // 1 = ข้อตกลง ,2 = การประเมินจริง
 
-		public void SetAutoField(DataContext context)
+
+        public void SetAutoField(DataContext context)
         {
             
         }

Models/eva_create_evaluation_detail_history/eva_create_evaluation_detail_historySearchModel.cs

@@ -18,6 +18,8 @@ namespace TodoAPI2.Models
 
         public int? evaluation_detail_id { get; set; }
 
+        public int? history_group { get; set; }
+
     }
 }
 

Models/eva_create_evaluation_detail_history/eva_create_evaluation_detail_historyService.cs

@@ -115,7 +115,8 @@ namespace TodoAPI2.Models
 
 				where
                 1 == 1 
-                && (!model.evaluation_detail_id.HasValue || m_eva_create_evaluation_detail_history.evaluation_detail_id == model.evaluation_detail_id)
+                && m_eva_create_evaluation_detail_history.evaluation_detail_id == model.evaluation_detail_id
+                && model.history_group == m_eva_create_evaluation_detail_history.history_group
 
                 orderby m_eva_create_evaluation_detail_history.action_dt
                 select new eva_create_evaluation_detail_historyViewModel()

Models/eva_create_evaluation_detail_history/eva_create_evaluation_detail_historyViewModel.cs

@@ -18,7 +18,7 @@ namespace TodoAPI2.Models
 
         public DateTime? action_dt { get; set; }
 
-        public string txt_action_dt { get { return MyHelper.GetDateStringForReport(this.action_dt); } }
+        public string txt_action_dt { get { return MyHelper.GetDateStringForReport(this.action_dt) + " " + MyHelper.GetTimeStringFromDate(this.action_dt); } }
 
         public string action_detail { get; set; }