From 0aac403a3380c72d16bade75de781b8bc2d91c0b Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Sun, 26 Sep 2021 17:36:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ApiControllers/rep_summary_a01Controllers.cs  |  8 +++---
 .../Irep_summary_a01Service.cs                |  2 +-
 .../rep_summary_a01SearchModel.cs             |  2 +-
 .../rep_summary_a01/rep_summary_a01Service.cs | 25 +++++++++++++++++++
 .../rep_summary_a01_report.cshtml             |  2 +-
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/ApiControllers/rep_summary_a01Controllers.cs b/ApiControllers/rep_summary_a01Controllers.cs
index ce802be..575e40d 100644
--- a/ApiControllers/rep_summary_a01Controllers.cs
+++ b/ApiControllers/rep_summary_a01Controllers.cs
@@ -75,9 +75,7 @@ namespace TodoAPI2.Controllers
                 _logger.LogCritical($"Exception in IActionResult GetBlankItem.", ex);
                 return StatusCode(500, $"{ex.Message}");
             }
-        }
-
-        
+        }        
 
 		/// <summary>
         /// Download Report
@@ -103,6 +101,8 @@ namespace TodoAPI2.Controllers
                 string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username");
                 string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password");
 
+                model.round_text = _repository.GetDisplayText(model.round_id);
+
                 string url = $"{mainurl}{reportsite}/rep_summary_a01.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}";
 
                 if (model.filetype == "xlsx")
@@ -121,7 +121,5 @@ namespace TodoAPI2.Controllers
                 return StatusCode(500, $"{ex.Message}");
             }
         }
-
-
     }
 }
diff --git a/Models/rep_summary_a01/Irep_summary_a01Service.cs b/Models/rep_summary_a01/Irep_summary_a01Service.cs
index 5eb6560..b29364c 100644
--- a/Models/rep_summary_a01/Irep_summary_a01Service.cs
+++ b/Models/rep_summary_a01/Irep_summary_a01Service.cs
@@ -16,7 +16,7 @@ namespace TodoAPI2.Models
         rep_summary_a01WithSelectionViewModel GetWithSelection(Guid id);
 		rep_summary_a01WithSelectionViewModel GetBlankItem();
 
-
+        string GetDisplayText(int? round_id);
     }
 }
 
diff --git a/Models/rep_summary_a01/rep_summary_a01SearchModel.cs b/Models/rep_summary_a01/rep_summary_a01SearchModel.cs
index 16a98ea..f6f44d2 100644
--- a/Models/rep_summary_a01/rep_summary_a01SearchModel.cs
+++ b/Models/rep_summary_a01/rep_summary_a01SearchModel.cs
@@ -21,7 +21,7 @@ namespace TodoAPI2.Models
         public int? round_id { get; set; }
 
         public int? employee_id { get; set; }
-
+        public string round_text { get; set; }
     }
 }
 
diff --git a/Models/rep_summary_a01/rep_summary_a01Service.cs b/Models/rep_summary_a01/rep_summary_a01Service.cs
index 12877a4..596f03c 100644
--- a/Models/rep_summary_a01/rep_summary_a01Service.cs
+++ b/Models/rep_summary_a01/rep_summary_a01Service.cs
@@ -51,6 +51,31 @@ namespace TodoAPI2.Models
 
             return i;
         }
+
+        public string GetDisplayText(int? round_id)
+        {
+            var postponement = (from i in _repository.Context.eva_adjust_postponement
+                     where i.id == round_id
+                     select i).FirstOrDefault();
+            if(postponement != null)
+            {
+                var plan = (from i in _repository.Context.eva_performance_plan
+                            where i.fiscal_year == postponement.fiscal_year
+                            && i.theTime == postponement.theRound
+                            select i).FirstOrDefault();
+                if(plan != null)
+                {
+                    var start = (from i in _repository.Context.eva_performance_plan_detail
+                                 where i.performance_plan_id == plan.id
+                                 select i.start_date).Min();
+                    var end = (from i in _repository.Context.eva_performance_plan_detail
+                               where i.performance_plan_id == plan.id
+                               select i.end_date).Max();
+                    return $"รอบที่ {postponement.theRound} ปี {postponement.fiscal_year} ({MyHelper.GetDateStringForReport(start)} - {MyHelper.GetDateStringForReport(end)})";
+                }
+            }
+            return null;
+        }
     }
 }
 
diff --git a/Views/rep_summary_a01View/rep_summary_a01_report.cshtml b/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
index 22c75df..5a0bf24 100644
--- a/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
+++ b/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
@@ -33,7 +33,7 @@
 
                     <div class="form-group col-md-3">
                         <label id='lab_s_rep_summary_a01_round_id' for='s_rep_summary_a01_round_id'>รอบการประเมิน</label>
-                        <select class="form-control" id="s_rep_summary_a01_round_id" iLabel="รอบการประเมิน" iRequire="false" iGroup="s_rep_summary_a01" title='รอบการประเมิน' placeholder='รอบการประเมิน'></select>
+                        <select class="form-control" id="s_rep_summary_a01_round_id" iLabel="รอบการประเมิน" iRequire="true" iGroup="s_rep_summary_a01" title='รอบการประเมิน' placeholder='รอบการประเมิน'></select>
                     </div>
 
                     <div class="form-group col-md-3">