รวมหน้าจอ วงเงินที่ใช้ในการเลื่อนเงินเดือน

ApiControllers/vw_limit_frame_planControllers.cs

@@ -0,0 +1,403 @@
+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;
+using System.Net;
+
+namespace TodoAPI2.Controllers
+{
+    //[Authorize]
+    [Produces("application/json")]
+    [Route("api/vw_limit_frame_plan")]
+    public class vw_limit_frame_planController : BaseController
+    {
+        #region Private Variables
+        private ILogger<vw_limit_frame_planController> _logger;
+        private Ivw_limit_frame_planService _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 vw_limit_frame_planController(ILogger<vw_limit_frame_planController> logger, Ivw_limit_frame_planService 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(vw_limit_frame_planWithSelectionViewModel), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult Get(Guid 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(vw_limit_frame_planWithSelectionViewModel), 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 executed_date
+        /// </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<vw_limit_frame_planViewModel>), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult GetList(DateTime? executed_date)
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                return Ok(_repository.GetListByexecuted_date(executed_date));
+            }
+            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<vw_limit_frame_planViewModel>), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult GetListBySearch(vw_limit_frame_planSearchModel 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>
+        /// Download Report
+        /// </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("vw_limit_frame_plan_report")]
+        [ProducesResponseType(typeof(FileStreamResult), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult vw_limit_frame_plan_report(vw_limit_frame_planReportRequestModel model)
+        {
+            try
+            {
+				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                var httpclient = new WebClient();
+                string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL");
+                string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite");
+                string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username");
+                string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password");
+
+                string url = $"{mainurl}{reportsite}/xxใส่ชื่อรายงานตรงนี้xx.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}";
+
+                if (model.filetype == "xlsx")
+                {
+                    url += "&ignorePagination=true";
+                }
+
+                var data = httpclient.DownloadData(url);
+                var stream = new MemoryStream(data);
+
+                return File(stream, model.contentType);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogCritical($"Exception while GetReport.", 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] vw_limit_frame_planInputModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    var result = _repository.Insert(model, true);
+					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(Guid id, [FromBody] vw_limit_frame_planInputModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    var result = _repository.Update(id, model, true);
+					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(Guid 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<vw_limit_frame_planInputModel> model)
+        {
+            if (ModelState.IsValid)
+            {
+				try
+				{
+					if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+					string rowCount = _repository.UpdateMultiple(model, true);
+					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);
+        }
+
+		/// <summary>
+        /// Refresh AutoField of all items
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <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("RefreshAutoField")]
+        [ProducesResponseType(typeof(CommonResponseMessage), 200)]
+        [ProducesResponseType(400)]
+        [ProducesResponseType(500)]
+        //[ValidateAntiForgeryToken]
+        public IActionResult RefreshAutoField()
+        {
+            if (ModelState.IsValid)
+            {
+                try
+                {
+                    //if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
+                    _repository.RefreshAutoFieldOfAllData();
+                    var message = new CommonResponseMessage();
+                    message.code = "200";
+                    message.message = $"ปรับปรุง Auto Field ของทุก record เรียบร้อย";
+                    message.data = null;
+                    return Ok(message);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogCritical($"Exception while RefreshAutoField.", ex);
+                    return StatusCode(500, $"มีปัญหาระหว่างการปรับปรุง Auto Field. {ex.Message}");
+                }
+            }
+
+            return BadRequest(ModelState);
+        }
+
+
+
+    }
+}

Migrations/25640304122731_AddTotalSalary.Designer.cs

@@ -0,0 +1,922 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using TTSW.EF;
+
+namespace tb320eva.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("25640304122731_AddTotalSalary")]
+    partial class AddTotalSalary
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_adjust_postponement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("adjust_postponement_id");
+
+                    b.HasIndex("adjust_postponement_quota_id");
+
+                    b.ToTable("eva_adjust_postponement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_create_evaluation");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_achievement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.ToTable("eva_evaluation_group_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("theTime");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_performance_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("list_no");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<string>("step")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_performance_plan_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_promoted_percentage");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("temporary_min");
+
+                    b.Property<decimal?>("themax");
+
+                    b.Property<decimal?>("themin");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_salary_cylinder");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_quota_id")
+                        .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Migrations/25640304122731_AddTotalSalary.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddTotalSalary : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "total_salary",
+                table: "eva_limit_frame_plan",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "total_salary",
+                table: "eva_limit_frame_plan");
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -694,6 +694,8 @@ namespace tb320eva.Migrations
                     b.Property<string>("supervisor1_result")
                         .HasMaxLength(1);
 
+                    b.Property<decimal?>("total_salary");
+
                     b.Property<DateTime>("updated");
 
                     b.HasKey("id");

Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs

@@ -126,7 +126,7 @@ namespace TodoAPI2.Models
                 && (!model.employee_id.HasValue || m_eva_limit_frame_employee.employee_id == model.employee_id)
 
 
-                orderby m_eva_limit_frame_employee.created descending
+                orderby m_eva_limit_frame_employee.order_of_data
                 select new eva_limit_frame_employeeViewModel()
                 {
                     id = m_eva_limit_frame_employee.id,

Models/eva_limit_frame_group/eva_limit_frame_groupService.cs

@@ -130,7 +130,7 @@ namespace TodoAPI2.Models
                     remark = m_eva_limit_frame_group.remark,
 
                     frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,
-                    group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.code,
+                    group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.thegroup,
 
                     isActive = m_eva_limit_frame_group.isActive,
                     Created = m_eva_limit_frame_group.created,

Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs

@@ -46,6 +46,8 @@ namespace TodoAPI2.Models
 
         public decimal? limit_frame_005_total_rounded { get; set; }
 
+        public decimal? total_salary { get; set; }
+
 
 		public void SetAutoField(DataContext context)
         {
@@ -54,7 +56,12 @@ namespace TodoAPI2.Models
 
 		public void DoAfterInsertUpdate(DataContext context)
         {
-            
+            total_salary = (from i in context.eva_limit_frame_employee
+                       join j in context.eva_limit_frame_group
+                       on i.frame_group_guid equals j.id
+                       select i.salary).Sum();
+            limit_frame_005_total = total_salary * limit_frame_005 / 100;
+            limit_frame_005_total_rounded = MyHelper.RoundOff(limit_frame_005_total.Value, 10);
         }
 
     }

Models/eva_limit_frame_plan/eva_limit_frame_planService.cs

@@ -161,49 +161,7 @@ namespace TodoAPI2.Models
             var entity = GetEntity(model);
             entity.id = Guid.NewGuid();
 
-            var all_group = (from i in _repository.Context.eva_evaluation_group
-                             select i);
-            foreach(var x in all_group)
-            {
-                var all_emp = (from j in _repository.Context.eva_evaluation_group_detail
-                               join k in emp.GetAllEmployee() on j.employee_id equals k.id
-                               join m in ext.GetSortingDep() on k.department_id equals m.external_id
-                               where j.evaluation_group_id == x.id
-                               orderby m.external_code,
-                                   k.hpt_position_type_id,
-                                    k.hpl_position_level_id,
-                                    k.employee_no
-                               select k);
             
-                var new_frame_group = new eva_limit_frame_groupEntity();
-                new_frame_group.id = Guid.NewGuid();
-                new_frame_group.frame_plan_guid = entity.id;
-                new_frame_group.group_guid = x.id;
-                new_frame_group.limit_frame_295 = (decimal?)2.95;
-                new_frame_group.total_salary = all_emp.Sum(z => z.salary);
-                new_frame_group.total_salary_limit = (new_frame_group.total_salary * new_frame_group.limit_frame_295 / 100);
-                new_frame_group.total_salary_limit_rounded = new_frame_group.total_salary_limit;
-                _repository.Context.Add(new_frame_group);
-
-                int i = 1;
-                foreach (var y in all_emp)
-                {
-                    var new_emp = new eva_limit_frame_employeeEntity();
-                    new_emp.id = Guid.NewGuid();
-                    new_emp.frame_group_guid = new_frame_group.id;
-                    new_emp.employee_id = y.id;
-                    new_emp.org_id = y.department_id;
-                    new_emp.position_text = y.position_name;
-                    new_emp.level_text = y.position_level_text;
-                    new_emp.salary = y.salary;
-                    new_emp.position_allowance = y.position_allowance;
-                    new_emp.monthly_remuneration = y.other_money;
-                    new_emp.cost_of_living = y.cost_of_living;
-                    new_emp.order_of_data = i;
-                    i++;
-                    _repository.Context.Add(new_emp);
-                }
-            }
 
             entity.SetAutoField(_repository.Context);
 
@@ -322,18 +280,7 @@ namespace TodoAPI2.Models
         }
         public void Delete(Guid id)
         {
-            var all_group = (from i in _repository.Context.eva_limit_frame_group
-                             where i.frame_plan_guid == id
-                             select i);
-            foreach (var x in all_group)
-            {
-                var all_emp = from i in _repository.Context.eva_limit_frame_employee
-                              where i.frame_group_guid == x.id
-                              select i;
-                _repository.Context.RemoveRange(all_emp);
-            }
             
-            _repository.Context.RemoveRange(all_group);
 
             _repository.Delete(id);
 

Models/vw_limit_frame_plan/Ivw_limit_frame_planService.cs

@@ -0,0 +1,32 @@
+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 Ivw_limit_frame_planService : IBaseService2<Guid, vw_limit_frame_planInputModel, vw_limit_frame_planViewModel>
+    {
+        new vw_limit_frame_planViewModel Insert(vw_limit_frame_planInputModel model, bool is_force_save);
+        new vw_limit_frame_planViewModel Update(Guid id, vw_limit_frame_planInputModel model, bool is_force_save);
+        List<vw_limit_frame_planViewModel> GetListByexecuted_date(DateTime? executed_date);
+		List<vw_limit_frame_planViewModel> GetListBySearch(vw_limit_frame_planSearchModel model);
+
+		string UpdateMultiple(List<vw_limit_frame_planInputModel> model, bool is_force_save);
+        vw_limit_frame_planWithSelectionViewModel GetWithSelection(Guid id);
+		vw_limit_frame_planWithSelectionViewModel GetBlankItem();
+
+		void RefreshAutoFieldOfAllData();
+		eva_limit_frame_planEntity GetEntity(Guid id);
+        DataContext GetContext();
+
+
+
+    }
+}
+

Models/vw_limit_frame_plan/vw_limit_frame_planInputModel.cs

@@ -0,0 +1,36 @@
+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 vw_limit_frame_planInputModel
+    {
+
+        public Guid? id { get; set; }
+
+        public Guid? plan_guid { get; set; }
+
+        public DateTime? executed_date { get; set; }
+
+        public decimal? limit_frame_005 { get; set; }
+
+        public DateTime? salary_adjustment_date { get; set; }
+
+        public decimal? total_salary { get; set; }
+
+        public decimal? limit_frame_005_total { get; set; }
+
+        public decimal? limit_frame_005_total_rounded { get; set; }
+
+        public string active_mode { get; set; }
+    }
+}
+

Models/vw_limit_frame_plan/vw_limit_frame_planReportRequestModel.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 vw_limit_frame_planReportRequestModel : vw_limit_frame_planSearchModel
+    {
+	    public string filetype { get; set; }
+
+        public string contentType { get { return MyHelper.GetContentType(filetype); } }
+    }
+}
+

Models/vw_limit_frame_plan/vw_limit_frame_planSearchModel.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 vw_limit_frame_planSearchModel
+    {
+
+        public Guid id { get; set; }
+
+        public DateTime? executed_date { get; set; }
+
+    }
+}
+

