thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

แก้บัก หลังจากตรวจงานทีม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-06 08:17:06 +07:00
parent 9ffe9c30d3
commit 39c11f277a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
View File

@@ -108,7 +108,7 @@ namespace TodoAPI2.Models
where 1==1 where 1==1
//&& (m_eva_adjust_postponement_detail_normal_02.id == model.id || !model.id.HasValue) //&& (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) && (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 orderby m_eva_adjust_postponement_detail_normal_02.created descending
select new eva_adjust_postponement_detail_normal_02ViewModel() select new eva_adjust_postponement_detail_normal_02ViewModel()

4
appsettings.Development.json
View File

@@ -1,7 +1,7 @@
{ {
"connectionStrings": { "connectionStrings": {
"mainDBConnectionString": "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;User ID=postgres;Password=project0*;" "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;"
}, },
"IdentityServer": { "IdentityServer": {
"url": "", "url": "",

2
wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
View File

@@ -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); 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); 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) { var successFunc = function (result) {
AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว"); AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
endLoad(); endLoad();

8
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
View File

@@ -59,8 +59,9 @@ function eva_adjust_postponement_normal_SetEditForm(a) {
var successFunc = function (result) { var successFunc = function (result) {
eva_adjust_postponement_normal_editMode = "UPDATE"; eva_adjust_postponement_normal_editMode = "UPDATE";
eva_adjust_postponement_normal_FeedDataToForm(result); eva_adjust_postponement_normal_FeedDataToForm(result);
Oneva_adjust_postponement_normal_limit_frameChange(); //Oneva_adjust_postponement_normal_limit_frameChange();
Oneva_adjust_postponement_normal_percentageChange(); //Oneva_adjust_postponement_normal_percentageChange();
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
endLoad(); endLoad();
}; };
startLoad(); startLoad();
@@ -88,7 +89,8 @@ function eva_adjust_postponement_normal_PutUpdate() {
//Update Mode //Update Mode
if (eva_adjust_postponement_normal_editMode === "UPDATE") { if (eva_adjust_postponement_normal_editMode === "UPDATE") {
var successFunc1 = function (result) { var successFunc1 = function (result) {
AlertSuccess(result.code+" "+result.message); eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id"));
//AlertSuccess(result.code+" "+result.message);
endLoad(); endLoad();
}; };
startLoad(); startLoad();