From da69b4fee4997a51c557835ce32c01034f487fc8 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Thu, 14 May 2020 21:17:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=A7=E0=B8=A1=20code=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=81=E0=B9=89=20op=204=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_idp_plan_ownerControllers.cs          | 320 ++++++++++++++++++
 EXCEL/eva_idp_plan@eva_idp_plan_owner.xlsx    | Bin 0 -> 10631 bytes
 ...reate_evaluation_detail_review01Service.cs |   2 +-
 ...reate_evaluation_detail_review02Service.cs |   2 +-
 .../Ieva_idp_plan_ownerService.cs             |  28 ++
 .../eva_idp_plan_ownerInputModel.cs           |  32 ++
 .../eva_idp_plan_ownerReportRequestModel.cs   |  21 ++
 .../eva_idp_plan_ownerSearchModel.cs          |  23 ++
 .../eva_idp_plan_ownerService.cs              | 249 ++++++++++++++
 .../eva_idp_plan_ownerViewModel.cs            |  33 ++
 ...va_idp_plan_ownerWithSelectionViewModel.cs |  12 +
 Startup.cs                                    |   6 +
 Views/Shared/_Layout.cshtml                   |   1 -
 ...reate_evaluation_detail_agreement_d.cshtml |  88 +++++
 ..._create_evaluation_detail_process_d.cshtml |  12 +-
 ...create_evaluation_detail_process_d2.cshtml |  19 +-
 tb320eva.xml                                  |  97 ++++++
 .../eva_create_evaluation_detail_process_d.js |   6 +-
 ...eva_create_evaluation_detail_process_d2.js |   8 +-
 ...a_evaluation_achievement_process_inline.js |   1 -
 wwwroot/js/eva_idp_plan/eva_idp_plan.js       |   9 +-
 .../eva_idp_plan_owner/eva_idp_plan_owner.js  | 218 ++++++++++++
 22 files changed, 1152 insertions(+), 35 deletions(-)
 create mode 100644 ApiControllers/eva_idp_plan_ownerControllers.cs
 create mode 100644 EXCEL/eva_idp_plan@eva_idp_plan_owner.xlsx
 create mode 100644 Models/eva_idp_plan_owner/Ieva_idp_plan_ownerService.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerInputModel.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerReportRequestModel.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerSearchModel.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerService.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerViewModel.cs
 create mode 100644 Models/eva_idp_plan_owner/eva_idp_plan_ownerWithSelectionViewModel.cs
 create mode 100644 wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js