Models/vw_limit_frame_plan/vw_limit_frame_planService.cs

@@ -0,0 +1,363 @@
+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 vw_limit_frame_planService : Ivw_limit_frame_planService
+    {
+        private IBaseRepository2<eva_limit_frame_planEntity, Guid> _repository;
+        private IMyDatabase db;
+        private Iexternal_linkageService ext;
+        private Iexternal_employeeService emp;
+
+        public vw_limit_frame_planService(IBaseRepository2<eva_limit_frame_planEntity, Guid> repository, IMyDatabase mydb,
+            Iexternal_linkageService inext, Iexternal_employeeService inemp)
+        {
+            _repository = repository;
+            db = mydb;
+            ext = inext;
+            emp = inemp;
+        }
+
+        #region Private Functions
+        private eva_limit_frame_planEntity GetEntity(vw_limit_frame_planInputModel model)
+        {
+            return Mapper.Map<eva_limit_frame_planEntity>(model);
+        }
+        private List<eva_limit_frame_planEntity> GetEntityList(List<vw_limit_frame_planInputModel> models)
+        {
+            return Mapper.Map<List<eva_limit_frame_planEntity>>(models);
+        }
+        private vw_limit_frame_planViewModel GetDto(eva_limit_frame_planEntity entity)
+        {
+            return Mapper.Map<vw_limit_frame_planViewModel>(entity);
+        }
+        private List<vw_limit_frame_planViewModel> GetDtoList(List<eva_limit_frame_planEntity> entities)
+        {
+            return Mapper.Map<List<vw_limit_frame_planViewModel>>(entities);
+        }
+
+        #endregion
+
+        #region Public Functions
+        #region Query Functions
+
+        public vw_limit_frame_planViewModel Get(Guid id)
+        {
+            var entity = _repository.Get(id);
+
+            return GetDto(entity);
+        }
+
+        public eva_limit_frame_planEntity GetEntity(Guid id)
+        {
+            var entity = _repository.Get(id);
+
+            return entity;
+        }
+
+        public DataContext GetContext()
+        {
+            return _repository.Context;
+        }
+
+        public vw_limit_frame_planWithSelectionViewModel GetWithSelection(Guid id)
+        {
+            var entity = _repository.Get(id);
+            var i = Mapper.Map<vw_limit_frame_planWithSelectionViewModel>(entity);
+            i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
+
+
+            return i;
+        }
+        public vw_limit_frame_planWithSelectionViewModel GetBlankItem()
+        {
+            var i = new vw_limit_frame_planWithSelectionViewModel();
+            i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
+
+
+            return i;
+        }
+
+        public List<vw_limit_frame_planViewModel> GetListByexecuted_date(DateTime? executed_date)
+        {
+            var model = new vw_limit_frame_planSearchModel();
+            model.executed_date = executed_date;
+            return GetListBySearch(model);
+        }
+
+        public List<vw_limit_frame_planViewModel> GetListBySearch(vw_limit_frame_planSearchModel model)
+        {
+            var data = (
+                from m_vw_limit_frame_plan in _repository.Context.eva_limit_frame_plan
+
+                join fk_eva_performance_plan1 in _repository.Context.eva_performance_plan on m_vw_limit_frame_plan.plan_guid equals fk_eva_performance_plan1.id
+                into eva_performance_planResult1
+                from fk_eva_performance_planResult1 in eva_performance_planResult1.DefaultIfEmpty()
+
+
+                where
+                1 == 1
+                && (!model.executed_date.HasValue || m_vw_limit_frame_plan.executed_date == model.executed_date)
+
+
+                orderby m_vw_limit_frame_plan.created descending
+                select new vw_limit_frame_planViewModel()
+                {
+                    id = m_vw_limit_frame_plan.id,
+                    plan_guid = m_vw_limit_frame_plan.plan_guid,
+                    executed_date = m_vw_limit_frame_plan.executed_date,
+                    limit_frame_005 = m_vw_limit_frame_plan.limit_frame_005,
+                    salary_adjustment_date = m_vw_limit_frame_plan.salary_adjustment_date,
+                    total_salary = m_vw_limit_frame_plan.total_salary,
+                    limit_frame_005_total = m_vw_limit_frame_plan.limit_frame_005_total,
+                    limit_frame_005_total_rounded = m_vw_limit_frame_plan.limit_frame_005_total_rounded,
+
+                    plan_guid_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text,
+
+                    isActive = m_vw_limit_frame_plan.isActive,
+                    Created = m_vw_limit_frame_plan.created,
+                    Updated = m_vw_limit_frame_plan.updated
+                }
+            ).Take(1000).ToList();
+
+            return data;
+        }
+
+        #endregion
+
+        #region Manipulation Functions
+
+
+
+        public vw_limit_frame_planViewModel Insert(vw_limit_frame_planInputModel model, bool is_force_save)
+        {
+            var entity = GetEntity(model);
+            entity.id = Guid.NewGuid();
+            entity.limit_frame_005 = (decimal?)0.05;
+
+            var all_group = (from i in _repository.Context.eva_evaluation_group
+                             select i);
+            foreach (var x in all_group)
+            {
+                var all_emp = (from j in _repository.Context.eva_evaluation_group_detail
+                               join k in emp.GetAllEmployee() on j.employee_id equals k.id
+                               join m in ext.GetSortingDep() on k.department_id equals m.external_id
+                               where j.evaluation_group_id == x.id
+                               orderby m.external_code,
+                                   k.hpt_position_type_id,
+                                    k.hpl_position_level_id,
+                                    k.employee_no
+                               select k);
+
+                var new_frame_group = new eva_limit_frame_groupEntity();
+                new_frame_group.id = Guid.NewGuid();
+                new_frame_group.frame_plan_guid = entity.id;
+                new_frame_group.group_guid = x.id;
+                new_frame_group.limit_frame_295 = (decimal?)2.95;
+                new_frame_group.total_salary = all_emp.Sum(z => z.salary);
+                new_frame_group.total_salary_limit = (new_frame_group.total_salary * new_frame_group.limit_frame_295 / 100);
+                new_frame_group.total_salary_limit_rounded = MyHelper.RoundOff(new_frame_group.total_salary_limit.Value, 10);
+                _repository.Context.Add(new_frame_group);
+
+                int i = 1;
+                foreach (var y in all_emp)
+                {
+                    var new_emp = new eva_limit_frame_employeeEntity();
+                    new_emp.id = Guid.NewGuid();
+                    new_emp.frame_group_guid = new_frame_group.id;
+                    new_emp.employee_id = y.id;
+                    new_emp.org_id = y.department_id;
+                    new_emp.position_text = y.position_name;
+                    new_emp.level_text = y.position_level_text;
+                    new_emp.salary = y.salary;
+                    new_emp.position_allowance = y.position_allowance;
+                    new_emp.monthly_remuneration = y.other_money;
+                    new_emp.cost_of_living = y.cost_of_living;
+                    new_emp.order_of_data = i;
+                    i++;
+                    _repository.Context.Add(new_emp);
+                }
+            }
+
+            entity.SetAutoField(_repository.Context);
+
+            if (is_force_save)
+            {
+                var inserted = _repository.Insert(entity);
+                entity.DoAfterInsertUpdate(_repository.Context);
+                _repository.Context.SaveChanges();
+                return Get(inserted.id);
+            }
+            else
+            {
+                _repository.InsertWithoutCommit(entity);
+                entity.DoAfterInsertUpdate(_repository.Context);
+                return Mapper.Map<vw_limit_frame_planViewModel>(entity);
+            }
+        }
+
+        public vw_limit_frame_planViewModel Update(Guid id, vw_limit_frame_planInputModel model, bool is_force_save)
+        {
+            var existingEntity = _repository.Get(id);
+            if (existingEntity != null)
+            {
+                existingEntity.plan_guid = model.plan_guid;
+                existingEntity.executed_date = model.executed_date;
+                existingEntity.limit_frame_005 = model.limit_frame_005;
+                existingEntity.salary_adjustment_date = model.salary_adjustment_date;
+                existingEntity.total_salary = model.total_salary;
+                existingEntity.limit_frame_005_total = model.limit_frame_005_total;
+                existingEntity.limit_frame_005_total_rounded = model.limit_frame_005_total_rounded;
+
+                existingEntity.SetAutoField(_repository.Context);
+
+                if (is_force_save)
+                {
+                    var updated = _repository.Update(id, existingEntity);
+                    existingEntity.DoAfterInsertUpdate(_repository.Context);
+                    _repository.Context.SaveChanges();
+                    return Get(updated.id);
+                }
+                else
+                {
+                    _repository.UpdateWithoutCommit(id, existingEntity);
+                    existingEntity.DoAfterInsertUpdate(_repository.Context);
+                    return Mapper.Map<vw_limit_frame_planViewModel>(existingEntity);
+                }
+            }
+            else
+                throw new NotificationException("No data to update");
+        }
+
+        public string UpdateMultiple(List<vw_limit_frame_planInputModel> model, bool is_force_save)
+        {
+            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.plan_guid = i.plan_guid;
+                        existingEntity.executed_date = i.executed_date;
+                        existingEntity.limit_frame_005 = i.limit_frame_005;
+                        existingEntity.salary_adjustment_date = i.salary_adjustment_date;
+                        existingEntity.total_salary = i.total_salary;
+                        existingEntity.limit_frame_005_total = i.limit_frame_005_total;
+                        existingEntity.limit_frame_005_total_rounded = i.limit_frame_005_total_rounded;
+
+                        existingEntity.SetAutoField(_repository.Context);
+                        _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
+                    }
+                }
+                else if (i.active_mode == "1" && !i.id.HasValue) // add
+                {
+                    var entity = GetEntity(i);
+                    entity.id = Guid.NewGuid();
+                    entity.SetAutoField(_repository.Context);
+                    _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
+                }
+            }
+            if (is_force_save)
+            {
+                _repository.Context.SaveChanges();
+            }
+
+            return model.Count().ToString();
+        }
+
+        public vw_limit_frame_planViewModel SetAsActive(Guid id)
+        {
+            var updated = _repository.SetAsActive(id);
+
+            return Get(updated.id);
+        }
+        public vw_limit_frame_planViewModel SetAsInactive(Guid id)
+        {
+            var updated = _repository.SetAsInActive(id);
+
+            return Get(updated.id);
+        }
+        public void Delete(Guid id)
+        {
+            var all_group = (from i in _repository.Context.eva_limit_frame_group
+                             where i.frame_plan_guid == id
+                             select i);
+            foreach (var x in all_group)
+            {
+                var all_emp = from i in _repository.Context.eva_limit_frame_employee
+                              where i.frame_group_guid == x.id
+                              select i;
+                _repository.Context.RemoveRange(all_emp);
+            }
+
+            _repository.Context.RemoveRange(all_group);
+
+            _repository.Delete(id);
+
+            return;
+        }
+
+        public void RefreshAutoFieldOfAllData()
+        {
+            var all_items = from i in _repository.Context.eva_limit_frame_plan
+                            select i;
+            foreach (var item in all_items)
+            {
+                item.SetAutoField(_repository.Context);
+            }
+            _repository.Context.SaveChanges();
+        }
+
+        private Dictionary<string, string> GetLookupForLog()
+        {
+            var i = new Dictionary<string, string>();
+
+
+            i.Add("plan_guid", "แผนการประเมิน");
+            i.Add("plan_guid_eva_performance_plan_fiscal_year", "แผนการประเมิน");
+            i.Add("executed_date", "วันที่ตั้งกรอบวงเงิน");
+            i.Add("txt_executed_date", "วันที่ตั้งกรอบวงเงิน");
+            i.Add("limit_frame_005", "กรอบวงเงินที่กันไว้");
+            i.Add("salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
+            i.Add("txt_salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
+            i.Add("total_salary", "รวมอัตราเงินเดือน");
+            i.Add("limit_frame_005_total", "กันวงเงินไว้");
+            i.Add("limit_frame_005_total_rounded", "กันวงเงินใช้จริง");
+
+            return i;
+        }
+
+        #endregion
+
+        #region Match Item
+
+        #endregion
+
+        #endregion
+    }
+}
+

