From 39c11f277aeba1bef952a11ef9279c94beb5c8f1 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Mon, 6 Apr 2020 08:17:06 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=81=20=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eva_adjust_postponement_detail_normal_02Service.cs | 2 +- appsettings.Development.json | 4 ++-- .../eva_adjust_postponement_detail_normal_02_inline.js | 2 +- .../eva_adjust_postponement_normal_d.js | 8 +++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs index c7a3f13..88ffb0f 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs @@ -108,7 +108,7 @@ namespace TodoAPI2.Models where 1==1 //&& (m_eva_adjust_postponement_detail_normal_02.id == model.id || !model.id.HasValue) && (m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id == model.adjust_postponement_id || !model.adjust_postponement_id.HasValue) - //&& fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id + && fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id orderby m_eva_adjust_postponement_detail_normal_02.created descending select new eva_adjust_postponement_detail_normal_02ViewModel() diff --git a/appsettings.Development.json b/appsettings.Development.json index 15a0255..da7f7e8 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -1,7 +1,7 @@ { "connectionStrings": { - "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;", - "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;" + "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;", + "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;" }, "IdentityServer": { "url": "", diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js index f1ee568..1873b04 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js +++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js @@ -73,7 +73,7 @@ function eva_adjust_postponement_detail_normal_02_Save(id) { var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i); eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02); }); - +//console.log(eva_adjust_postponement_detail_normal_02); var successFunc = function (result) { AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว"); endLoad(); diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js index 4246d64..4958be3 100644 --- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js +++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js @@ -59,8 +59,9 @@ function eva_adjust_postponement_normal_SetEditForm(a) { var successFunc = function (result) { eva_adjust_postponement_normal_editMode = "UPDATE"; eva_adjust_postponement_normal_FeedDataToForm(result); - Oneva_adjust_postponement_normal_limit_frameChange(); - Oneva_adjust_postponement_normal_percentageChange(); + //Oneva_adjust_postponement_normal_limit_frameChange(); + //Oneva_adjust_postponement_normal_percentageChange(); + Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(); endLoad(); }; startLoad(); @@ -88,7 +89,8 @@ function eva_adjust_postponement_normal_PutUpdate() { //Update Mode if (eva_adjust_postponement_normal_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id")); + //AlertSuccess(result.code+" "+result.message); endLoad(); }; startLoad();