diff --git a/ApiControllers/eva_idp_plan_ownerControllers.cs b/ApiControllers/eva_idp_plan_ownerControllers.cs
new file mode 100644
index 0000000..df1dc4c
--- /dev/null
+++ b/ApiControllers/eva_idp_plan_ownerControllers.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using TTSW.Controllers;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+using TodoAPI2.Models;
+using System.Data;
+using Microsoft.Extensions.Configuration;
+using System.IO;
+
+namespace TodoAPI2.Controllers
+{
+    //[Authorize]
+    [Produces("application/json")]
+    [Route("api/eva_idp_plan_owner")]
+    public class eva_idp_plan_ownerController : BaseController
+    {
+        #region Private Variables
+        private ILogger<eva_idp_plan_ownerController> _logger;
+        private Ieva_idp_plan_ownerService _repository;
+		private IConfiguration Configuration { get; set; }
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        /// <summary>
+        /// Default constructure for dependency injection
+        /// </summary>
+        /// <param name="repository"></param>
+		/// <param name="configuration"></param>
+        /// <param name="logger"></param>
+        public eva_idp_plan_ownerController(ILogger<eva_idp_plan_ownerController> logger, Ieva_idp_plan_ownerService repository, IConfiguration configuration)
+        {
+            _logger = logger;
+            _repository = repository;
+			Configuration = configuration;
+        }
+
+        /// <summary>
+        /// Get specific item by id
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <returns>Return Get specific item by id</returns>
+        /// <response code="200">Returns the item</response>
+        /// <response code="500">Error Occurred</response>  
+        [HttpGet("{id}")]
+        [ProducesResponseType(typeof(eva_idp_plan_ownerWithSelectionViewModel), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult Get(int id)
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                var result = _repository.GetWithSelection(id);
+
+                return Ok(result);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical($"Exception in IActionResult Get.", ex);
+                return StatusCode(500, $"{ex.Message}");
+            }
+        }
+
+		/// <summary>
+        /// Get Blank Item
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <returns>Return a blank item</returns>
+        /// <response code="200">Returns the item</response>
+        /// <response code="500">Error Occurred</response>  
+        [HttpGet("GetBlankItem")]
+        [ProducesResponseType(typeof(eva_idp_plan_ownerWithSelectionViewModel), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult GetBlankItem()
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                var result = _repository.GetBlankItem();
+
+                return Ok(result);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical($"Exception in IActionResult GetBlankItem.", ex);
+                return StatusCode(500, $"{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Get list items by create_evaluation_detail_id
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <returns>Return list of items by specifced keyword</returns>
+        /// <response code="200">Returns the item</response>
+        /// <response code="500">Error Occurred</response>  
+        [HttpGet("")]
+        [ProducesResponseType(typeof(List<eva_idp_plan_ownerViewModel>), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult GetList(int? create_evaluation_detail_id)
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                return Ok(_repository.GetListBycreate_evaluation_detail_id(create_evaluation_detail_id));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical($"Exception in IActionResult GetList.", ex);
+                return StatusCode(500, $"{ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Get list items by search
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <returns>Return list of items by specifced keyword</returns>
+        /// <response code="200">Returns the item</response>
+        /// <response code="500">Error Occurred</response>  
+        [HttpGet("GetListBySearch")]
+        [ProducesResponseType(typeof(List<eva_idp_plan_ownerViewModel>), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult GetListBySearch(eva_idp_plan_ownerSearchModel model)
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                return Ok(_repository.GetListBySearch(model));
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical($"Exception in IActionResult GetListBySearch.", ex);
+                return StatusCode(500, $"{ex.Message}");
+            }
+        }	
+
+        /// <summary>
+        /// Create new item
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <param name="model"></param>
+        /// <returns>Response Result Message</returns>
+        /// <response code="200">Response Result Message</response>
+        /// <response code="400">If the model is invalid</response> 
+        /// <response code="500">Error Occurred</response>  
+        [HttpPost("")]
+        [ProducesResponseType(typeof(CommonResponseMessage), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult Insert([FromBody] eva_idp_plan_ownerInputModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    var result = _repository.Insert(model);
+					var message = new CommonResponseMessage();
+                    message.code = "200";
+                    message.message = $"เพิ่มข้อมูล เรียบร้อย";
+                    message.data = result;
+                    return Ok(message);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogCritical($"Exception while insert.", ex);
+                    return StatusCode(500, $"{ex.Message}");
+                }
+            }
+
+            return BadRequest(ModelState);
+        }
+
+        /// <summary>
+        /// Update item
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+		/// <param name="id"></param>
+        /// <param name="model"></param>
+        /// <returns>Response Result Message</returns>
+        /// <response code="200">Response Result Message</response>
+        /// <response code="400">If the model is invalid</response> 
+        /// <response code="500">Error Occurred</response>  
+        [HttpPut("{id}")]
+        [ProducesResponseType(typeof(CommonResponseMessage), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult Update(int id, [FromBody] eva_idp_plan_ownerInputModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    var result = _repository.Update(id, model);
+					var message = new CommonResponseMessage();
+                    message.code = "200";
+                    message.message = $"แก้ไขข้อมูล เรียบร้อย";
+                    message.data = result;
+                    return Ok(message);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogCritical($"Exception while update {id.ToString()}.", ex);
+                    return StatusCode(500, $"{id.ToString()}. {ex.Message}");
+                }
+            }
+
+            return BadRequest(ModelState);
+        }        
+
+        /// <summary>
+        /// Delete item
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+		/// <param name="id"></param>
+        /// <returns>Response Result Message</returns>
+        /// <response code="200">Response Result Message</response>
+        /// <response code="400">If the model is invalid</response> 
+        /// <response code="500">Error Occurred</response>  
+        [HttpDelete("{id}")]
+        [ProducesResponseType(typeof(CommonResponseMessage), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult Delete(int id)
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    _repository.Delete(id);
+					var message = new CommonResponseMessage();
+                    message.code = "200";
+                    message.message = $"ลบข้อมูล เรียบร้อย";
+                    message.data = null;
+                    return Ok(message);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogCritical($"Exception while delete {id.ToString()}.", ex);
+                    return StatusCode(500, $"{id.ToString()}. {ex.Message}");
+                }
+            }
+
+            return BadRequest(ModelState);
+        }
+
+		/// <summary>
+        /// Update multiple item
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <param name="model"></param>
+        /// <returns>Response Result Message</returns>
+        /// <response code="200">Response Result Message</response>
+        /// <response code="400">If the model is invalid</response> 
+        /// <response code="500">Error Occurred</response>  
+        [HttpPut("UpdateMultiple")]
+        [ProducesResponseType(typeof(CommonResponseMessage), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult UpdateMultiple([FromBody] List<eva_idp_plan_ownerInputModel> model)
+        {
+            if (ModelState.IsValid)
+            {
+				try
+				{
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+					string rowCount = _repository.UpdateMultiple(model);
+					var message = new CommonResponseMessage();
+                    message.code = "200";
+                    message.message = "ปรับปรุงข้อมูลเรียบร้อย จำนวน "+rowCount+" รายการ";
+                    message.data = null;
+                    return Ok(message);
+				}
+				catch (Exception ex)
+                {
+                    _logger.LogCritical($"Exception while UpdateMultiple.", ex);
+                    return StatusCode(500, $"{ex.Message}");
+                }   
+            }
+
+            return BadRequest(ModelState);
+        }
+
+
+    }
+}
diff --git a/EXCEL/eva_idp_plan@eva_idp_plan_owner.xlsx b/EXCEL/eva_idp_plan@eva_idp_plan_owner.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..1d0fdddf1627005dc57456806ca89af38c342e0a
GIT binary patch
literal 10631
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
b^-ceX+iHr4FdqZ}Fkm}9%#9W4e_j0_FxzCG

literal 0
HcmV?d00001

diff --git a/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs b/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs
index 3aeeeaf..aa6a98a 100644
--- a/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs
+++ b/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs
@@ -170,7 +170,7 @@ namespace TodoAPI2.Models
                 existingEntity.supervisor1 = model.supervisor1;
                 existingEntity.supervisor1_result = model.supervisor1_result;
                 existingEntity.supervisor1_remark = model.supervisor1_remark;
-                existingEntity.supervisor1_date = model.supervisor1_date;
+                existingEntity.supervisor1_date = DateTime.Now;
 
 
                 var updated = _repository.Update(id, existingEntity);
diff --git a/Models/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02Service.cs b/Models/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02Service.cs
index a0b037f..e62a654 100644
--- a/Models/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02Service.cs
+++ b/Models/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02Service.cs
@@ -168,7 +168,7 @@ namespace TodoAPI2.Models
                 existingEntity.supervisor2 = model.supervisor2;
                 existingEntity.supervisor2_result = model.supervisor2_result;
                 existingEntity.supervisor2_remark = model.supervisor2_remark;
-                existingEntity.supervisor2_date = model.supervisor2_date;
+                existingEntity.supervisor2_date = DateTime.Now;
 
 
                 var updated = _repository.Update(id, existingEntity);
diff --git a/Models/eva_idp_plan_owner/Ieva_idp_plan_ownerService.cs b/Models/eva_idp_plan_owner/Ieva_idp_plan_ownerService.cs
new file mode 100644
index 0000000..96cab28
--- /dev/null
+++ b/Models/eva_idp_plan_owner/Ieva_idp_plan_ownerService.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+using TodoAPI2.Models;
+
+namespace TodoAPI2.Models
+{
+    public interface Ieva_idp_plan_ownerService : IBaseService<int, eva_idp_plan_ownerInputModel, eva_idp_plan_ownerViewModel>
+    {
+        new eva_idp_plan_ownerViewModel Insert(eva_idp_plan_ownerInputModel model);
+        new eva_idp_plan_ownerViewModel Update(int id, eva_idp_plan_ownerInputModel model);
+        List<eva_idp_plan_ownerViewModel> GetListBycreate_evaluation_detail_id(int? create_evaluation_detail_id);
+		List<eva_idp_plan_ownerViewModel> GetListBySearch(eva_idp_plan_ownerSearchModel model);
+
+		string UpdateMultiple(List<eva_idp_plan_ownerInputModel> model);
+        eva_idp_plan_ownerWithSelectionViewModel GetWithSelection(int id);
+		eva_idp_plan_ownerWithSelectionViewModel GetBlankItem();
+
+
+
+    }
+}
+
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerInputModel.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerInputModel.cs
new file mode 100644
index 0000000..cbfb7ee
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerInputModel.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerInputModel
+    {
+
+        public int? id { get; set; }
+
+        public int? create_evaluation_detail_id { get; set; }
+
+        public string develop { get; set; }
+
+        public string development_method { get; set; }
+
+        public DateTime? start_date { get; set; }
+
+        public DateTime? end_date { get; set; }
+
+        public string active_mode { get; set; }
+    }
+}
+
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerReportRequestModel.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerReportRequestModel.cs
new file mode 100644
index 0000000..7bf0889
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerReportRequestModel.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerReportRequestModel : eva_idp_plan_ownerSearchModel
+    {
+	    public string filetype { get; set; }
+
+        public string contentType { get { return MyHelper.GetContentType(filetype); } }
+    }
+}
+
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerSearchModel.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerSearchModel.cs
new file mode 100644
index 0000000..57e1457
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerSearchModel.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerSearchModel
+    {
+
+        public int id { get; set; }
+
+        public int? create_evaluation_detail_id { get; set; }
+
+    }
+}
+
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerService.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerService.cs
new file mode 100644
index 0000000..3f8f808
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerService.cs
@@ -0,0 +1,249 @@
+using AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+using TodoAPI2.Models;
+using System.IO;
+using System.Web;
+using System.Net;
+using TTSW.Configure;
+using Microsoft.Extensions.Options;
+using System.Data;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerService : Ieva_idp_plan_ownerService
+    {
+        private IBaseRepository2<eva_idp_planEntity, int> _repository;
+		private IMyDatabase db;
+		private Iexternal_linkageService ext;
+
+        public eva_idp_plan_ownerService(IBaseRepository2<eva_idp_planEntity, int> repository, IMyDatabase mydb, Iexternal_linkageService inext)
+        {
+            _repository = repository;
+			db = mydb;
+			ext = inext;
+        }
+
+        #region Private Functions
+        private eva_idp_planEntity GetEntity(eva_idp_plan_ownerInputModel model)
+        {
+            return Mapper.Map<eva_idp_planEntity>(model);
+        }
+        private List<eva_idp_planEntity> GetEntityList(List<eva_idp_plan_ownerInputModel> models)
+        {
+            return Mapper.Map<List<eva_idp_planEntity>>(models);
+        }
+        private eva_idp_plan_ownerViewModel GetDto(eva_idp_planEntity entity)
+        {
+            return Mapper.Map<eva_idp_plan_ownerViewModel>(entity);
+        }
+        private List<eva_idp_plan_ownerViewModel> GetDtoList(List<eva_idp_planEntity> entities)
+        {
+            return Mapper.Map<List<eva_idp_plan_ownerViewModel>>(entities);
+        }
+       
+        #endregion
+
+        #region Public Functions
+        #region Query Functions
+
+        public eva_idp_plan_ownerViewModel Get(int id)
+        {
+            var entity = _repository.Get(id);
+
+            return GetDto(entity);
+        }
+        public eva_idp_plan_ownerWithSelectionViewModel GetWithSelection(int id)
+        {
+            var entity = _repository.Get(id);
+            var i = Mapper.Map<eva_idp_plan_ownerWithSelectionViewModel>(entity);
+
+
+            return i;
+        }
+        public eva_idp_plan_ownerWithSelectionViewModel GetBlankItem()
+        {
+            var i = new eva_idp_plan_ownerWithSelectionViewModel();
+
+
+            return i;
+        }
+
+        public List<eva_idp_plan_ownerViewModel> GetListBycreate_evaluation_detail_id(int? create_evaluation_detail_id)
+        {
+			var model = new eva_idp_plan_ownerSearchModel();
+            model.create_evaluation_detail_id = create_evaluation_detail_id;
+            return GetListBySearch(model);
+        }
+
+		public List<eva_idp_plan_ownerViewModel> GetListBySearch(eva_idp_plan_ownerSearchModel model)
+        {
+            var data = (
+                from m_eva_idp_plan_owner in _repository.Context.eva_idp_plan
+
+
+				where 1==1
+                //&& (m_eva_idp_plan_owner.id == model.id || !model.id.HasValue)
+                && (m_eva_idp_plan_owner.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue)
+
+
+                orderby m_eva_idp_plan_owner.created descending
+                select new eva_idp_plan_ownerViewModel()
+                {
+                    id = m_eva_idp_plan_owner.id,
+                    create_evaluation_detail_id = m_eva_idp_plan_owner.create_evaluation_detail_id,
+                    develop = m_eva_idp_plan_owner.develop,
+                    development_method = m_eva_idp_plan_owner.development_method,
+                    start_date = m_eva_idp_plan_owner.start_date,
+                    end_date = m_eva_idp_plan_owner.end_date,
+
+
+                    isActive = m_eva_idp_plan_owner.isActive,
+                    Created = m_eva_idp_plan_owner.created,
+                    Updated = m_eva_idp_plan_owner.updated
+                }
+            ).Take(100).ToList();
+
+            return data;
+        }
+
+        #endregion
+
+        #region Manipulation Functions
+
+        public int GetNewPrimaryKey()
+        {
+            int? newkey = 0;
+
+            var x = (from i in _repository.Context.eva_idp_plan
+                    orderby i.id descending
+                    select i).Take(1).ToList();
+
+            if(x.Count > 0)
+            {
+                newkey = x[0].id + 1;
+            }
+
+            return newkey.Value;
+        }
+
+        public eva_idp_plan_ownerViewModel Insert(eva_idp_plan_ownerInputModel model)
+        {
+            var entity = GetEntity(model);
+            entity.id = GetNewPrimaryKey();
+
+
+
+            var inserted = _repository.Insert(entity);
+ 
+            return Get(inserted.id);
+        }
+
+        public eva_idp_plan_ownerViewModel Update(int id, eva_idp_plan_ownerInputModel model)
+        {
+            var existingEntity = _repository.Get(id);
+            if (existingEntity != null)
+            {
+                existingEntity.create_evaluation_detail_id = model.create_evaluation_detail_id;
+                existingEntity.develop = model.develop;
+                existingEntity.development_method = model.development_method;
+                existingEntity.start_date = model.start_date;
+                existingEntity.end_date = model.end_date;
+
+
+                var updated = _repository.Update(id, existingEntity);
+                return Get(updated.id);
+            }
+            else
+            throw new NotificationException("No data to update");
+        }
+
+		public string UpdateMultiple(List<eva_idp_plan_ownerInputModel> model)
+        {
+            foreach(var i in model)
+            {
+                if (i.active_mode == "1" && i.id.HasValue) // update
+                {                    
+                    var existingEntity = _repository.Get(i.id.Value);
+                    if (existingEntity != null)
+                    {
+                existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id;
+                existingEntity.develop = i.develop;
+                existingEntity.development_method = i.development_method;
+                existingEntity.start_date = i.start_date;
+                existingEntity.end_date = i.end_date;
+
+
+                        _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
+                    }
+                }
+                else if (i.active_mode == "1" && !i.id.HasValue) // add
+                {
+                    var entity = GetEntity(i);
+                    entity.id = GetNewPrimaryKey();
+                    _repository.InsertWithoutCommit(entity);
+                }
+                else if (i.active_mode == "0" && i.id.HasValue) // remove
+                {                    
+                    _repository.DeleteWithoutCommit(i.id.Value);
+                }
+                else if (i.active_mode == "0" && !i.id.HasValue)
+                {
+                    // nothing to do
+                }                
+            }
+			_repository.Context.SaveChanges();
+
+            return model.Count().ToString();
+        }
+
+        public eva_idp_plan_ownerViewModel SetAsActive(int id)
+        {
+            var updated = _repository.SetAsActive(id);
+
+            return Get(updated.id);
+        }
+        public eva_idp_plan_ownerViewModel SetAsInactive(int id)
+        {
+            var updated = _repository.SetAsInActive(id);
+
+            return Get(updated.id);
+        }
+        public void Delete(int id)
+        {
+            _repository.Delete(id);
+
+            return;
+        }
+
+        private Dictionary<string,string> GetLookupForLog()
+        {
+            var i = new Dictionary<string, string>();
+
+
+            i.Add("create_evaluation_detail_id", "create_evaluation_detail_id");
+            i.Add("develop", "ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา");
+            i.Add("development_method", "วิธีการพัฒนา");
+            i.Add("start_date", "ช่วงเวลาเริ่มต้นพัฒนา");
+            i.Add("txt_start_date", "ช่วงเวลาเริ่มต้นพัฒนา");
+            i.Add("end_date", "ช่วงเวลาสิ้นสุดพัฒนา");
+            i.Add("txt_end_date", "ช่วงเวลาสิ้นสุดพัฒนา");           
+
+            return i;
+        }
+
+        #endregion
+
+        #region Match Item
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerViewModel.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerViewModel.cs
new file mode 100644
index 0000000..822c6ee
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerViewModel.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+using TTSW.EF;
+using TTSW.Utils;
+using TTSW.Constant;
+using TTSW.Common;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerViewModel : BaseViewModel2<int>
+    {
+
+        public int? create_evaluation_detail_id { get; set; }
+
+        public string develop { get; set; }
+
+        public string development_method { get; set; }
+
+        public DateTime? start_date { get; set; }
+
+        public string txt_start_date { get { return MyHelper.GetDateStringForReport(this.start_date); } }
+
+        public DateTime? end_date { get; set; }
+
+        public string txt_end_date { get { return MyHelper.GetDateStringForReport(this.end_date); } }
+
+
+    }
+}
\ No newline at end of file
diff --git a/Models/eva_idp_plan_owner/eva_idp_plan_ownerWithSelectionViewModel.cs b/Models/eva_idp_plan_owner/eva_idp_plan_ownerWithSelectionViewModel.cs
new file mode 100644
index 0000000..e26fcc9
--- /dev/null
+++ b/Models/eva_idp_plan_owner/eva_idp_plan_ownerWithSelectionViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TodoAPI2.Models
+{
+    public class eva_idp_plan_ownerWithSelectionViewModel: eva_idp_plan_ownerViewModel
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/Startup.cs b/Startup.cs
index 53a3f13..f5a4a3e 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -292,6 +292,8 @@ namespace Test01
             services.AddScoped<IBaseRepository2<eva_temp_fingerscanEntity, string>, BaseRepository2<eva_temp_fingerscanEntity, string>>();
             services.AddScoped<Ieva_temp_fingerscanService, eva_temp_fingerscanService>();
 
+            services.AddScoped<Ieva_idp_plan_ownerService, eva_idp_plan_ownerService>();
+
             #endregion
 
             services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -499,6 +501,10 @@ namespace Test01
                 cfg.CreateMap<eva_idp_planEntity, eva_idp_planViewModel>();
                 cfg.CreateMap<eva_idp_planEntity, eva_idp_planWithSelectionViewModel>();
 
+                cfg.CreateMap<eva_idp_plan_ownerInputModel, eva_idp_planEntity>();
+                cfg.CreateMap<eva_idp_planEntity, eva_idp_plan_ownerViewModel>();
+                cfg.CreateMap<eva_idp_planEntity, eva_idp_plan_ownerWithSelectionViewModel>();
+
             });
             #endregion
 
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index 76e7df9..d1e87ba 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -12,7 +12,6 @@
           @Environment.GetEnvironmentVariable("JasperReportServer_MainURL")
           @Environment.GetEnvironmentVariable("JasperReportServer_reportsite")
           @Environment.GetEnvironmentVariable("JasperReportServer_username")
-          @Environment.GetEnvironmentVariable("JasperReportServer_password")
           ">
     <title>@Environment.GetEnvironmentVariable("SiteInformation_sitename")</title>
 
diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
index aaaaec7..cb6c16f 100644
--- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
+++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
@@ -143,6 +143,57 @@
     </div>
 </div>
 
+<div class="modal fade" id="eva_idp_plan_ownerModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_idp_plan_ownerModelLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="eva_idp_plan_ownerModelLabel">บันทึกข้อมูล แผนพัฒนาการปฏิบัติงานรายบุคคล</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+
+                        <input class="form-control" type="hidden" id="eva_idp_plan_owner_create_evaluation_detail_id" />
+
+
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_idp_plan_owner_develop" for="eva_idp_plan_owner_develop">ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา</label>
+                                <textarea class="form-control" rows="4" cols="50" id="eva_idp_plan_owner_develop" iLabel="ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา" iRequire="true" iGroup="eva_idp_plan_owner"></textarea>
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_idp_plan_owner_development_method" for="eva_idp_plan_owner_development_method">วิธีการพัฒนา</label>
+                                <textarea class="form-control" rows="4" cols="50" id="eva_idp_plan_owner_development_method" iLabel="วิธีการพัฒนา" iRequire="false" iGroup="eva_idp_plan_owner"></textarea>
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_idp_plan_owner_start_date" for="eva_idp_plan_owner_start_date">ช่วงเวลาเริ่มต้นพัฒนา</label>
+                                <input class="form-control" type="text" id="eva_idp_plan_owner_start_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาเริ่มต้นพัฒนา" iRequire="false" iGroup="eva_idp_plan_owner" />
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_idp_plan_owner_end_date" for="eva_idp_plan_owner_end_date">ช่วงเวลาสิ้นสุดพัฒนา</label>
+                                <input class="form-control" type="text" id="eva_idp_plan_owner_end_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาสิ้นสุดพัฒนา" iRequire="false" iGroup="eva_idp_plan_owner" />
+                            </div>
+                        </div>
+
+
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-primary" onclick="javascript:eva_idp_plan_owner_PutUpdate()">บันทึก</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="row page-title">
     <div class="col-md-5">
         <div class="page-title">
@@ -297,6 +348,38 @@
 <p style="display:none;" id="sum_b"></p>
 <br />
 
+
+<section class="wrapper">
+    <div class="title"><div class="line"></div>แผนพัฒนาการปฏิบัติงานรายบุคคล</div>
+    <div class="tools">
+        <div class="row">
+
+            <input class="form-control" type="hidden" id="s_eva_idp_plan_owner_create_evaluation_detail_id" />
+
+            <div class="col-md-3">
+                <button class="btn btn-info" onclick="javascript:eva_idp_plan_owner_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+            </div>
+
+        </div>
+    </div>
+
+    <table id="eva_idp_plan_ownerTable" class="display table table-bordered table-striped">
+        <thead>
+            <tr>
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_idp_plan_owner_develop'>ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา</label></th>
+                <th><label id='h_eva_idp_plan_owner_development_method'>วิธีการพัฒนา</label></th>
+                <th><label id='h_eva_idp_plan_owner_start_date'>ช่วงเวลาเริ่มต้นพัฒนา</label></th>
+                <th><label id='h_eva_idp_plan_owner_end_date'>ช่วงเวลาสิ้นสุดพัฒนา</label></th>
+
+            </tr>
+        </thead>
+        <tbody></tbody>
+    </table>
+</section>
+
+<br />
+
 <section class="wrapper">
     <div class="title col-md-12"><div class="line"></div>ส่งข้อตกลงการประเมิน</div>
 
@@ -321,6 +404,7 @@
     <script src="~/js/eva_evaluation_achievement/eva_evaluation_achievement.js"></script>
     <script src="~/js/eva_evaluation_behavior/eva_evaluation_behavior.js"></script>
     <script src="~/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js"></script>
+    <script src="~/js/eva_idp_plan_owner/eva_idp_plan_owner.js"></script>
     <script>
     $(document).ready(function () {
         var id = getUrlParameter("id");
@@ -331,12 +415,16 @@
             eva_evaluation_behavior_InitiateDataTable(id);
             eva_evaluation_behavior_InitialForm();
             eva_create_evaluation_detail_status_SetEditForm(id);
+            eva_idp_plan_owner_InitiateDataTable(id);
+            eva_idp_plan_owner_InitialForm();
+            
         } else {
             eva_create_evaluation_detail_agreement_SetCreateForm();
         }
         SetupValidationRemark("eva_create_evaluation_detail_agreement");
         SetupValidationRemark("eva_evaluation_achievement");
         SetupValidationRemark("eva_evaluation_behavior");
+        SetupValidationRemark("eva_idp_plan_owner");
     });
     </script>
 }
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
index 9fb3501..62e159d 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
@@ -171,7 +171,7 @@
                         <th>ลำดับ</th>
 
                         <th width="30%"><label>ผลสัมฤทธิ์ตัวชี้วัดผลงาน</label></th>