Models/vw_limit_frame_plan/vw_limit_frame_planViewModel.cs

@@ -0,0 +1,38 @@
+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 vw_limit_frame_planViewModel : BaseViewModel2<Guid>
+    {
+
+        public Guid? plan_guid { get; set; }
+
+        public DateTime? executed_date { get; set; }
+
+        public string txt_executed_date { get { return MyHelper.GetDateStringForReport(this.executed_date); } }
+
+        public decimal? limit_frame_005 { get; set; }
+
+        public DateTime? salary_adjustment_date { get; set; }
+
+        public string txt_salary_adjustment_date { get { return MyHelper.GetDateStringForReport(this.salary_adjustment_date); } }
+
+        public decimal? total_salary { get; set; }
+
+        public decimal? limit_frame_005_total { get; set; }
+
+        public decimal? limit_frame_005_total_rounded { get; set; }
+
+        public string plan_guid_eva_performance_plan_fiscal_year { get; set; }
+
+    }
+}

Models/vw_limit_frame_plan/vw_limit_frame_planWithSelectionViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TodoAPI2.Models
+{
+    public class vw_limit_frame_planWithSelectionViewModel: vw_limit_frame_planViewModel
+    {
+        public List<eva_performance_planEntity> item_plan_guid { get; set; }
+
+    }
+}

Startup.cs

@@ -323,6 +323,8 @@ namespace Test01
 
             services.AddScoped<Irep_eva_limit_frame_planService, rep_eva_limit_frame_planService>();
 
+            services.AddScoped<Ivw_limit_frame_planService, vw_limit_frame_planService>();
+
             #endregion
 
             services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -598,6 +600,10 @@ namespace Test01
                 cfg.CreateMap<eva_limit_frame_groupEntity, rep_eva_limit_frame_planViewModel>();
                 cfg.CreateMap<eva_limit_frame_groupEntity, rep_eva_limit_frame_planWithSelectionViewModel>();
 
+                cfg.CreateMap<vw_limit_frame_planInputModel, eva_limit_frame_planEntity>();
+                cfg.CreateMap<eva_limit_frame_planEntity, vw_limit_frame_planViewModel>();
+                cfg.CreateMap<eva_limit_frame_planEntity, vw_limit_frame_planWithSelectionViewModel>();
+
             });
             #endregion
 

Utils/MyHelper.cs

@@ -331,4 +331,9 @@ public class MyHelper
         string var = !string.IsNullOrEmpty(env_var) ? env_var : Configuration[variable];
         return var;
     }
+
+    public static decimal RoundOff(decimal i, decimal round_number)
+    {
+        return (Math.Round(i / round_number)) * round_number;
+    }
 }

ViewControllers/vw_limit_frame_planViewControllers.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using TodoAPI2.Models;
+using STAFF_API.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using TodoAPI2.Controllers;
+
+namespace TodoAPI2.Controllers
+{
+    public class vw_limit_frame_planViewController : Controller
+    {       
+        private ILogger<vw_limit_frame_planController> _logger;
+        private Ivw_limit_frame_planService _repository;
+		private IConfiguration Configuration { get; set; }
+		
+        /// <summary>
+        /// Default constructure for dependency injection
+        /// </summary>
+        /// <param name="repository"></param>
+		/// <param name="configuration"></param>
+        /// <param name="logger"></param>
+        public vw_limit_frame_planViewController(ILogger<vw_limit_frame_planController> logger, Ivw_limit_frame_planService repository, IConfiguration configuration)
+        {
+            _logger = logger;
+            _repository = repository;
+			Configuration = configuration;
+        }
+
+        public IActionResult vw_limit_frame_plan()
+        {
+			if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView
+            return View();
+        }
+
+        public IActionResult vw_limit_frame_plan_d()
+        {
+			if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView
+            return View();
+        }
+
+		//public IActionResult vw_limit_frame_plan_report()
+        //{
+		//    if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView
+        //    return View();
+        //}
+
+        //public IActionResult vw_limit_frame_plan_inline()
+        //{
+		//    if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); // Or UnauthorizedView
+        //    return View();
+        //}
+
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+        }
+    }
+}
+
+

Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml

@@ -17,60 +17,60 @@
                 <div class="row">
                     <div class="col-md-12">
 
-<input class="form-control" type="hidden" id="eva_limit_frame_employee_id" />
-<input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
+                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_id" />
+                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
 
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-	    <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-    </div>
+                        <div class='row'></div>
+                        <div class='row'></div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
+                                <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="eva_limit_frame_employee"></select>
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-	    <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
+                                <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee"></select>
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
-	    <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
+                                <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
-	    <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
+                                <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
-    </div>
-</div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
 
 
                     </div>
@@ -100,45 +100,45 @@
 </div>
 
 <section class="wrapper">
-	<div class="title"><div class="line"></div>ค้นหา eva_limit_frame_employee</div>
-	<div class="tools">
-		<div class="row">
+    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_employee</div>
+    <div class="tools">
+        <div class="row">
 
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
-                            <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
-                        </div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
+                <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
+            </div>
 
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
-                            <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>
-                        </div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
+                <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>
+            </div>
 
-			<div class="col-md-6">
-				<button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch();">ค้นหา</button>
-				<button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-				<button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GetSelect('id');">ดึงตัวเลือก</button>
-			</div>
+            <div class="col-md-6">
+                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch();">ค้นหา</button>
+                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GetSelect('id');">ดึงตัวเลือก</button>
+            </div>
 
-		</div>
-	</div>
+        </div>
+    </div>
 
-	<table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
+    <table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
         <thead>
             <tr>
-				<!--<th>เลือก</th>-->
-				<th>เครื่องมือ</th>
-            <th><label id='h_eva_limit_frame_employee_id'>id</label></th>
-            <th><label id='h_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label></th>
-            <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
-            <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-            <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
-            <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
-            <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
-            <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
-            <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
-            <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
-            <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_limit_frame_employee_id'>id</label></th>
+                <th><label id='h_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label></th>
+                <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
+                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
+                <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
+                <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
+                <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
+                <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
+                <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
+                <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
+                <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
 
             </tr>
         </thead>
@@ -147,13 +147,13 @@
 </section>
 
 @section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee.js"></script>
-<script>
-    $(document).ready(function () {
-        eva_limit_frame_employee_InitiateDataTable();
-        eva_limit_frame_employee_InitialForm();
-        SetupValidationRemark("eva_limit_frame_employee");
-    });
-</script>
+    <script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee.js"></script>
+    <script>
+        $(document).ready(function () {
+            eva_limit_frame_employee_InitiateDataTable();
+            eva_limit_frame_employee_InitialForm();
+            SetupValidationRemark("eva_limit_frame_employee");
+        });
+    </script>
 }
 

Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml

@@ -17,44 +17,44 @@
                 <div class="row">
                     <div class="col-md-12">
 
-<input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
-<input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
+                        <input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
+                        <input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
 
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
-	    <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_limit_frame_group" ></select>
-    </div>
+                        <div class='row'></div>
+                        <div class='row'></div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
+                                <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_limit_frame_group"></select>
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_group" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="true" iGroup="eva_limit_frame_group" />
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="true" iGroup="eva_limit_frame_group" />
+                            </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-12">
-	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
-	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
-    </div>
-</div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-12">
+                                <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
+                                <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group"></textarea>
+                            </div>
+                        </div>
 
 
                     </div>
@@ -84,42 +84,42 @@
 </div>
 
 <section class="wrapper">
