From 8a02127499bc50211a69750bbcf22c27f60694d5 Mon Sep 17 00:00:00 2001
From: nakorn <nakorn@developer>
Date: Mon, 18 Oct 2021 16:42:58 +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=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=AB=E0=B9=87=E0=B8=99=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=20=E0=B8=AB=E0=B8=B1=E0=B8=A7=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B9=81=E0=B8=9C=E0=B8=99=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_create_evaluation_detailService.cs             | 10 +++++++++-
 .../eva_create_evaluation_detail_firstdocService.cs    |  6 +++++-
 .../eva_create_evaluation_d.cshtml                     |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
index 53055cd..4d7f0f0 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
@@ -254,7 +254,10 @@ namespace TodoAPI2.Models
             var entity = GetEntity(model);
             entity.id = GetNewPrimaryKey();
 
-
+            if (!entity.work_period.HasValue)
+            {
+                entity.work_period = 6;
+            }
 
             var inserted = _repository.Insert(entity);
 
@@ -277,6 +280,11 @@ namespace TodoAPI2.Models
                 existingEntity.help_org_id = model.help_org_id;
                 existingEntity.remark = model.remark;
 
+                if (!existingEntity.work_period.HasValue)
+                {
+                    existingEntity.work_period = 6;
+                }
+
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
index f75ec5e..d578b88 100644
--- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
+++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
@@ -406,7 +406,11 @@ namespace TodoAPI2.Models
                 && (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue)
                 && (fk_external_employee.id == model.employee_id || !model.employee_id.HasValue)
                 && (string.IsNullOrEmpty(model.evaluation_round_search) || fk_planResult.id == Guid.Parse(model.evaluation_round_search))
-                && (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id || ((int?[])special_person).Contains(emp_id))
+                && (m_eva_create_evaluation_detail_agreement.employee_id == emp_id 
+                || m_eva_create_evaluation_detail_agreement.chief == emp_id 
+                || ((int?[])special_person).Contains(emp_id)
+                || fk_eva_create_evaluationResult10.employee_id == emp_id
+                )
 
                 orderby
                 fk_sort_depResult2.external_code,
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
index 4100bbf..014bd3c 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
@@ -54,7 +54,7 @@
                         <div class='row'>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_create_evaluation_detail_work_period" for="eva_create_evaluation_detail_work_period">ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)</label>
-                                <input class="form-control" type="number" id="eva_create_evaluation_detail_work_period" iLabel="ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)" iRequire="true" iGroup="eva_create_evaluation_detail" />
+                                <input class="form-control" type="number" id="eva_create_evaluation_detail_work_period" iLabel="ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)" iRequire="false" iGroup="eva_create_evaluation_detail" />
                             </div>
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_create_evaluation_detail_create_evaluation_id" for="eva_create_evaluation_detail_create_evaluation_id">แบบประเมิน</label>