-                        <th><label>น้ำหนัก</label></th>
+                        <th><label>น้ำหนัก (%)</label></th>
 
                         <th><label>1</label></th>
                         <th><label>2</label></th>
@@ -179,7 +179,7 @@
                         <th><label>4</label></th>
                         <th><label>5</label></th>
 
-                        <th width="10%"><label>คะแนน</label></th>
+                        <th width="10%"><label>คะแนน (ระบุ 1.00-5.00)</label></th>
                         <th width="10%"><label>รวมคะแนน</label></th>
 
                     </tr>
@@ -229,13 +229,13 @@
                     <tr>
                         <th>ลำดับ</th>
                         <th><label>พฤติกรรมการปฏิบัติงาน</label></th>
-                        <th width="10%"><label>น้ำหนัก</label></th>
+                        <th width="10%"><label>น้ำหนัก (%)</label></th>
                         <th width="7%"><label>1</label></th>
                         <th width="7%"><label>2</label></th>
                         <th width="7%"><label>3</label></th>
                         <th width="7%"><label>4</label></th>
                         <th width="7%"><label>5</label></th>
-                        <th width="15%"><label>คะแนน</label></th>
+                        <th width="15%"><label>คะแนน (ระบุ 1.00-5.00)</label></th>
                         <th width="10%"><label>รวมคะแนน</label></th>
                     </tr>
                 </thead>