-	<div class="title"><div class="line"></div>ค้นหา eva_limit_frame_group</div>
-	<div class="tools">
-		<div class="row">
+    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_group</div>
+    <div class="tools">
+        <div class="row">
 
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_group_frame_plan_guid' for='s_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label>
-                            <input class="form-control" type="hidden" id="s_eva_limit_frame_group_frame_plan_guid" />
-                        </div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_limit_frame_group_frame_plan_guid' for='s_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label>
+                <input class="form-control" type="hidden" id="s_eva_limit_frame_group_frame_plan_guid" />
+            </div>
 
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_limit_frame_group_group_guid' for='s_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label>
-                            <select class="form-control" id="s_eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="s_eva_limit_frame_group" title='กลุ่มการประเมิน' placeholder='กลุ่มการประเมิน'></select>
-                        </div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_limit_frame_group_group_guid' for='s_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label>
+                <select class="form-control" id="s_eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="s_eva_limit_frame_group" title='กลุ่มการประเมิน' placeholder='กลุ่มการประเมิน'></select>
+            </div>
 
-			<div class="col-md-6">
-				<button class="btn btn-info" onclick="javascript:eva_limit_frame_group_DoSearch();">ค้นหา</button>
-				<button class="btn btn-info" onclick="javascript:eva_limit_frame_group_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-				<button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_group_GetSelect('id');">ดึงตัวเลือก</button>
-			</div>
+            <div class="col-md-6">
+                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_DoSearch();">ค้นหา</button>
+                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_group_GetSelect('id');">ดึงตัวเลือก</button>
+            </div>
 
-		</div>
-	</div>
+        </div>
+    </div>
 
-	<table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
+    <table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
         <thead>
             <tr>
-				<!--<th>เลือก</th>-->
-				<th>เครื่องมือ</th>
-            <th><label id='h_eva_limit_frame_group_id'>รหัสอ้างอิง</label></th>
-            <th><label id='h_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label></th>
-            <th><label id='h_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label></th>
-            <th><label id='h_eva_limit_frame_group_limit_frame_295'>กรอบวงเงินที่กันไว้</label></th>
-            <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
-            <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
-            <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
-            <th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_limit_frame_group_id'>รหัสอ้างอิง</label></th>
+                <th><label id='h_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label></th>
+                <th><label id='h_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label></th>
+                <th><label id='h_eva_limit_frame_group_limit_frame_295'>กรอบวงเงินที่กันไว้</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
+                <th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
 
             </tr>
         </thead>
@@ -128,13 +128,13 @@
 </section>
 
 @section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_group/eva_limit_frame_group.js"></script>
-<script>
-    $(document).ready(function () {
-        eva_limit_frame_group_InitiateDataTable();
-        eva_limit_frame_group_InitialForm();
-        SetupValidationRemark("eva_limit_frame_group");
-    });
-</script>
+    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group.js"></script>
+    <script>
+        $(document).ready(function () {
+            eva_limit_frame_group_InitiateDataTable();
+            eva_limit_frame_group_InitialForm();
+            SetupValidationRemark("eva_limit_frame_group");
+        });
+    </script>
 }
 

Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml

@@ -2,9 +2,89 @@
 @inject IConfiguration Configuration
 @{
     ViewData["Title"] = "eva_limit_frame_group";
-	Layout = "_LayoutDirect";
+    Layout = "_LayoutDirect";
 }
 
+
+<div class="modal fade" id="eva_limit_frame_employeeModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_employeeModelLabel" 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_limit_frame_employeeModelLabel">บันทึกข้อมูล พนักงาน</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_limit_frame_employee_id" />
+                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
+
+
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
+                                <select disabled class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                            </div>
+
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
+                                <select disabled class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
+                            </div>
+
+
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
+                                <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
+                                <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </div>
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
+                                <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="false" iGroup="eva_limit_frame_employee" />
+                            </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_limit_frame_employee_PutUpdate()">บันทึก</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="row page-title">
     <div class="col-md-5">
         <div class="page-title">
@@ -15,89 +95,115 @@
         <ol class="breadcrumb" style="">
             <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
             <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">eva_limit_frame_group</li>
+            <li class="breadcrumb-item active">วงเงินที่ใช้ในการเลื่อนเงินเดือนของแต่ละกอง/ส่วนงาน</li>
         </ol>
     </div>
 </div>
 
 <section class="wrapper">
-	<div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_group</div>
+    <div class="title col-md-12"><div class="line"></div>วงเงินที่ใช้ในการเลื่อนเงินเดือนของแต่ละกอง/ส่วนงาน</div>
 
     <section class="card no-border">
-            <header class="card-header">
-            กรุณากรอกข้อมูลลงในแบบฟอร์ม
-        </header>
         <div class="card-body" style="">
 
-			<div class="row">
-				<div class="col-md-12">
+            <div class="row">
+                <div class="col-md-12">
 
-	<input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
-<input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
+                    <input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
+                    <input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
 
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
-	    <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_limit_frame_group" ></select>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
+                            <select disabled class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="false" iGroup="eva_limit_frame_group"></select>
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
+                            <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_group" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
+                            <input disabled class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="false" iGroup="eva_limit_frame_group" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
+                            <input disabled class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="false" iGroup="eva_limit_frame_group" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
+                            <input disabled class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="false" iGroup="eva_limit_frame_group" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-12">
+                            <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
+                            <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class="row">
+        <div class="form-group col-md-12">
+            <button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
+            <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_PutUpdate()">บันทึก</button>
+        </div>
     </div>
 
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-
-    <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
-	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-12">
-	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
-	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
-    </div>
-</div>
-
-
-				</div>
-			</div>
-		</div>
-	</section>
-
-	<div class="row">
-		<div class="form-group col-md-12">
-			<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
-			<button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_PutUpdate()">บันทึก</button>
-		</div>
-	</div>
-
+</section>
+
+<br />
+
+<section class="wrapper">
+    <div class="title"><div class="line"></div>รายชื่อพนักงานและอัตราเงินเดือน ณ กำหนดกรอบวงเงิน</div>
+    <table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
+        <thead>
+            <tr>
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
+                <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
+                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
+                <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
+                <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
+                <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
+                <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
+                <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
+                <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
+
+
+            </tr>
+        </thead>
+        <tbody></tbody>
+    </table>
 </section>
 
 @section FooterPlaceHolder{
-<script src="~/js/eva_limit_frame_group/eva_limit_frame_group_d.js"></script>
-<script>
-    $(document).ready(function () {
-        var id = getUrlParameter("id");
-        if (id) {
-            eva_limit_frame_group_SetEditForm(id);
-        } else {
-            eva_limit_frame_group_SetCreateForm();
-        }
-        SetupValidationRemark("eva_limit_frame_group");
-    });
-</script>
+    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group_d.js"></script>
+    <script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee.js"></script>
+    <script>
+        $(document).ready(function () {
+            var id = getUrlParameter("id");
+            if (id) {
+                eva_limit_frame_group_SetEditForm(id);
+                eva_limit_frame_employee_InitiateDataTable();
+                eva_limit_frame_employee_InitialForm();
+
+            } else {
+                eva_limit_frame_group_SetCreateForm();
+            }
+            SetupValidationRemark("eva_limit_frame_group");
+            SetupValidationRemark("eva_limit_frame_employee");
+        });
+    </script>
 }
 

Views/home/index2.cshtml

@@ -31,7 +31,7 @@
                             <li><a href="~/eva_performance_planView/eva_performance_plan"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>กำหนดแผนการประเมินเพื่อปรับเลื่อนเงินเดือน</div></a>
                         </ul>
                         <ul>
-                            <li><a href="~/eva_limit_frame_planView/eva_limit_frame_plan"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>กำหนดกรอบวงเงิน</div></a>
+                            <li><a href="~/vw_limit_frame_planView/vw_limit_frame_plan"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>กำหนดกรอบวงเงิน</div></a>
                         </ul>
                         <ul>
                             <li><a href="~/eva_level_score_basicView/eva_level_score_basic"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>กำหนดระดับผลการประเมิน</div></a>

Views/vw_limit_frame_planView/vw_limit_frame_plan.cshtml

@@ -0,0 +1,108 @@
+@using Microsoft.Extensions.Configuration
+@inject IConfiguration Configuration
+@{
+    ViewData["Title"] = "vw_limit_frame_plan";
+}
+
+<div class="modal fade" id="vw_limit_frame_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="vw_limit_frame_planModelLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="vw_limit_frame_planModelLabel">เพิ่มข้อมูล วงเงินที่ใช้ในการเลื่อนเงินเดือน</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="vw_limit_frame_plan_id" />
+
+
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_vw_limit_frame_plan_plan_guid" for="vw_limit_frame_plan_plan_guid">แผนการประเมิน</label>
+                                <select class="form-control" id="vw_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="false" iGroup="vw_limit_frame_plan"></select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label id="lab_vw_limit_frame_plan_executed_date" for="vw_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
+                                <input class="form-control" type="text" id="vw_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <label id="lab_vw_limit_frame_plan_salary_adjustment_date" for="vw_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
+                                <input class="form-control" type="text" id="vw_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="false" iGroup="vw_limit_frame_plan" />
+                            </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:vw_limit_frame_plan_PutUpdate()">บันทึก</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="row page-title">
+    <div class="col-md-5">
+        <div class="page-title">
+            @Configuration["SiteInformation:modulename"]
+        </div>
+    </div>
+    <div class="col-md-7">
+        <ol class="breadcrumb" style="">
+            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
+            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
+            <li class="breadcrumb-item active">วงเงินที่ใช้ในการเลื่อนเงินเดือน</li>
+        </ol>
+    </div>
+</div>
+
+<section class="wrapper">
+    <div class="title"><div class="line"></div>วงเงินที่ใช้ในการเลื่อนเงินเดือน</div>
+    <div class="tools">
+        <div class="row">
+
+            <div class="col-md-6">
+                <button class="btn btn-info" onclick="javascript:vw_limit_frame_plan_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+                <button style="display:none;" class="btn btn-info" onclick="javascript:vw_limit_frame_plan_GetSelect('id');">ดึงตัวเลือก</button>
+            </div>
+
+        </div>
+    </div>
+
+    <table id="vw_limit_frame_planTable" class="display table table-bordered table-striped">
+        <thead>
+            <tr>
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_vw_limit_frame_plan_plan_guid'>แผนการประเมิน</label></th>
+                <th><label id='h_vw_limit_frame_plan_executed_date'>วันที่ตั้งกรอบวงเงิน</label></th>
+                <th><label id='h_vw_limit_frame_plan_limit_frame_005'>กรอบวงเงินที่กันไว้</label></th>
+                <th><label id='h_vw_limit_frame_plan_salary_adjustment_date'>เลื่อนเงินเดือนวันที่</label></th>
+                <th><label id='h_vw_limit_frame_plan_total_salary'>รวมอัตราเงินเดือน</label></th>
+                <th><label id='h_vw_limit_frame_plan_limit_frame_005_total'>กันวงเงินไว้</label></th>
+                <th><label id='h_vw_limit_frame_plan_limit_frame_005_total_rounded'>กันวงเงินใช้จริง</label></th>
+
+            </tr>
+        </thead>
+        <tbody></tbody>
+    </table>
+</section>
+
+@section FooterPlaceHolder{
+    <script src="~/js/vw_limit_frame_plan/vw_limit_frame_plan.js"></script>
+    <script>
+        $(document).ready(function () {
+            vw_limit_frame_plan_InitiateDataTable();
+            vw_limit_frame_plan_InitialForm();
+            SetupValidationRemark("vw_limit_frame_plan");
+        });
+    </script>
+}
+

Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml

