From b44c25e2d7b245a01ce02a278d7031125b7bcb1f Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Fri, 27 Aug 2021 16:00:43 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=94=E0=B9=88=E0=B8=A7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_performance_planEntity.cs                 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Models/eva_performance_plan/eva_performance_planEntity.cs b/Models/eva_performance_plan/eva_performance_planEntity.cs
index 37fd2d5..47a6cca 100644
--- a/Models/eva_performance_plan/eva_performance_planEntity.cs
+++ b/Models/eva_performance_plan/eva_performance_planEntity.cs
@@ -27,7 +27,20 @@ namespace TodoAPI2.Models
         public DateTime? end_leave { get; set; }
 
         [NotMapped]
-        public string display_text { get; set; }
+        public string display_text
+        {
+            get
+            {
+                if (!theTime.HasValue || !fiscal_year.HasValue)
+                {
+                    return "";
+                }
+                else
+                {
+                    return theTime.ToString() + "/" + fiscal_year.ToString();
+                }
+            }
+        }
 
 
         public void SetAutoField(DataContext context)