@@ -282,7 +282,7 @@
         <thead>
             <tr>
                 <th><label>คะแนนประเมิน</label></th>
-                <th><label>น้ำหนัก</label></th>
+                <th><label>น้ำหนัก (%)</label></th>
                 <th><label>คะแนน</label></th>
                 <th><label>รวมคะแนน</label></th>
             </tr>
@@ -340,7 +340,7 @@
                     <div class='row'>
                         <div class="form-group col-md-6">
                             <label id="lab_eva_create_evaluation_detail_review01_supervisor1_date" for="eva_create_evaluation_detail_review01_supervisor1_date">วันที่ประเมิน</label>
-                            <input class="form-control" type="text" id="eva_create_evaluation_detail_review01_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_create_evaluation_detail_review01" />
+                            <input disabled class="form-control" type="text" id="eva_create_evaluation_detail_review01_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review01" />
                         </div>
                     </div>
                     <div class='row'>
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
index 385ea12..ba73751 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
@@ -23,23 +23,23 @@
                         <div class='row'>
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_idp_plan_develop" for="eva_idp_plan_develop">ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา</label>
-                                <textarea class="form-control" rows="4" cols="50" id="eva_idp_plan_develop" iLabel="ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา" iRequire="true" iGroup="eva_idp_plan"></textarea>
+                                <textarea disabled class="form-control" rows="4" cols="50" id="eva_idp_plan_develop" iLabel="ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา" iRequire="true" iGroup="eva_idp_plan"></textarea>
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_idp_plan_development_method" for="eva_idp_plan_development_method">วิธีการพัฒนา</label>
-                                <textarea class="form-control" rows="4" cols="50" id="eva_idp_plan_development_method" iLabel="วิธีการพัฒนา" iRequire="true" iGroup="eva_idp_plan"></textarea>
+                                <textarea disabled class="form-control" rows="4" cols="50" id="eva_idp_plan_development_method" iLabel="วิธีการพัฒนา" iRequire="false" iGroup="eva_idp_plan"></textarea>
                             </div>
                         </div>
                         <div class='row'>
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_idp_plan_start_date" for="eva_idp_plan_start_date">ช่วงเวลาเริ่มต้นพัฒนา</label>
-                                <input class="form-control" type="text" id="eva_idp_plan_start_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาเริ่มต้นพัฒนา" iRequire="true" iGroup="eva_idp_plan" />
+                                <input disabled class="form-control" type="text" id="eva_idp_plan_start_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาเริ่มต้นพัฒนา" iRequire="false" iGroup="eva_idp_plan" />
                             </div>
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_idp_plan_end_date" for="eva_idp_plan_end_date">ช่วงเวลาสิ้นสุดพัฒนา</label>
-                                <input class="form-control" type="text" id="eva_idp_plan_end_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาสิ้นสุดพัฒนา" iRequire="true" iGroup="eva_idp_plan" />
+                                <input disabled class="form-control" type="text" id="eva_idp_plan_end_date" data-provide="datepicker" data-date-language="th-th" iLabel="ช่วงเวลาสิ้นสุดพัฒนา" iRequire="false" iGroup="eva_idp_plan" />
                             </div>
                         </div>
 