@@ -0,0 +1,155 @@
+@using Microsoft.Extensions.Configuration
+@inject IConfiguration Configuration
+@{
+    ViewData["Title"] = "vw_limit_frame_plan";
+    Layout = "_LayoutDirect";
+}
+
+<div class="modal fade" id="report_xModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="report_xModelLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="report_xModelLabel">พิมพ์วงเงินที่ใช้ในการเลื่อนเงินเดือนของพนักงาน</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">
+                        <iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ปิด</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<div class="row page-title">
+    <div class="col-md-5">
+        <div class="page-title">
+            @Configuration["SiteInformation:modulename"]
+        </div>
+    </div>
+    <div class="col-md-7">
+        <ol class="breadcrumb" style="">
+            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
+            <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
+            <li class="breadcrumb-item active">วงเงินที่ใช้ในการเลื่อนเงินเดือน</li>
+        </ol>
+    </div>
+</div>
+
+<section class="wrapper">
+    <div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล วงเงินที่ใช้ในการเลื่อนเงินเดือน</div>
+
+    <section class="card no-border">
+        <div class="card-body" style="">
+
+            <div class="row">
+                <div class="col-md-12">
+
+                    <input class="form-control" type="hidden" id="vw_limit_frame_plan_id" />
+
+
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_plan_guid" for="vw_limit_frame_plan_plan_guid">แผนการประเมิน</label>
+                            <select disabled class="form-control" id="vw_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="false" iGroup="vw_limit_frame_plan"></select>
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_executed_date" for="vw_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
+                            <input class="form-control" type="text" id="vw_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_salary_adjustment_date" for="vw_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
+                            <input class="form-control" type="text" id="vw_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_total_salary" for="vw_limit_frame_plan_total_salary">รวมอัตราเงินเดือน</label>
+                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_total_salary" iLabel="รวมอัตราเงินเดือน" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_limit_frame_005" for="vw_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
+                            <input class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_limit_frame_005_total" for="vw_limit_frame_plan_limit_frame_005_total">กันวงเงินไว้</label>
+                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_vw_limit_frame_plan_limit_frame_005_total_rounded" for="vw_limit_frame_plan_limit_frame_005_total_rounded">กันวงเงินใช้จริง</label>
+                            <input disabled class="form-control" type="number" id="vw_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="false" iGroup="vw_limit_frame_plan" />
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class="row">
+        <div class="form-group col-md-12">
+            <button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
+            <button type="button" class="btn btn-submit" onclick="javascript:vw_limit_frame_plan_PutUpdate()">บันทึก</button>
+            <button class="btn btn-info" onclick="javascript:rep_eva_limit_frame_plan_DoSearch('pdf');">พิมพ์วงเงินที่ใช้ในการเลื่อนเงินเดือนของพนักงาน</button>
+        </div>
+    </div>
+
+</section>
+
+<br/>
+
+<section class="wrapper">
+    <div class="title"><div class="line"></div>วงเงินที่ใช้ในการเลื่อนเงินเดือนของแต่ละกอง/ส่วนงาน</div>
+
+    <table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
+        <thead>
+            <tr>
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label></th>
+                <th><label id='h_eva_limit_frame_group_limit_frame_295'>กรอบวงเงินที่กันไว้</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
+                <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
+                <th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
+            </tr>
+        </thead>
+        <tbody></tbody>
+    </table>
+</section>
+
+@section FooterPlaceHolder{
+    <script src="~/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js"></script>
+    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group.js"></script>
+    <script src="~/js/rep_eva_limit_frame_plan/rep_eva_limit_frame_plan_report.js"></script>
+    <script>
+        $(document).ready(function () {
+            var id = getUrlParameter("id");
+            if (id) {
+                vw_limit_frame_plan_SetEditForm(id);
+                eva_limit_frame_group_InitiateDataTable();
+                eva_limit_frame_group_InitialForm();                
+            } else {
+                vw_limit_frame_plan_SetCreateForm();
+            }
+            SetupValidationRemark("vw_limit_frame_plan");
+            SetupValidationRemark("eva_limit_frame_group");
+        });
+    </script>
+}
+

tb320eva.csproj

@@ -86,6 +86,8 @@
 	<None Include="Views\eva_limit_frame_planView\eva_limit_frame_plan_report.cshtml" />
 	<None Include="Views\eva_limit_frame_planView\eva_limit_frame_plan_wizardform.cshtml" />
 	<None Include="Views\rep_eva_limit_frame_planView\rep_eva_limit_frame_plan_report.cshtml" />
+	<None Include="Views\vw_limit_frame_planView\vw_limit_frame_plan.cshtml" />
+	<None Include="Views\vw_limit_frame_planView\vw_limit_frame_plan_d.cshtml" />
 	<None Include="wwwroot\js\eva_adjust_postponement_detail_migration\eva_adjust_postponement_detail_migration.js" />
 	<None Include="wwwroot\js\eva_adjust_postponement_migration\eva_adjust_postponement_migration.js" />
 	<None Include="wwwroot\js\eva_adjust_postponement_migration\eva_adjust_postponement_migration_d.js" />
@@ -109,6 +111,8 @@
 	<None Include="wwwroot\js\rep_eva_limit_frame_plan\rep_eva_limit_frame_plan_report.js" />
 	<None Include="wwwroot\js\rep_eva_self_review\rep_eva_self_review_report.js" />
 	<None Include="wwwroot\js\rep_eva_self_review_all\rep_eva_self_review_all_report.js" />
+	<None Include="wwwroot\js\vw_limit_frame_plan\vw_limit_frame_plan.js" />
+	<None Include="wwwroot\js\vw_limit_frame_plan\vw_limit_frame_plan_d.js" />
 	<Content Update="nlog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

tb320eva.xml

@@ -4329,16 +4329,6 @@
             <param name="configuration"></param>
             <param name="logger"></param>
         </member>
-        <member name="M:TodoAPI2.Controllers.rep_eva_limit_frame_planController.Get(System.Guid)">
-            <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.rep_eva_limit_frame_planController.GetBlankItem">
             <summary>
             Get Blank Item
@@ -4349,26 +4339,6 @@
             <response code="200">Returns the item</response>
             <response code="500">Error Occurred</response>  
         </member>
-        <member name="M:TodoAPI2.Controllers.rep_eva_limit_frame_planController.GetList(System.Nullable{System.Guid})">
-            <summary>
-            Get list items by frame_plan_guid
-            </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.rep_eva_limit_frame_planController.GetListBySearch(TodoAPI2.Models.rep_eva_limit_frame_planSearchModel)">
-            <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.rep_eva_limit_frame_planController.rep_eva_limit_frame_plan_report(TodoAPI2.Models.rep_eva_limit_frame_planReportRequestModel)">
             <summary>
             Download Report
@@ -4379,66 +4349,6 @@
             <response code="200">Returns the item</response>
             <response code="500">Error Occurred</response>  
         </member>
-        <member name="M:TodoAPI2.Controllers.rep_eva_limit_frame_planController.Insert(TodoAPI2.Models.rep_eva_limit_frame_planInputModel)">
-            <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.rep_eva_limit_frame_planController.Update(System.Guid,TodoAPI2.Models.rep_eva_limit_frame_planInputModel)">
-            <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.rep_eva_limit_frame_planController.Delete(System.Guid)">
-            <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.rep_eva_limit_frame_planController.UpdateMultiple(System.Collections.Generic.List{TodoAPI2.Models.rep_eva_limit_frame_planInputModel})">
-            <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.rep_eva_limit_frame_planController.RefreshAutoField">
-            <summary>
-            Refresh AutoField of all items
-            </summary>
-            <remarks>
-            </remarks>
-            <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.rep_eva_self_reviewController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.rep_eva_self_reviewController},TodoAPI2.Models.Irep_eva_self_reviewService,Microsoft.Extensions.Configuration.IConfiguration)">
             <summary>
             Default constructure for dependency injection
@@ -4872,6 +4782,124 @@
             <response code="200">Returns the item</response>
             <response code="500">Error Occurred</response>  
         </member>
+        <member name="M:TodoAPI2.Controllers.vw_limit_frame_planController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.vw_limit_frame_planController},TodoAPI2.Models.Ivw_limit_frame_planService,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.vw_limit_frame_planController.Get(System.Guid)">
+            <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.vw_limit_frame_planController.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.vw_limit_frame_planController.GetList(System.Nullable{System.DateTime})">
+            <summary>
+            Get list items by executed_date
+            </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.vw_limit_frame_planController.GetListBySearch(TodoAPI2.Models.vw_limit_frame_planSearchModel)">
+            <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.vw_limit_frame_planController.vw_limit_frame_plan_report(TodoAPI2.Models.vw_limit_frame_planReportRequestModel)">
+            <summary>
+            Download Report
+            </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.vw_limit_frame_planController.Insert(TodoAPI2.Models.vw_limit_frame_planInputModel)">
+            <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.vw_limit_frame_planController.Update(System.Guid,TodoAPI2.Models.vw_limit_frame_planInputModel)">
+            <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.vw_limit_frame_planController.Delete(System.Guid)">
+            <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.vw_limit_frame_planController.UpdateMultiple(System.Collections.Generic.List{TodoAPI2.Models.vw_limit_frame_planInputModel})">
+            <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.vw_limit_frame_planController.RefreshAutoField">
+            <summary>
+            Refresh AutoField of all items
+            </summary>
+            <remarks>
+            </remarks>
+            <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.core_permission_listViewController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.core_permission_listController},TodoAPI2.Models.Icore_permission_listService,Microsoft.Extensions.Configuration.IConfiguration)">
             <summary>
             Default constructure for dependency injection
@@ -5252,6 +5280,14 @@
             <param name="configuration"></param>
             <param name="logger"></param>
         </member>
