From f6afc23b450fc091034076234b06022c82fc660b Mon Sep 17 00:00:00 2001
From: nakorn <nakorn@developer>
Date: Sun, 13 Mar 2022 12:04:14 +0700
Subject: [PATCH] Update report signature

---
 ApiControllers/rep_eva_xControllers.cs              | 13 +++++++++++++
 .../eva_create_evaluation_detail_processService.cs  |  5 +++++
 Models/rep_eva_x/rep_eva_xInputModel2.cs            |  5 +++++
 3 files changed, 23 insertions(+)

diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs
index bba2bba..7642536 100644
--- a/ApiControllers/rep_eva_xControllers.cs
+++ b/ApiControllers/rep_eva_xControllers.cs
@@ -291,6 +291,10 @@ namespace TodoAPI2.Controllers
                         {
                             url = $"{mainurl}{reportsite}/rep_eva_x{k}B2.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
                         }
+                        else if (string.IsNullOrEmpty(p1.supervisor3A_fullname))
+                        {
+                            url = $"{mainurl}{reportsite}/rep_eva_x{k}C.{model.filetype}?{MyHelper.GetParameterForJasperReport(p1)}&j_username={username}&j_password={password}";
+                        }
                     }
                 }                
 
@@ -450,6 +454,15 @@ namespace TodoAPI2.Controllers
             i.txt_status_chief_a_click_date = MyHelper.GetDateStringForReport(p.status_chief_a_click_date);
             if (i.txt_status_chief_a_click_date == "") i.txt_status_chief_a_click_date = "..................................";
 
+            i.txt_status_supervisor_click_date = MyHelper.GetDateStringForReport(p.status_supervisor_click_date);
+            if (i.txt_status_supervisor_click_date == "") i.txt_status_supervisor_click_date = "..................................";
+            i.txt_status_supervisor1A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor1A_click_date);
+            if (i.txt_status_supervisor1A_click_date == "") i.txt_status_supervisor1A_click_date = "..................................";
+            i.txt_status_supervisor2A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor2A_click_date);
+            if (i.txt_status_supervisor2A_click_date == "") i.txt_status_supervisor2A_click_date = "..................................";
+            i.txt_status_supervisor3A_click_date = MyHelper.GetDateStringForReport(p.status_supervisor3A_click_date);
+            if (i.txt_status_supervisor3A_click_date == "") i.txt_status_supervisor3A_click_date = "..................................";
+
             i.print_dt = MyHelper.GetDateStringForReport(DateTime.Now) + " " + MyHelper.GetTimeStringFromDate(DateTime.Now);
 
             return i;
diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
index 8763068..ffc6e73 100644
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
@@ -218,6 +218,11 @@ namespace TodoAPI2.Models
                     status_self_a_click_date = m_eva_create_evaluation_detail_process.status_self_a_click_date,
                     status_chief_a_click_date = m_eva_create_evaluation_detail_process.status_chief_a_click_date,
 
+                    status_supervisor_click_date = m_eva_create_evaluation_detail_process.status_supervisor_click_date,
+                    status_supervisor1A_click_date = m_eva_create_evaluation_detail_process.status_supervisor1A_click_date,
+                    status_supervisor2A_click_date = m_eva_create_evaluation_detail_process.status_supervisor2A_click_date,
+                    status_supervisor3A_click_date = m_eva_create_evaluation_detail_process.status_supervisor3A_click_date,
+
                     isActive = m_eva_create_evaluation_detail_process.isActive,
                     Created = m_eva_create_evaluation_detail_process.created,
                     Updated = m_eva_create_evaluation_detail_process.updated,
diff --git a/Models/rep_eva_x/rep_eva_xInputModel2.cs b/Models/rep_eva_x/rep_eva_xInputModel2.cs
index b19cccb..6f04c25 100644
--- a/Models/rep_eva_x/rep_eva_xInputModel2.cs
+++ b/Models/rep_eva_x/rep_eva_xInputModel2.cs
@@ -63,6 +63,11 @@ namespace TodoAPI2.Models
         public string txt_status_self_a_click_date { get; set; }
         public string txt_status_chief_a_click_date { get; set; }
 
+        public string txt_status_supervisor_click_date { get; set; }
+        public string txt_status_supervisor1A_click_date { get; set; }
+        public string txt_status_supervisor2A_click_date { get; set; }
+        public string txt_status_supervisor3A_click_date { get; set; }
+
         public string plan_remark { get; set; }
 
         public string eva_detail_remark { get; set; }