@@ -47,7 +47,7 @@
                     </div>
                 </div>
             </div>
-            <div class="modal-footer">
+            <div class="modal-footer" style="display:none;">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
                 <button type="button" class="btn btn-primary" onclick="javascript:eva_idp_plan_PutUpdate()">บันทึก</button>
             </div>
@@ -234,7 +234,7 @@
 
                         <th><label>คะแนน</label></th>
                         <th><label>รวมคะแนน</label></th>
-                        <th><label>คะแนน</label></th>
+                        <th><label>คะแนน <br />(ระบุ 1.00-5.00)</label></th>
                         <th><label>รวมคะแนน</label></th>
 
                     </tr>
@@ -292,7 +292,7 @@
                         <th width="7%"><label>5</label></th>
                         <th width="8%"><label>คะแนน</label></th>
                         <th width="8%"><label>รวมคะแนน</label></th>
-                        <th width="13%"><label>คะแนน</label></th>
+                        <th width="13%"><label>คะแนน <br/>(ระบุ 1.00-5.00)</label></th>
                         <th width="8%"><label>รวมคะแนน</label></th>
                     </tr>
                 </thead>
@@ -384,7 +384,7 @@
 <section class="wrapper">
     <div class="title"><div class="line"></div>แผนพัฒนาการปฏิบัติงานรายบุคคล</div>
 