+        <member name="M:TodoAPI2.Controllers.vw_limit_frame_planViewController.#ctor(Microsoft.Extensions.Logging.ILogger{TodoAPI2.Controllers.vw_limit_frame_planController},TodoAPI2.Models.Ivw_limit_frame_planService,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:TTSW.Controllers.BaseController.#ctor">
             <summary>
             Default constructure for dependency injection

wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js

@@ -5,48 +5,48 @@ var eva_limit_frame_employee_API = "/api/eva_limit_frame_employee/";
 
 function eva_limit_frame_employee_GetSearchParameter() {
     var eva_limit_frame_employeeSearchObject = new Object();
-eva_limit_frame_employeeSearchObject.frame_group_guid = $("#s_eva_limit_frame_employee_frame_group_guid").val();
-eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val();
+    eva_limit_frame_employeeSearchObject.frame_group_guid = getUrlParameter("id");
+    eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val();
 
     return eva_limit_frame_employeeSearchObject;
 }
 
 function eva_limit_frame_employee_FeedDataToSearchForm(data) {
-$("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
+    $("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
+    DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_employee_FeedDataToForm(data) {
-$("#eva_limit_frame_employee_id").val(data.id);
-$("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-$("#eva_limit_frame_employee_position_text").val(data.position_text);
-$("#eva_limit_frame_employee_level_text").val(data.level_text);
-$("#eva_limit_frame_employee_salary").val(data.salary);
-$("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
-$("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
-$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
-$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
-
+    $("#eva_limit_frame_employee_id").val(data.id);
+    $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
+    $("#eva_limit_frame_employee_position_text").val(data.position_text);
+    $("#eva_limit_frame_employee_level_text").val(data.level_text);
+    $("#eva_limit_frame_employee_salary").val(data.salary);
+    $("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
+    $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
+    $("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
+    $("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
+    console.log(data);
 }
 
 function eva_limit_frame_employee_GetFromForm() {
     var eva_limit_frame_employeeObject = new Object();
-eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
-eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val();
-eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
-eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
-eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
-eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val();
-eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
-eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
-eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
-eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
-eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
+    eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
+    eva_limit_frame_employeeObject.frame_group_guid = getUrlParameter("id");
+    eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
+    eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
+    eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
+    eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val();
+    eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
+    eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
+    eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
+    eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
+    eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
 
 
     return eva_limit_frame_employeeObject;
@@ -55,14 +55,14 @@ eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_orde
 function eva_limit_frame_employee_InitialForm(s) {
     var successFunc = function (result) {
         eva_limit_frame_employee_FeedDataToForm(result);
-		eva_limit_frame_employee_FeedDataToSearchForm(result);
+        eva_limit_frame_employee_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_limit_frame_employeeModel").modal("show");
         }
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_employee_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -89,15 +89,15 @@ function eva_limit_frame_employee_SetEditForm(a) {
         eva_limit_frame_employee_editMode = "UPDATE";
         eva_limit_frame_employee_FeedDataToForm(result);
         $("#eva_limit_frame_employeeModel").modal("show");
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_employee_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_employee_SetCreateForm(s) {
     eva_limit_frame_employee_editMode = "CREATE";
-	eva_limit_frame_employee_InitialForm(s);
+    eva_limit_frame_employee_InitialForm(s);
 }
 
 function eva_limit_frame_employee_RefreshTable() {
@@ -115,8 +115,7 @@ var eva_limit_frame_employee_customValidation = function (group) {
 };
 
 function eva_limit_frame_employee_PutUpdate() {
-	if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation))
-    {
+    if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation)) {
         return;
     }
 
@@ -126,22 +125,22 @@ function eva_limit_frame_employee_PutUpdate() {
     if (eva_limit_frame_employee_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_employee_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_employee_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_employee_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_employee_API, data, successFunc2, AlertDanger);
     }
 }
@@ -150,11 +149,11 @@ function eva_limit_frame_employee_GoDelete(a) {
     if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
         var successFunc = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_employee_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_employee_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -164,37 +163,38 @@ function eva_limit_frame_employee_GoDelete(a) {
 var eva_limit_frame_employeeTableV;
 
 var eva_limit_frame_employee_setupTable = function (result) {
-	tmp = '"';
+    tmp = '"';
+    var groupColumn = 3;
     eva_limit_frame_employeeTableV = $('#eva_limit_frame_employeeTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-		//"select": {
+        //"select": {
         //    "style": 'multi'
         //},
         "columns": [
-		//{ "data": "" },
-		{ "data": "id" },
-                { "data": "id" },
-                { "data": "frame_group_guid_eva_limit_frame_group_group_guid" },
-                { "data": "employee_id_external_linkage_external_name" },
-                { "data": "org_id_external_linkage_external_name" },
-                { "data": "position_text" },
-                { "data": "level_text" },
-                { "data": "salary" },
-                { "data": "position_allowance" },
-                { "data": "monthly_remuneration" },
-                { "data": "cost_of_living" },
-                { "data": "order_of_data" },            
+            //{ "data": "" },
+            { "data": "id" },
+            { "data": "order_of_data" },
+            { "data": "employee_id_external_linkage_external_name" },
+            { "data": "org_id_external_linkage_external_name" },
+            { "data": "position_text" },
+            { "data": "level_text" },
+            { "data": "salary" },
+            { "data": "position_allowance" },
+            { "data": "monthly_remuneration" },
+            { "data": "cost_of_living" },
+            
         ],
         "columnDefs": [
             {
                 "targets": 0, //1,
                 "data": "id",
                 "render": function (data, type, row, meta) {
-                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_limit_frame_employee_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_limit_frame_employee_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_limit_frame_employee_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button style='display:none;' type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_limit_frame_employee_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
                 }
             },
+            { "visible": false, "targets": groupColumn }
             //{
             //    targets: 0,
             //    data: "",
@@ -202,20 +202,35 @@ var eva_limit_frame_employee_setupTable = function (result) {
             //    orderable: false,
             //    className: 'select-checkbox'
             //}
-            ],
+        ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
         "paging": true,
-		"searching": false
+        "searching": false,
+        "drawCallback": function (settings) {
+            var api = this.api();
+            var rows = api.rows({ page: 'current' }).nodes();
+            var last = null;
+
+            api.column(groupColumn, { page: 'current' }).data().each(function (group, i) {
+                if (last !== group) {
+                    $(rows).eq(i).before(
+                        '<tr class="group"><td colspan="10">' + group + '</td></tr>'
+                    );
+
+                    last = group;
+                }
+            });
+        }
     });
-	endLoad();
+    endLoad();
 };
 
 function eva_limit_frame_employee_InitiateDataTable() {
-	startLoad();
-	var p = $.param(eva_limit_frame_employee_GetSearchParameter());
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_setupTable, AlertDanger);
+    startLoad();
+    var p = $.param(eva_limit_frame_employee_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_setupTable, AlertDanger);
 }
 
 function eva_limit_frame_employee_DoSearch() {
@@ -223,10 +238,10 @@ function eva_limit_frame_employee_DoSearch() {
     var eva_limit_frame_employee_reload = function (result) {
         eva_limit_frame_employeeTableV.destroy();
         eva_limit_frame_employee_setupTable(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_reload, AlertDanger);
+    startLoad();
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_reload, AlertDanger);
 }
 
 function eva_limit_frame_employee_GetSelect(f) {

wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js

@@ -5,42 +5,42 @@ var eva_limit_frame_group_API = "/api/eva_limit_frame_group/";
 
 function eva_limit_frame_group_GetSearchParameter() {
     var eva_limit_frame_groupSearchObject = new Object();
-eva_limit_frame_groupSearchObject.frame_plan_guid = $("#s_eva_limit_frame_group_frame_plan_guid").val();
-eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val();
+    eva_limit_frame_groupSearchObject.frame_plan_guid = getUrlParameter("id");
+    eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val();
 
     return eva_limit_frame_groupSearchObject;
 }
 
 function eva_limit_frame_group_FeedDataToSearchForm(data) {
-$("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
-DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
+    $("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
+    DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_group_FeedDataToForm(data) {
-$("#eva_limit_frame_group_id").val(data.id);
-$("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
-$("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
-$("#eva_limit_frame_group_total_salary").val(data.total_salary);
-$("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
-$("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
-$("#eva_limit_frame_group_remark").val(data.remark);
+    $("#eva_limit_frame_group_id").val(data.id);
+    $("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
+    $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
+    $("#eva_limit_frame_group_total_salary").val(data.total_salary);
+    $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
+    $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
+    $("#eva_limit_frame_group_remark").val(data.remark);
 
 }
 
 function eva_limit_frame_group_GetFromForm() {
     var eva_limit_frame_groupObject = new Object();
-eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
-eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val();
-eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
-eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
-eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
-eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
-eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
-eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
+    eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
+    eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val();
+    eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
+    eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
+    eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
+    eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
+    eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
+    eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 
 
     return eva_limit_frame_groupObject;
@@ -49,14 +49,14 @@ eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 function eva_limit_frame_group_InitialForm(s) {
     var successFunc = function (result) {
         eva_limit_frame_group_FeedDataToForm(result);
-		eva_limit_frame_group_FeedDataToSearchForm(result);
+        eva_limit_frame_group_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_limit_frame_groupModel").modal("show");
         }
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -72,10 +72,10 @@ function eva_limit_frame_group_GoCreate() {
 
 function eva_limit_frame_group_GoEdit(a) {
     // Incase model popup
-    eva_limit_frame_group_SetEditForm(a);
+    //eva_limit_frame_group_SetEditForm(a);
 
     // Incase open new page
-    //window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a);
+    window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a);
 }
 
 function eva_limit_frame_group_SetEditForm(a) {
@@ -83,15 +83,15 @@ function eva_limit_frame_group_SetEditForm(a) {
         eva_limit_frame_group_editMode = "UPDATE";
         eva_limit_frame_group_FeedDataToForm(result);
         $("#eva_limit_frame_groupModel").modal("show");
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_group_SetCreateForm(s) {
     eva_limit_frame_group_editMode = "CREATE";
-	eva_limit_frame_group_InitialForm(s);
+    eva_limit_frame_group_InitialForm(s);
 }
 
 function eva_limit_frame_group_RefreshTable() {
@@ -109,8 +109,7 @@ var eva_limit_frame_group_customValidation = function (group) {
 };
 
 function eva_limit_frame_group_PutUpdate() {
-	if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation))
-    {
+    if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation)) {
         return;
     }
 
@@ -120,22 +119,22 @@ function eva_limit_frame_group_PutUpdate() {
     if (eva_limit_frame_group_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_group_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_group_API, data, successFunc2, AlertDanger);
     }
 }
@@ -144,11 +143,11 @@ function eva_limit_frame_group_GoDelete(a) {
     if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
         var successFunc = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_group_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -158,32 +157,30 @@ function eva_limit_frame_group_GoDelete(a) {
 var eva_limit_frame_groupTableV;
 
 var eva_limit_frame_group_setupTable = function (result) {
-	tmp = '"';
+    tmp = '"';
     eva_limit_frame_groupTableV = $('#eva_limit_frame_groupTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-		//"select": {
+        //"select": {
         //    "style": 'multi'
         //},
         "columns": [
-		//{ "data": "" },
-		{ "data": "id" },
-                { "data": "id" },
-                { "data": "frame_plan_guid_eva_limit_frame_plan_executed_date" },
-                { "data": "group_guid_eva_evaluation_group_code" },
-                { "data": "limit_frame_295" },
-                { "data": "total_salary" },
-                { "data": "total_salary_limit" },
-                { "data": "total_salary_limit_rounded" },
-                { "data": "remark" },            
+            //{ "data": "" },
+            { "data": "id" },
+            { "data": "group_guid_eva_evaluation_group_code" },
+            { "data": "limit_frame_295" },
+            { "data": "total_salary" },
+            { "data": "total_salary_limit" },
+            { "data": "total_salary_limit_rounded" },
+            { "data": "remark" },
         ],
         "columnDefs": [
             {
                 "targets": 0, //1,
                 "data": "id",
                 "render": function (data, type, row, meta) {
-                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_limit_frame_group_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_limit_frame_group_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_limit_frame_group_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button style='display:none;' type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_limit_frame_group_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
                 }
             },
             //{
@@ -193,20 +190,20 @@ var eva_limit_frame_group_setupTable = function (result) {
             //    orderable: false,
             //    className: 'select-checkbox'
             //}
-            ],
+        ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
-        "paging": true,
-		"searching": false
+        "paging": false,
+        "searching": false
     });
-	endLoad();
+    endLoad();
 };
 
 function eva_limit_frame_group_InitiateDataTable() {
-	startLoad();
-	var p = $.param(eva_limit_frame_group_GetSearchParameter());
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_setupTable, AlertDanger);
+    startLoad();
+    var p = $.param(eva_limit_frame_group_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_setupTable, AlertDanger);
 }
 
 function eva_limit_frame_group_DoSearch() {
@@ -214,10 +211,10 @@ function eva_limit_frame_group_DoSearch() {
     var eva_limit_frame_group_reload = function (result) {
         eva_limit_frame_groupTableV.destroy();
         eva_limit_frame_group_setupTable(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_reload, AlertDanger);
+    startLoad();
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_reload, AlertDanger);
 }
 
 function eva_limit_frame_group_GetSelect(f) {

wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js

@@ -4,27 +4,27 @@ var eva_limit_frame_group_API = "/api/eva_limit_frame_group/";
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_group_FeedDataToForm(data) {
-$("#eva_limit_frame_group_id").val(data.id);
-$("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
-$("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
-$("#eva_limit_frame_group_total_salary").val(data.total_salary);
-$("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
-$("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
-$("#eva_limit_frame_group_remark").val(data.remark);
+    $("#eva_limit_frame_group_id").val(data.id);
+    $("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
+    DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "thegroup", "item_group_guid", data.group_guid);
+    $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
+    $("#eva_limit_frame_group_total_salary").val(data.total_salary);
+    $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
+    $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
+    $("#eva_limit_frame_group_remark").val(data.remark);
 
 }
 
 function eva_limit_frame_group_GetFromForm() {
     var eva_limit_frame_groupObject = new Object();
-eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
-eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val();
-eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
-eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
-eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
-eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
-eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
-eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
+    eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
+    eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val();
+    eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
+    eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
+    eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
+    eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
+    eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
+    eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 
 
     return eva_limit_frame_groupObject;
@@ -33,9 +33,9 @@ eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 function eva_limit_frame_group_InitialForm() {
     var successFunc = function (result) {
         eva_limit_frame_group_FeedDataToForm(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -45,15 +45,15 @@ function eva_limit_frame_group_SetEditForm(a) {
     var successFunc = function (result) {
         eva_limit_frame_group_editMode = "UPDATE";
         eva_limit_frame_group_FeedDataToForm(result);
-		endLoad();
+        endLoad();
     };
-	startLoad();
+    startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_group_SetCreateForm() {
     eva_limit_frame_group_editMode = "CREATE";
-	eva_limit_frame_group_InitialForm();
+    eva_limit_frame_group_InitialForm();
 }
 
 //================= Update and Delete =========================================
@@ -63,8 +63,7 @@ var eva_limit_frame_group_customValidation = function (group) {
 };
 
 function eva_limit_frame_group_PutUpdate() {
-	if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation))
-    {
+    if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation)) {
         return;
     }
     var data = eva_limit_frame_group_GetFromForm();
@@ -72,19 +71,19 @@ function eva_limit_frame_group_PutUpdate() {
     //Update Mode
     if (eva_limit_frame_group_editMode === "UPDATE") {
         var successFunc1 = function (result) {
-            AlertSuccess(result.code+" "+result.message);
-			endLoad();
+            AlertSuccess(result.code + " " + result.message);
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_group_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
-            AlertSuccess(result.code+" "+result.message);
-			endLoad();
+            AlertSuccess(result.code + " " + result.message);
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_group_API, data, successFunc2, AlertDanger);
     }
 }
@@ -92,11 +91,11 @@ function eva_limit_frame_group_PutUpdate() {
 function eva_limit_frame_group_GoDelete(a) {
     if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
         var successFunc = function (result) {
-            AlertSuccess(result.code+" "+result.message);
+            AlertSuccess(result.code + " " + result.message);
             eva_limit_frame_group_RefreshTable();
-			endLoad();
+            endLoad();
         };
-		startLoad();
+        startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_group_API + a, null, successFunc, AlertDanger);
     }
 }

wwwroot/js/rep_eva_limit_frame_plan/rep_eva_limit_frame_plan_report.js

@@ -4,7 +4,7 @@
 
 function rep_eva_limit_frame_plan_GetSearchParameter(fileType) {
     var rep_eva_limit_frame_planSearchObject = new Object();
-rep_eva_limit_frame_planSearchObject.frame_plan_guid = $("#s_rep_eva_limit_frame_plan_frame_plan_guid").val();
+    rep_eva_limit_frame_planSearchObject.frame_plan_guid = getUrlParameter("id");
 
 
     rep_eva_limit_frame_planSearchObject.fileType = fileType;
@@ -15,7 +15,7 @@ rep_eva_limit_frame_planSearchObject.frame_plan_guid = $("#s_rep_eva_limit_frame
 }
 
 function rep_eva_limit_frame_plan_FeedDataToSearchForm(data) {
-DropDownClearFormAndFeedWithData($("#s_rep_eva_limit_frame_plan_frame_plan_guid"), data, "id", "executed_date", "item_frame_plan_guid", data.frame_plan_guid);
+    DropDownClearFormAndFeedWithData($("#s_rep_eva_limit_frame_plan_frame_plan_guid"), data, "id", "executed_date", "item_frame_plan_guid", data.frame_plan_guid);
 
 }
 
@@ -50,6 +50,7 @@ function rep_eva_limit_frame_plan_DoSearch(fileType) {
         $("#report_result").attr("src", report_url);
         $("#report_result").show();
         //window.open(report_url);
+        $("#report_xModel").modal("show");
     } else {
         $("#report_result").hide();
         window.open(report_url);

wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan.js

@@ -0,0 +1,234 @@
+var vw_limit_frame_plan_editMode = "CREATE";
+var vw_limit_frame_plan_API = "/api/vw_limit_frame_plan/";
+
+//================= Search Customizaiton =========================================
+
+function vw_limit_frame_plan_GetSearchParameter() {
+    var vw_limit_frame_planSearchObject = new Object();
+    //vw_limit_frame_planSearchObject.executed_date = formatDateForGetParameter(getDate($("#s_vw_limit_frame_plan_executed_date").val()));
+
+    return vw_limit_frame_planSearchObject;
+}
+
+function vw_limit_frame_plan_FeedDataToSearchForm(data) {
+    $("#s_vw_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
+
+}
+
+//================= Form Data Customizaiton =========================================
+
+function vw_limit_frame_plan_FeedDataToForm(data) {
+    $("#vw_limit_frame_plan_id").val(data.id);
+    DropDownClearFormAndFeedWithData($("#vw_limit_frame_plan_plan_guid"), data, "id", "display_text", "item_plan_guid", data.plan_guid);
+    $("#vw_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
+    $("#vw_limit_frame_plan_limit_frame_005").val(data.limit_frame_005);
+    $("#vw_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
+    $("#vw_limit_frame_plan_total_salary").val(data.total_salary);
+    $("#vw_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total);
+    $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded);
+
+}
+
+function vw_limit_frame_plan_GetFromForm() {
+    var vw_limit_frame_planObject = new Object();
+    vw_limit_frame_planObject.id = $("#vw_limit_frame_plan_id").val();
+    vw_limit_frame_planObject.plan_guid = $("#vw_limit_frame_plan_plan_guid").val();
+    vw_limit_frame_planObject.executed_date = getDate($("#vw_limit_frame_plan_executed_date").val());
+    vw_limit_frame_planObject.limit_frame_005 = $("#vw_limit_frame_plan_limit_frame_005").val();
+    vw_limit_frame_planObject.salary_adjustment_date = getDate($("#vw_limit_frame_plan_salary_adjustment_date").val());
+    vw_limit_frame_planObject.total_salary = $("#vw_limit_frame_plan_total_salary").val();
+    vw_limit_frame_planObject.limit_frame_005_total = $("#vw_limit_frame_plan_limit_frame_005_total").val();
+    vw_limit_frame_planObject.limit_frame_005_total_rounded = $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val();
+
+
+    return vw_limit_frame_planObject;
+}
+
+function vw_limit_frame_plan_InitialForm(s) {
+    var successFunc = function (result) {
+        vw_limit_frame_plan_FeedDataToForm(result);
+        vw_limit_frame_plan_FeedDataToSearchForm(result);
+        if (s) {
+            // Incase model popup
+            $("#vw_limit_frame_planModel").modal("show");
+        }
+        endLoad();
+    };
+    startLoad();
+    AjaxGetRequest(apisite + vw_limit_frame_plan_API + "GetBlankItem", successFunc, AlertDanger);
+}
+
+//================= Form Mode Setup and Flow =========================================
+
+function vw_limit_frame_plan_GoCreate() {
+    // Incase model popup
+    vw_limit_frame_plan_SetCreateForm(true);
+
+    // Incase open new page
+    //window_open(appsite + "/vw_limit_frame_planView/vw_limit_frame_plan_d");
+}
+
+function vw_limit_frame_plan_GoEdit(a) {
+    // Incase model popup
+    //vw_limit_frame_plan_SetEditForm(a);
+
+    // Incase open new page
+    window_open(appsite + "/vw_limit_frame_planView/vw_limit_frame_plan_d?id=" + a);
+}
+
+function vw_limit_frame_plan_SetEditForm(a) {
+    var successFunc = function (result) {
+        vw_limit_frame_plan_editMode = "UPDATE";
+        vw_limit_frame_plan_FeedDataToForm(result);
+        $("#vw_limit_frame_planModel").modal("show");
+        endLoad();
+    };
+    startLoad();
+    AjaxGetRequest(apisite + vw_limit_frame_plan_API + a, successFunc, AlertDanger);
+}
+
+function vw_limit_frame_plan_SetCreateForm(s) {
+    vw_limit_frame_plan_editMode = "CREATE";
+    vw_limit_frame_plan_InitialForm(s);
+}
+
+function vw_limit_frame_plan_RefreshTable() {
+    // Incase model popup
+    vw_limit_frame_plan_DoSearch();
+
+    // Incase open new page
+    //window.parent.vw_limit_frame_plan_DoSearch();
+}
+
+//================= Update and Delete =========================================
+
+var vw_limit_frame_plan_customValidation = function (group) {
+    return "";
+};
+
+function vw_limit_frame_plan_PutUpdate() {
+    if (!ValidateForm('vw_limit_frame_plan', vw_limit_frame_plan_customValidation)) {
+        return;
+    }
+
+    var data = vw_limit_frame_plan_GetFromForm();
+
+    //Update Mode
+    if (vw_limit_frame_plan_editMode === "UPDATE") {
+        var successFunc1 = function (result) {
+            $("#vw_limit_frame_planModel").modal("hide");
+            AlertSuccess(result.code + " " + result.message);
+            vw_limit_frame_plan_RefreshTable();
+            endLoad();
+        };
+        startLoad();
+        AjaxPutRequest(apisite + vw_limit_frame_plan_API + data.id, data, successFunc1, AlertDanger);
+    }
+    // Create mode
+    else {
+        var successFunc2 = function (result) {
+            $("#vw_limit_frame_planModel").modal("hide");
+            AlertSuccess(result.code + " " + result.message);
+            vw_limit_frame_plan_RefreshTable();
+            endLoad();
+        };
+        startLoad();
+        AjaxPostRequest(apisite + vw_limit_frame_plan_API, data, successFunc2, AlertDanger);
+    }
+}
+
+function vw_limit_frame_plan_GoDelete(a) {
+    if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
+        var successFunc = function (result) {
+            $("#vw_limit_frame_planModel").modal("hide");
+            AlertSuccess(result.code + " " + result.message);
+            vw_limit_frame_plan_RefreshTable();
+            endLoad();
+        };
+        startLoad();
+        AjaxDeleteRequest(apisite + vw_limit_frame_plan_API + a, null, successFunc, AlertDanger);
+    }
+}
+
+//================= Data Table =========================================
+
+var vw_limit_frame_planTableV;
+
+var vw_limit_frame_plan_setupTable = function (result) {
+    tmp = '"';
+    vw_limit_frame_planTableV = $('#vw_limit_frame_planTable').DataTable({
+        "processing": true,
+        "serverSide": false,
+        "data": result,
+        //"select": {
+        //    "style": 'multi'
+        //},
+        "columns": [
+            //{ "data": "" },
+            { "data": "id" },
+            { "data": "plan_guid_eva_performance_plan_fiscal_year" },
+            { "data": "txt_executed_date" },
+            { "data": "limit_frame_005" },
+            { "data": "txt_salary_adjustment_date" },
+            { "data": "total_salary" },
+            { "data": "limit_frame_005_total" },
+            { "data": "limit_frame_005_total_rounded" },
+        ],
+        "columnDefs": [
+            {
+                "targets": 0, //1,
+                "data": "id",
+                "render": function (data, type, row, meta) {
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:vw_limit_frame_plan_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:vw_limit_frame_plan_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
+                }
+            },
+            //{
+            //    targets: 0,
+            //    data: "",
+            //    defaultContent: '',
+            //    orderable: false,
+            //    className: 'select-checkbox'
+            //}
+        ],
+        "language": {
+            "url": appsite + "/DataTables-1.10.16/thai.json"
+        },
+        "paging": true,
+        "searching": false
+    });
+    endLoad();
+};
+
+function vw_limit_frame_plan_InitiateDataTable() {
+    startLoad();
+    var p = $.param(vw_limit_frame_plan_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/vw_limit_frame_plan/GetListBySearch?" + p, vw_limit_frame_plan_setupTable, AlertDanger);
+}
+
+function vw_limit_frame_plan_DoSearch() {
+    var p = $.param(vw_limit_frame_plan_GetSearchParameter());
+    var vw_limit_frame_plan_reload = function (result) {
+        vw_limit_frame_planTableV.destroy();
+        vw_limit_frame_plan_setupTable(result);
+        endLoad();
+    };
+    startLoad();
+    AjaxGetRequest(apisite + "/api/vw_limit_frame_plan/GetListBySearch?" + p, vw_limit_frame_plan_reload, AlertDanger);
+}
+
+function vw_limit_frame_plan_GetSelect(f) {
+    var vw_limit_frame_plan_selectitem = [];
+    $.each(vw_limit_frame_planTableV.rows('.selected').data(), function (key, value) {
+        vw_limit_frame_plan_selectitem.push(value[f]);
+    });
+    alert(vw_limit_frame_plan_selectitem);
+}
+
+//================= File Upload =========================================
+
+
+
+//================= Multi-Selection Function =========================================
+
+
+

wwwroot/js/vw_limit_frame_plan/vw_limit_frame_plan_d.js

@@ -0,0 +1,109 @@
+var vw_limit_frame_plan_editMode = "CREATE";
+var vw_limit_frame_plan_API = "/api/vw_limit_frame_plan/";
+
+//================= Form Data Customizaiton =========================================
+
+function vw_limit_frame_plan_FeedDataToForm(data) {
+    $("#vw_limit_frame_plan_id").val(data.id);
+    DropDownClearFormAndFeedWithData($("#vw_limit_frame_plan_plan_guid"), data, "id", "display_text", "item_plan_guid", data.plan_guid);
+    $("#vw_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
+    $("#vw_limit_frame_plan_limit_frame_005").val(data.limit_frame_005);
+    $("#vw_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
+    $("#vw_limit_frame_plan_total_salary").val(data.total_salary);
+    $("#vw_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total);
+    $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded);
+
+}
+
+function vw_limit_frame_plan_GetFromForm() {
+    var vw_limit_frame_planObject = new Object();
+    vw_limit_frame_planObject.id = $("#vw_limit_frame_plan_id").val();
+    vw_limit_frame_planObject.plan_guid = $("#vw_limit_frame_plan_plan_guid").val();
+    vw_limit_frame_planObject.executed_date = getDate($("#vw_limit_frame_plan_executed_date").val());
+    vw_limit_frame_planObject.limit_frame_005 = $("#vw_limit_frame_plan_limit_frame_005").val();
+    vw_limit_frame_planObject.salary_adjustment_date = getDate($("#vw_limit_frame_plan_salary_adjustment_date").val());
+    vw_limit_frame_planObject.total_salary = $("#vw_limit_frame_plan_total_salary").val();
+    vw_limit_frame_planObject.limit_frame_005_total = $("#vw_limit_frame_plan_limit_frame_005_total").val();
+    vw_limit_frame_planObject.limit_frame_005_total_rounded = $("#vw_limit_frame_plan_limit_frame_005_total_rounded").val();
+
+
+    return vw_limit_frame_planObject;
+}
+
+function vw_limit_frame_plan_InitialForm() {
+    var successFunc = function (result) {
+        vw_limit_frame_plan_FeedDataToForm(result);
+        endLoad();
+    };
+    startLoad();
+    AjaxGetRequest(apisite + vw_limit_frame_plan_API + "GetBlankItem", successFunc, AlertDanger);
+}
+
+//================= Form Mode Setup and Flow =========================================
+
+function vw_limit_frame_plan_SetEditForm(a) {
+    var successFunc = function (result) {
+        vw_limit_frame_plan_editMode = "UPDATE";
+        vw_limit_frame_plan_FeedDataToForm(result);
+        endLoad();
+    };
+    startLoad();
+    AjaxGetRequest(apisite + vw_limit_frame_plan_API + a, successFunc, AlertDanger);
+}
+
+function vw_limit_frame_plan_SetCreateForm() {
+    vw_limit_frame_plan_editMode = "CREATE";
+    vw_limit_frame_plan_InitialForm();
+}
+
+//================= Update and Delete =========================================
+
+var vw_limit_frame_plan_customValidation = function (group) {
+    return "";
+};
+
+function vw_limit_frame_plan_PutUpdate() {
+    if (!ValidateForm('vw_limit_frame_plan', vw_limit_frame_plan_customValidation)) {
+        return;
+    }
+    var data = vw_limit_frame_plan_GetFromForm();
+
+    //Update Mode
+    if (vw_limit_frame_plan_editMode === "UPDATE") {
+        var successFunc1 = function (result) {
+            AlertSuccess(result.code + " " + result.message);
+            endLoad();
+        };
+        startLoad();
+        AjaxPutRequest(apisite + vw_limit_frame_plan_API + data.id, data, successFunc1, AlertDanger);
+    }
+    // Create mode
+    else {
+        var successFunc2 = function (result) {
+            AlertSuccess(result.code + " " + result.message);
+            endLoad();
+        };
+        startLoad();
+        AjaxPostRequest(apisite + vw_limit_frame_plan_API, data, successFunc2, AlertDanger);
+    }
+}
+
+function vw_limit_frame_plan_GoDelete(a) {
+    if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
+        var successFunc = function (result) {
+            AlertSuccess(result.code + " " + result.message);
+            vw_limit_frame_plan_RefreshTable();
+            endLoad();
+        };
+        startLoad();
+        AjaxDeleteRequest(apisite + vw_limit_frame_plan_API + a, null, successFunc, AlertDanger);
+    }
+}
+
+//================= File Upload =========================================
+
+
+
+//================= Multi-Selection Function =========================================
+
+