-    <div class="tools">
+    <div class="tools" style="display:none;">
         <div class="row">
 
             <input class="form-control" type="hidden" id="s_eva_idp_plan_create_evaluation_detail_id" />
@@ -399,7 +399,6 @@
     <table id="eva_idp_planTable" class="display table table-bordered table-striped">
         <thead>
             <tr>
-                <th>เครื่องมือ</th>
                 <th><label id='h_eva_idp_plan_develop'>ความรู้/ทักษะ/สมรรถนะที่ต้องได้รับการพัฒนา</label></th>
                 <th><label id='h_eva_idp_plan_development_method'>วิธีการพัฒนา</label></th>
                 <th><label id='h_eva_idp_plan_start_date'>ช่วงเวลาเริ่มต้นพัฒนา</label></th>
@@ -466,7 +465,7 @@
 
                         <div class="form-group col-md-6">
                             <label id="lab_eva_create_evaluation_detail_review02_supervisor2_date" for="eva_create_evaluation_detail_review02_supervisor2_date">วันที่ประเมิน</label>
-                            <input class="form-control" type="text" id="eva_create_evaluation_detail_review02_supervisor2_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_create_evaluation_detail_review02" />
+                            <input disabled class="form-control" type="text" id="eva_create_evaluation_detail_review02_supervisor2_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_create_evaluation_detail_review02" />
                         </div>
                     </div>
                     <div class='row'>
diff --git a/tb320eva.xml b/tb320eva.xml
index 718683f..bfe2360 100644
--- a/tb320eva.xml
+++ b/tb320eva.xml
@@ -2730,6 +2730,103 @@
             <response code="400">If the model is invalid</response> 
             <response code="500">Error Occurred</response>  
         </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.eva_idp_plan_ownerController},TodoAPI2.Models.Ieva_idp_plan_ownerService,Microsoft.Extensions.Configuration.IConfiguration)">
+            <summary>
+            Default constructure for dependency injection
+            </summary>
+            <param name="repository"></param>
+            <param name="configuration"></param>
+            <param name="logger"></param>
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.Get(System.Int32)">
+            <summary>
+            Get specific item by id
+            </summary>
+            <remarks>
+            </remarks>
+            <returns>Return Get specific item by id</returns>
+            <response code="200">Returns the item</response>
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.GetBlankItem">
+            <summary>
+            Get Blank Item
+            </summary>
+            <remarks>
+            </remarks>
+            <returns>Return a blank item</returns>
+            <response code="200">Returns the item</response>
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.GetList(System.Nullable{System.Int32})">
+            <summary>
+            Get list items by create_evaluation_detail_id
+            </summary>
+            <remarks>
+            </remarks>
+            <returns>Return list of items by specifced keyword</returns>
+            <response code="200">Returns the item</response>
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.GetListBySearch(TodoAPI2.Models.eva_idp_plan_ownerSearchModel)">
+            <summary>
+            Get list items by search
+            </summary>
+            <remarks>
+            </remarks>
+            <returns>Return list of items by specifced keyword</returns>
+            <response code="200">Returns the item</response>
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.Insert(TodoAPI2.Models.eva_idp_plan_ownerInputModel)">
+            <summary>
+            Create new item
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="model"></param>
+            <returns>Response Result Message</returns>
+            <response code="200">Response Result Message</response>
+            <response code="400">If the model is invalid</response> 
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.Update(System.Int32,TodoAPI2.Models.eva_idp_plan_ownerInputModel)">
+            <summary>
+            Update item
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="id"></param>
+            <param name="model"></param>
+            <returns>Response Result Message</returns>
+            <response code="200">Response Result Message</response>
+            <response code="400">If the model is invalid</response> 
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.Delete(System.Int32)">
+            <summary>
+            Delete item
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="id"></param>
+            <returns>Response Result Message</returns>
+            <response code="200">Response Result Message</response>
+            <response code="400">If the model is invalid</response> 
+            <response code="500">Error Occurred</response>  
+        </member>
+        <member name="M:TodoAPI2.Controllers.eva_idp_plan_ownerController.UpdateMultiple(System.Collections.Generic.List{TodoAPI2.Models.eva_idp_plan_ownerInputModel})">
+            <summary>
+            Update multiple item
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="model"></param>
+            <returns>Response Result Message</returns>
+            <response code="200">Response Result Message</response>
+            <response code="400">If the model is invalid</response> 
+            <response code="500">Error Occurred</response>  
+        </member>
         <member name="M:TodoAPI2.Controllers.eva_level_scoreController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.eva_level_scoreController},TodoAPI2.Models.Ieva_level_scoreService,Microsoft.Extensions.Configuration.IConfiguration)">
             <summary>
             Default constructure for dependency injection
diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js
index 11b88e9..3b20309 100644
--- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js
+++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js
@@ -46,9 +46,9 @@ $("#eva_create_evaluation_detail_process_search_employee_fullname").val(data.sea
 //console.log(data);
 item_level_score = data.item_level_score;
 
-$("#w1").text(data.create_evaluation_score1.toFixed(2)+"%");
-$("#w2").text(data.create_evaluation_score2.toFixed(2)+"%");
-$("#w3").text((data.create_evaluation_score1+data.create_evaluation_score2).toFixed(2)+"%");
+$("#w1").text(data.create_evaluation_score1.toFixed(2));
+$("#w2").text(data.create_evaluation_score2.toFixed(2));
+$("#w3").text((data.create_evaluation_score1+data.create_evaluation_score2).toFixed(2));
 
 }
 
diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js
index bffc097..29694f9 100644
--- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js
+++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js
@@ -185,9 +185,9 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
             $("#btn03").show();
             $("#btnb01").show();
             $("#btnb02").show();
-            $("#btnb03").show();            
+            //$("#btnb03").show();            
             $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", false);
-            $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", false);
+            //$("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", false);
             $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", false);
         }else{
             $("#thestatus").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)");
@@ -214,7 +214,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
             $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", false);
             $("#btnc01").show();
             $("#btnc02").show();
-            $("#btnc03").show();
+            //$("#btnc03").show();
         }else{
             $("#thestatus1A").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน หรือ ผู้ประเมินสูงสุด ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)");
         }    
@@ -237,7 +237,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
             $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", false);
             $("#btnd01").show();
             $("#btnd02").show();
-            $("#btnd03").show();
+            //$("#btnd03").show();
         }else{
             $("#thestatus2A").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน หรือ ผู้ประเมินสูงสุด หรือ ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)");
         }    
diff --git a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
index 03976b7..bdaaffb 100644
--- a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
+++ b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
@@ -125,7 +125,6 @@ function Oneva_evaluation_achievement_process_scoreChange(){
     $("#h_eva_evaluation_achievement_process_score").text(total_achievement_score.toFixed(2));
 
     var w1 = parseFloat($("#w1").text());
-console.log(w1);
 
     $("#eva_create_evaluation_detail_summary1_total_summary_chief").text((total_achievement * 20).toFixed(2));
     $("#eva_create_evaluation_detail_summary1_Final_summary_chief").text((total_achievement * 20).toFixed(2));
diff --git a/wwwroot/js/eva_idp_plan/eva_idp_plan.js b/wwwroot/js/eva_idp_plan/eva_idp_plan.js
index dcf104e..e148539 100644
--- a/wwwroot/js/eva_idp_plan/eva_idp_plan.js
+++ b/wwwroot/js/eva_idp_plan/eva_idp_plan.js
@@ -159,20 +159,13 @@ var eva_idp_plan_setupTable = function (result) {
         "data": result,
 		"select": false,
         "columns": [
-		{ "data": "id" },
                 { "data": "develop" },
                 { "data": "development_method" },
                 { "data": "txt_start_date" },
                 { "data": "txt_end_date" },            
         ],
         "columnDefs": [
-            {
-                "targets": 0,
-                "data": "id",
-                "render": function (data, type, row, meta) {
-                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_idp_plan_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_idp_plan_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
-                }
-            }],
+            ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
diff --git a/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js b/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js
new file mode 100644
index 0000000..054099a
--- /dev/null
+++ b/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js
@@ -0,0 +1,218 @@
+var eva_idp_plan_owner_editMode = "CREATE";
+var eva_idp_plan_owner_API = "/api/eva_idp_plan_owner/";
+
+//================= Search Customizaiton =========================================
+
+function eva_idp_plan_owner_GetSearchParameter() {
+    var eva_idp_plan_ownerSearchObject = new Object();
+eva_idp_plan_ownerSearchObject.create_evaluation_detail_id = getUrlParameter("id");
+
+    return eva_idp_plan_ownerSearchObject;
+}
+
+function eva_idp_plan_owner_FeedDataToSearchForm(data) {
+$("#s_eva_idp_plan_owner_create_evaluation_detail_id").val(data.create_evaluation_detail_id);
+
+}
+
+//================= Form Data Customizaiton =========================================
+
+function eva_idp_plan_owner_FeedDataToForm(data) {
+$("#eva_idp_plan_owner_id").val(data.id);
+$("#eva_idp_plan_owner_create_evaluation_detail_id").val(data.create_evaluation_detail_id);
+$("#eva_idp_plan_owner_develop").val(data.develop);
+$("#eva_idp_plan_owner_development_method").val(data.development_method);
+$("#eva_idp_plan_owner_start_date").val(formatDate(data.start_date));
+$("#eva_idp_plan_owner_end_date").val(formatDate(data.end_date));
+
+}
+
+function eva_idp_plan_owner_GetFromForm() {
+    var eva_idp_plan_ownerObject = new Object();
+eva_idp_plan_ownerObject.id = $("#eva_idp_plan_owner_id").val();
+eva_idp_plan_ownerObject.create_evaluation_detail_id = getUrlParameter("id");
+eva_idp_plan_ownerObject.develop = $("#eva_idp_plan_owner_develop").val();
+eva_idp_plan_ownerObject.development_method = $("#eva_idp_plan_owner_development_method").val();
+eva_idp_plan_ownerObject.start_date = getDate($("#eva_idp_plan_owner_start_date").val());
+eva_idp_plan_ownerObject.end_date = getDate($("#eva_idp_plan_owner_end_date").val());
+
+
+    return eva_idp_plan_ownerObject;
+}
+
+function eva_idp_plan_owner_InitialForm(s) {
+    var successFunc = function (result) {
+        eva_idp_plan_owner_FeedDataToForm(result);
+		eva_idp_plan_owner_FeedDataToSearchForm(result);
+        if (s) {
+            // Incase model popup
+            $("#eva_idp_plan_ownerModel").modal("show");
+        }
+		endLoad();
+    };
+	startLoad();
+    AjaxGetRequest(apisite + eva_idp_plan_owner_API + "GetBlankItem", successFunc, AlertDanger);
+}
+
+//================= Form Mode Setup and Flow =========================================
+
+function eva_idp_plan_owner_GoCreate() {
+    // Incase model popup
+    eva_idp_plan_owner_SetCreateForm(true);
+
+    // Incase open new page
+    //window_open(appsite + "/eva_idp_plan_ownerView/eva_idp_plan_owner_d");
+}
+
+function eva_idp_plan_owner_GoEdit(a) {
+    // Incase model popup
+    eva_idp_plan_owner_SetEditForm(a);
+
+    // Incase open new page
+    //window_open(appsite + "/eva_idp_plan_ownerView/eva_idp_plan_owner_d?id=" + a);
+}
+
+function eva_idp_plan_owner_SetEditForm(a) {
+    var successFunc = function (result) {
+        eva_idp_plan_owner_editMode = "UPDATE";
+        eva_idp_plan_owner_FeedDataToForm(result);
+        $("#eva_idp_plan_ownerModel").modal("show");
+		endLoad();
+    };
+	startLoad();
+    AjaxGetRequest(apisite + eva_idp_plan_owner_API + a, successFunc, AlertDanger);
+}
+
+function eva_idp_plan_owner_SetCreateForm(s) {
+    eva_idp_plan_owner_editMode = "CREATE";
+	eva_idp_plan_owner_InitialForm(s);
+}
+
+function eva_idp_plan_owner_RefreshTable() {
+    // Incase model popup
+    eva_idp_plan_owner_DoSearch();
+
+    // Incase open new page
+    //window.parent.eva_idp_plan_owner_DoSearch();
+}
+
+//================= Update and Delete =========================================
+
+var eva_idp_plan_owner_customValidation = function (group) {
+    return "";
+};
+
+function eva_idp_plan_owner_PutUpdate() {
+	if (!ValidateForm('eva_idp_plan_owner', eva_idp_plan_owner_customValidation))
+    {
+        return;
+    }
+
+    var data = eva_idp_plan_owner_GetFromForm();
+
+    //Update Mode
+    if (eva_idp_plan_owner_editMode === "UPDATE") {
+        var successFunc1 = function (result) {
+            $("#eva_idp_plan_ownerModel").modal("hide");
+            AlertSuccess(result.code+" "+result.message);
+            eva_idp_plan_owner_RefreshTable();
+			endLoad();
+        };
+		startLoad();
+        AjaxPutRequest(apisite + eva_idp_plan_owner_API + data.id, data, successFunc1, AlertDanger);
+    }
+    // Create mode
+    else {
+        var successFunc2 = function (result) {
+            $("#eva_idp_plan_ownerModel").modal("hide");
+            AlertSuccess(result.code+" "+result.message);
+            eva_idp_plan_owner_RefreshTable();
+			endLoad();
+        };
+		startLoad();
+        AjaxPostRequest(apisite + eva_idp_plan_owner_API, data, successFunc2, AlertDanger);
+    }
+}
+
+function eva_idp_plan_owner_GoDelete(a) {
+    if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
+        var successFunc = function (result) {
+            $("#eva_idp_plan_ownerModel").modal("hide");
+            AlertSuccess(result.code+" "+result.message);
+            eva_idp_plan_owner_RefreshTable();
+			endLoad();
+        };
+		startLoad();
+        AjaxDeleteRequest(apisite + eva_idp_plan_owner_API + a, null, successFunc, AlertDanger);
+    }
+}
+
+//================= Data Table =========================================
+
+var eva_idp_plan_ownerTableV;
+
+var eva_idp_plan_owner_setupTable = function (result) {
+	tmp = '"';
+    eva_idp_plan_ownerTableV = $('#eva_idp_plan_ownerTable').DataTable({
+        "processing": true,
+        "serverSide": false,
+        "data": result,
+		"select": false,
+        "columns": [
+		{ "data": "id" },
+                { "data": "develop" },
+                { "data": "development_method" },
+                { "data": "txt_start_date" },
+                { "data": "txt_end_date" },            
+        ],
+        "columnDefs": [
+            {
+                "targets": 0,
+                "data": "id",
+                "render": function (data, type, row, meta) {
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_idp_plan_owner_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_idp_plan_owner_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
+                }
+            }],
+        "language": {
+            "url": appsite + "/DataTables-1.10.16/thai.json"
+        },
+        "paging": true,
+		"searching": false
+    });
+	endLoad();
+};
+
+function eva_idp_plan_owner_InitiateDataTable() {
+	startLoad();
+	var p = $.param(eva_idp_plan_owner_GetSearchParameter());
+console.log(apisite + "/api/eva_idp_plan_owner/GetListBySearch?"+p);
+    AjaxGetRequest(apisite + "/api/eva_idp_plan_owner/GetListBySearch?"+p, eva_idp_plan_owner_setupTable, AlertDanger);
+}
+
+function eva_idp_plan_owner_DoSearch() {
+    var p = $.param(eva_idp_plan_owner_GetSearchParameter());
+    var eva_idp_plan_owner_reload = function (result) {
+        eva_idp_plan_ownerTableV.destroy();
+        eva_idp_plan_owner_setupTable(result);
+		endLoad();
+    };
+	startLoad();
+    AjaxGetRequest(apisite + "/api/eva_idp_plan_owner/GetListBySearch?"+p, eva_idp_plan_owner_reload, AlertDanger);
+}
+
+function eva_idp_plan_owner_GetSelect(f) {
+    var eva_idp_plan_owner_selectitem = [];
+    $.each(eva_idp_plan_ownerTableV.rows('.selected').data(), function (key, value) {
+        eva_idp_plan_owner_selectitem.push(value[f]);
+    });
+    alert(eva_idp_plan_owner_selectitem);
+}
+
+//================= File Upload =========================================
+
+
+
+//================= Multi-Selection Function =========================================
+
+
+