diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs index 3adf4c8..7679746 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs @@ -213,6 +213,10 @@ namespace TodoAPI2.Models org_id_external_linkage_external_name = fk_external_employee.department_name, + status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date, + status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date, + status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date, + isActive = m_eva_create_evaluation_detail_agreement.isActive, Created = m_eva_create_evaluation_detail_agreement.created, Updated = m_eva_create_evaluation_detail_agreement.updated diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs index 0d9af56..94b36b4 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs @@ -50,5 +50,29 @@ namespace TodoAPI2.Models public string remark_hrm_work_record { get; set; } + public DateTime? status_self_click_date { get; set; } + public DateTime? status_chief_click_date { get; set; } + public DateTime? status_supervisor_click_date { get; set; } + + public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } } + public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } } + public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } } + + private string getStatusText(string s) + { + if (!string.IsNullOrEmpty(s)) + { + if (s == "Y") + { + return "ส่งแบบประเมินแล้ว
"; + } + else if (s == "N") + { + return "ตีกลับ
"; + } + } + return " "; + } + } } \ No newline at end of file diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs index 0933ee6..320c51d 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs @@ -79,11 +79,11 @@ namespace TodoAPI2.Models { if(s=="Y") { - return "ส่งแบบประเมินแล้ว "; + return "ส่งแบบประเมินแล้ว
"; } else if (s == "N") { - return "ตีกลับ "; + return "ตีกลับ
"; } } return " "; diff --git a/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs b/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs index b09247a..92bc3f1 100644 --- a/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs +++ b/Models/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01Service.cs @@ -73,7 +73,6 @@ namespace TodoAPI2.Models var i = new eva_create_evaluation_detail_review01WithSelectionViewModel(); i.item_supervisor1_result = (from x in ext.GetAgreeDisagree() select x).ToList(); - return i; } diff --git a/Models/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03Service.cs b/Models/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03Service.cs index eadcf1f..2b91785 100644 --- a/Models/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03Service.cs +++ b/Models/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03Service.cs @@ -161,7 +161,7 @@ namespace TodoAPI2.Models existingEntity.supervisor1A = model.supervisor1A; existingEntity.supervisor1A_result = model.supervisor1A_result; existingEntity.supervisor1A_remark = model.supervisor1A_remark; - existingEntity.supervisor1A_date = model.supervisor1A_date; + existingEntity.supervisor1A_date = DateTime.Now; var updated = _repository.Update(id, existingEntity); diff --git a/Models/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04Service.cs b/Models/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04Service.cs index 7ccfd52..94d8e7c 100644 --- a/Models/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04Service.cs +++ b/Models/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04Service.cs @@ -161,7 +161,7 @@ namespace TodoAPI2.Models existingEntity.supervisor2A = model.supervisor2A; existingEntity.supervisor2A_result = model.supervisor2A_result; existingEntity.supervisor2A_remark = model.supervisor2A_remark; - existingEntity.supervisor2A_date = model.supervisor2A_date; + existingEntity.supervisor2A_date = DateTime.Now; var updated = _repository.Update(id, existingEntity); diff --git a/Models/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1Service.cs b/Models/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1Service.cs index 190af89..1233d78 100644 --- a/Models/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1Service.cs +++ b/Models/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1Service.cs @@ -164,6 +164,14 @@ namespace TodoAPI2.Models existingEntity.score_chief = model.score_chief; existingEntity.level_score_chief = model.level_score_chief; + existingEntity.total_summary_supervisor = model.total_summary_chief; + existingEntity.Final_summary_supervisor = model.Final_summary_chief; + existingEntity.total_summary_competency_supervisor = model.total_summary_competency_chief; + existingEntity.Final_summary_competency_supervisor = model.Final_summary_competency_chief; + existingEntity.achievement_supervisor = model.achievement_chief; + existingEntity.competency_supervisor = model.competency_chief; + existingEntity.score_supervisor = model.score_chief; + existingEntity.level_score_supervisor = model.level_score_chief; var updated = _repository.Update(id, existingEntity); return Get(updated.id); diff --git a/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs b/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs index 9a26b8f..582de9c 100644 --- a/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs +++ b/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs @@ -219,17 +219,20 @@ namespace TodoAPI2.Models existingEntity.score = i.score; existingEntity.sumary = i.sumary; - if(current_eva.employee_id == current_detail.chief) // หัวหน้าและผู้ประเมินสูงสุด เป็นคนคนเดียวกัน - { - existingEntity.score2 = i.score; - existingEntity.sumary2 = i.sumary; - } + //if(current_eva.employee_id == current_detail.chief) // หัวหน้าและผู้ประเมินสูงสุด เป็นคนคนเดียวกัน + //{ + // existingEntity.score2 = i.score; + // existingEntity.sumary2 = i.sumary; + //} //else // เป็นคนละคน (แต่ดึงค่า default ไปใส่ให้) //{ // existingEntity.score2 = i.score; // existingEntity.sumary2 = i.sumary; //} + existingEntity.score2 = i.score; + existingEntity.sumary2 = i.sumary; + existingEntity.target_score1 = i.target_score1; existingEntity.target_score2 = i.target_score2; existingEntity.target_score3 = i.target_score3; diff --git a/Models/eva_evaluation_behavior_process/eva_evaluation_behavior_processService.cs b/Models/eva_evaluation_behavior_process/eva_evaluation_behavior_processService.cs index c706667..9f3e258 100644 --- a/Models/eva_evaluation_behavior_process/eva_evaluation_behavior_processService.cs +++ b/Models/eva_evaluation_behavior_process/eva_evaluation_behavior_processService.cs @@ -105,7 +105,7 @@ namespace TodoAPI2.Models { id = m_eva_evaluation_behavior_process.id, create_evaluation_detail_id = m_eva_evaluation_behavior_process.create_evaluation_detail_id, - behavior = m_eva_evaluation_behavior_process.behavior, + behavior = m_eva_evaluation_behavior_process.behavior_fix, weight = m_eva_evaluation_behavior_process.weight, score = m_eva_evaluation_behavior_process.score, sumary = m_eva_evaluation_behavior_process.sumary, @@ -212,17 +212,20 @@ namespace TodoAPI2.Models existingEntity.score = i.score; existingEntity.sumary = i.sumary; - if (current_eva.employee_id == current_detail.chief) // หัวหน้าและผู้ประเมินสูงสุด เป็นคนคนเดียวกัน - { - existingEntity.score2 = i.score; - existingEntity.sumary2 = i.sumary; - } + //if (current_eva.employee_id == current_detail.chief) // หัวหน้าและผู้ประเมินสูงสุด เป็นคนคนเดียวกัน + //{ + // existingEntity.score2 = i.score; + // existingEntity.sumary2 = i.sumary; + //} //else // เป็นคนละคน (แต่ดึงค่า default ไปใส่ให้) //{ // existingEntity.score2 = i.score; // existingEntity.sumary2 = i.sumary; //} + existingEntity.score2 = i.score; + existingEntity.sumary2 = i.sumary; + existingEntity.target_score1 = i.target_score1; existingEntity.target_score2 = i.target_score2; existingEntity.target_score3 = i.target_score3; diff --git a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs index 9932a9d..7c8fe53 100644 --- a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs +++ b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs @@ -102,7 +102,7 @@ namespace TodoAPI2.Models { id = m_eva_evaluation_behavior_process2.id, create_evaluation_detail_id = m_eva_evaluation_behavior_process2.create_evaluation_detail_id, - behavior = m_eva_evaluation_behavior_process2.behavior, + behavior = m_eva_evaluation_behavior_process2.behavior_fix, weight = m_eva_evaluation_behavior_process2.weight, score = m_eva_evaluation_behavior_process2.score, sumary = m_eva_evaluation_behavior_process2.sumary, diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml index 319312b..a19695e 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml @@ -63,6 +63,7 @@ + diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml index 42ea586..96beb6f 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml @@ -162,14 +162,20 @@ + + + + + + + + + รวม - - - - +

@@ -184,7 +190,7 @@

- +
@@ -208,12 +214,20 @@ + + + + + + + + + - - +

@@ -227,7 +241,7 @@

- +
@@ -281,7 +295,7 @@
- +
@@ -304,7 +318,7 @@
- +
@@ -329,11 +343,11 @@
- + - + - +
@@ -371,7 +385,6 @@ searchVacationObject.start_date = formatDateForGetParameter(getDate($("#date_from").val())); searchVacationObject.end_date = formatDateForGetParameter(getDate($("#date_to").val())); searchVacationObject.employee_id = $("#eva_create_evaluation_detail_process_employee_id").val(); - console.log(searchVacationObject); return searchVacationObject; } @@ -413,6 +426,10 @@ } function saveStatus(s){ + if (!ValidateForm('eva_create_evaluation_detail_review01', eva_create_evaluation_detail_review01_customValidation)) + { + return; + } saveAll(); eva_create_evaluation_detail_status_PutUpdate(s); } diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml index 51d92aa..6b5e8e9 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml @@ -201,10 +201,8 @@ ลำดับ - - @@ -214,14 +212,22 @@ - รวม + + + + + + + + + + รวม - - + - +

@@ -234,7 +240,7 @@

- +
@@ -260,13 +266,22 @@ + + + + + + + + + - +

- +

@@ -278,7 +293,7 @@

- +
@@ -331,7 +346,7 @@
- +
@@ -405,7 +420,7 @@
-
ความเห็นผู้ประเมินสูงสุด
+
ความเห็นผู้ประเมินสูงสุด
@@ -483,7 +498,7 @@
- +
@@ -531,7 +546,7 @@
- +
@@ -685,22 +700,44 @@ function saveReview02(){ saveAll(); - eva_create_evaluation_detail_review02_PutUpdate(); + eva_create_evaluation_detail_review02_PutUpdate(true); } function saveReview03(){ - saveAll(); - eva_create_evaluation_detail_review03_PutUpdate(); + //saveAll(); + eva_create_evaluation_detail_review03_PutUpdate(true); } function saveReview04(){ - saveAll(); - eva_create_evaluation_detail_review04_PutUpdate(); + //saveAll(); + eva_create_evaluation_detail_review04_PutUpdate(true); } function saveStatus(s){ - saveAll(); - eva_create_evaluation_detail_status_PutUpdate(s); + if(s === "next2" || s === "back2"){ + if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) + { + return; + } + saveAll(); + eva_create_evaluation_detail_status_PutUpdate(s); + } + else if(s === "next3"){ + if (!ValidateForm('eva_create_evaluation_detail_review03', eva_create_evaluation_detail_review03_customValidation)) + { + return; + } + eva_create_evaluation_detail_review03_PutUpdate(false); + eva_create_evaluation_detail_status_PutUpdate(s); + } + else if(s === "next4"){ + if (!ValidateForm('eva_create_evaluation_detail_review04', eva_create_evaluation_detail_review04_customValidation)) + { + return; + } + eva_create_evaluation_detail_review04_PutUpdate(false); + eva_create_evaluation_detail_status_PutUpdate(s); + } } function saveAll(){ diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normal.js b/wwwroot/js/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normal.js index 41fc6cb..e505e22 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normal.js +++ b/wwwroot/js/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normal.js @@ -79,7 +79,7 @@ function eva_adjust_postponement_detail_normal_InitialForm(s) { function eva_adjust_postponement_detail_normal_GoCreate() { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_normal_RefreshTable(); endLoad(); }; @@ -137,7 +137,7 @@ function eva_adjust_postponement_detail_normal_PutUpdate() { if (eva_adjust_postponement_detail_normal_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_adjust_postponement_detail_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_normal_RefreshTable(); endLoad(); }; @@ -148,7 +148,7 @@ function eva_adjust_postponement_detail_normal_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_adjust_postponement_detail_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_normal_RefreshTable(); endLoad(); }; @@ -161,7 +161,7 @@ function eva_adjust_postponement_detail_normal_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_adjust_postponement_detail_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_normal_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_adjust_postponement_detail_quota/eva_adjust_postponement_detail_quota.js b/wwwroot/js/eva_adjust_postponement_detail_quota/eva_adjust_postponement_detail_quota.js index 1822ccf..6a1c742 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_quota/eva_adjust_postponement_detail_quota.js +++ b/wwwroot/js/eva_adjust_postponement_detail_quota/eva_adjust_postponement_detail_quota.js @@ -123,7 +123,7 @@ function eva_adjust_postponement_detail_quota_PutUpdate() { if (eva_adjust_postponement_detail_quota_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_adjust_postponement_detail_quotaModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_quota_RefreshTable(); endLoad(); }; @@ -134,7 +134,7 @@ function eva_adjust_postponement_detail_quota_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_adjust_postponement_detail_quotaModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_quota_RefreshTable(); endLoad(); }; @@ -147,7 +147,7 @@ function eva_adjust_postponement_detail_quota_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_adjust_postponement_detail_quotaModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_detail_quota_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js index 6d26f11..b120e2d 100644 --- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js +++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js @@ -133,7 +133,7 @@ function eva_adjust_postponement_normal_PutUpdate() { if (eva_adjust_postponement_normal_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_adjust_postponement_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); endLoad(); }; @@ -144,7 +144,7 @@ function eva_adjust_postponement_normal_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_adjust_postponement_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); endLoad(); }; @@ -157,7 +157,7 @@ function eva_adjust_postponement_normal_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_adjust_postponement_normalModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); 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 d578498..05209a4 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 @@ -93,7 +93,7 @@ function eva_adjust_postponement_normal_PutUpdate() { if (eva_adjust_postponement_normal_editMode === "UPDATE") { var successFunc1 = function (result) { eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id")); - //AlertSuccess(result.code+" "+result.message); + //AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -102,7 +102,7 @@ function eva_adjust_postponement_normal_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -113,7 +113,7 @@ function eva_adjust_postponement_normal_PutUpdate() { function eva_adjust_postponement_normal_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js index 65ccc6d..751f19b 100644 --- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js +++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js @@ -119,7 +119,7 @@ function eva_create_evaluation_PutUpdate() { if (eva_create_evaluation_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_create_evaluationModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_RefreshTable(); endLoad(); }; @@ -130,7 +130,7 @@ function eva_create_evaluation_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_create_evaluationModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_RefreshTable(); endLoad(); }; @@ -143,7 +143,7 @@ function eva_create_evaluation_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_create_evaluationModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js index 0952274..b7be068 100644 --- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js +++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js @@ -71,7 +71,7 @@ function eva_create_evaluation_PutUpdate() { //Update Mode if (eva_create_evaluation_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -80,7 +80,7 @@ function eva_create_evaluation_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -91,7 +91,7 @@ function eva_create_evaluation_PutUpdate() { function eva_create_evaluation_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js index fb1e139..20943af 100644 --- a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js +++ b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js @@ -113,7 +113,7 @@ function eva_create_evaluation_detail_PutUpdate() { if (eva_create_evaluation_detail_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; @@ -124,7 +124,7 @@ function eva_create_evaluation_detail_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; @@ -137,7 +137,7 @@ function eva_create_evaluation_detail_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js index 0f14f1d..e4842f6 100644 --- a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js +++ b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js @@ -113,7 +113,7 @@ function eva_create_evaluation_detail_PutUpdate() { if (eva_create_evaluation_detail_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; @@ -124,7 +124,7 @@ function eva_create_evaluation_detail_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; @@ -137,7 +137,7 @@ function eva_create_evaluation_detail_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_create_evaluation_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js index 263ccdb..a86d852 100644 --- a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js +++ b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js @@ -140,7 +140,7 @@ function eva_create_evaluation_detail_agreement_PutUpdate() { if (eva_create_evaluation_detail_agreement_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_create_evaluation_detail_agreementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_agreement_RefreshTable(); endLoad(); }; @@ -151,7 +151,7 @@ function eva_create_evaluation_detail_agreement_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_create_evaluation_detail_agreementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_agreement_RefreshTable(); endLoad(); }; @@ -164,7 +164,7 @@ function eva_create_evaluation_detail_agreement_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_create_evaluation_detail_agreementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_agreement_RefreshTable(); endLoad(); }; @@ -194,8 +194,9 @@ console.log(result); { "data": "employee_position" }, { "data": "employee_position_level" }, { "data": "org_id_external_linkage_external_name" }, - { "data": "status_chief" }, -{ "data": "status_supervisor" }, +{ "data": "txt_status_self" }, + { "data": "txt_status_chief" }, +{ "data": "txt_status_supervisor" }, { "data": "id" } ], diff --git a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js index cfde56f..f676ba4 100644 --- a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement_d.js @@ -86,7 +86,7 @@ function eva_create_evaluation_detail_agreement_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_agreement_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -95,7 +95,7 @@ function eva_create_evaluation_detail_agreement_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -106,7 +106,7 @@ function eva_create_evaluation_detail_agreement_PutUpdate() { function eva_create_evaluation_detail_agreement_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_agreement_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index 67a914c..f50e8e5 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -140,7 +140,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { if (eva_create_evaluation_detail_process_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_create_evaluation_detail_processModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); endLoad(); }; @@ -151,7 +151,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_create_evaluation_detail_processModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); endLoad(); }; @@ -164,7 +164,7 @@ function eva_create_evaluation_detail_process_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_create_evaluation_detail_processModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js index 363d110..6c3434f 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js @@ -128,7 +128,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_process_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -137,7 +137,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -148,7 +148,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { function eva_create_evaluation_detail_process_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); endLoad(); }; @@ -164,38 +164,23 @@ function eva_create_evaluation_detail_process_GoDelete(a) { //================= Control Function ========================================= function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor){ - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); - $("#btna01").hide(); - $("#btna02").hide(); - $("#btna03").hide(); - $("#eva_create_evaluation_detail_review01_supervisor1_date").prop('disabled', true); + $(".mycontrol01").hide(); + $(".mycontrol02").attr("disabled", true); $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); if(role_code === "1"){ // ผู้ประเมิน if(status_self === "Y"){ - $("#btn01").show(); - $("#btn02").show(); - $("#btn03").show(); - $("#btna01").show(); - $("#btna02").show(); - $("#btna03").show(); - $("#eva_create_evaluation_detail_review01_supervisor1_date").prop("disabled", false); + $(".mycontrol01").show(); $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", false); + $(".mycontrol02").attr("disabled", false); }else{ $("#thestatus").text("(ผู้รับการประเมิน ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); } if(status_chief === "Y"){ $("#thestatus").text("(ผู้ประเมิน ส่งแบบประเมินแล้ว)"); - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); - $("#btna01").hide(); - $("#btna02").hide(); - $("#btna03").hide(); - $("#eva_create_evaluation_detail_review01_supervisor1_date").prop("disabled", true); + $(".mycontrol01").hide(); + $(".mycontrol02").attr("disabled", true); $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); } }else{ diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js index 9f36728..228f157 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js @@ -28,7 +28,7 @@ var item_level_score; function eva_create_evaluation_detail_process_FeedDataToForm(data) { -console.log(data); +//console.log(data); $("#date_from").val(formatDate(data.start_date)); $("#date_to").val(formatDate(data.end_date)); @@ -126,7 +126,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_process_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -135,7 +135,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -146,7 +146,7 @@ function eva_create_evaluation_detail_process_PutUpdate() { function eva_create_evaluation_detail_process_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_process_RefreshTable(); endLoad(); }; @@ -179,25 +179,23 @@ function setViewOfComment(status_supervisor, status_supervisor1A, status_supervi function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor, status_supervisor1A, status_supervisor2A){ - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); + $(".myeditor").attr("disabled", true); $("#btnb01").hide(); $("#btnb02").hide(); $("#btnb03").hide(); $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", true); $("#btnc01").hide(); $("#btnc02").hide(); $("#btnc03").hide(); $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", true); $("#btnd01").hide(); $("#btnd02").hide(); @@ -210,30 +208,26 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup $("#eva_create_evaluation_detail_review02_supervisor2_result").show(); if(status_chief === "Y" && status_self === "Y"){ - $("#btn01").show(); - $("#btn02").show(); - $("#btn03").show(); $("#btnb01").show(); $("#btnb02").show(); //$("#btnb03").show(); $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", false); //$("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", false); $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", false); + $(".myeditor").attr("disabled", false); }else{ $("#thestatus").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); } if(status_supervisor === "Y"){ - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); $("#btnb01").hide(); $("#btnb02").hide(); $("#btnb03").hide(); - $("#thestatus").text("(ผู้ประเมินสูงสุด ส่งแบบประเมินแล้ว)"); + $("#thestatus2").text("(ผู้ประเมินสูงสุด ส่งแบบประเมินแล้ว)"); $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", true); + $(".myeditor").attr("disabled", true); } } @@ -242,7 +236,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup if(status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){ $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", false); - $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", false); + //$("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", false); $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", false); $("#btnc01").show(); $("#btnc02").show(); @@ -253,7 +247,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup if(status_supervisor1A === "Y"){ $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", true); $("#btnc01").hide(); $("#btnc02").hide(); @@ -268,7 +262,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup if(status_supervisor1A === "Y" && status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){ $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", false); - $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", false); + //$("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", false); $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", false); $("#btnd01").show(); $("#btnd02").show(); @@ -278,7 +272,7 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup } if(status_supervisor2A === "Y"){ $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", true); + //$("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", true); $("#btnd01").hide(); $("#btnd02").hide(); diff --git a/wwwroot/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js b/wwwroot/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js index 32fa4df..6c9c907 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review01/eva_create_evaluation_detail_review01_d.js @@ -71,7 +71,7 @@ function eva_create_evaluation_detail_review01_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_review01_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -80,7 +80,7 @@ function eva_create_evaluation_detail_review01_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -91,7 +91,7 @@ function eva_create_evaluation_detail_review01_PutUpdate() { function eva_create_evaluation_detail_review01_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_review01_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js b/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js index b8de973..1984593 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js @@ -58,7 +58,7 @@ var eva_create_evaluation_detail_review02_customValidation = function (group) { return ""; }; -function eva_create_evaluation_detail_review02_PutUpdate() { +function eva_create_evaluation_detail_review02_PutUpdate(xx) { if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) { return; @@ -68,7 +68,8 @@ function eva_create_evaluation_detail_review02_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_review02_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); + if(xx) window.location.reload(); endLoad(); }; startLoad(); @@ -77,7 +78,7 @@ function eva_create_evaluation_detail_review02_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -88,7 +89,7 @@ function eva_create_evaluation_detail_review02_PutUpdate() { function eva_create_evaluation_detail_review02_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_review02_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03_d.js b/wwwroot/js/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03_d.js index 024bccd..4c31231 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review03/eva_create_evaluation_detail_review03_d.js @@ -58,7 +58,7 @@ var eva_create_evaluation_detail_review03_customValidation = function (group) { return ""; }; -function eva_create_evaluation_detail_review03_PutUpdate() { +function eva_create_evaluation_detail_review03_PutUpdate(xx) { if (!ValidateForm('eva_create_evaluation_detail_review03', eva_create_evaluation_detail_review03_customValidation)) { return; @@ -68,7 +68,8 @@ function eva_create_evaluation_detail_review03_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_review03_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); + if(xx) window.location.reload(); endLoad(); }; startLoad(); @@ -77,7 +78,7 @@ function eva_create_evaluation_detail_review03_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -88,7 +89,7 @@ function eva_create_evaluation_detail_review03_PutUpdate() { function eva_create_evaluation_detail_review03_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_review03_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04_d.js b/wwwroot/js/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04_d.js index c3715cd..aa841e8 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review04/eva_create_evaluation_detail_review04_d.js @@ -58,7 +58,7 @@ var eva_create_evaluation_detail_review04_customValidation = function (group) { return ""; }; -function eva_create_evaluation_detail_review04_PutUpdate() { +function eva_create_evaluation_detail_review04_PutUpdate(xx) { if (!ValidateForm('eva_create_evaluation_detail_review04', eva_create_evaluation_detail_review04_customValidation)) { return; @@ -68,7 +68,8 @@ function eva_create_evaluation_detail_review04_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_review04_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); + if(xx) window.location.reload(); endLoad(); }; startLoad(); @@ -77,7 +78,7 @@ function eva_create_evaluation_detail_review04_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -88,7 +89,7 @@ function eva_create_evaluation_detail_review04_PutUpdate() { function eva_create_evaluation_detail_review04_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_review04_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js b/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js index 730b692..d4274f0 100644 --- a/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js @@ -108,7 +108,8 @@ function eva_create_evaluation_detail_status_PutUpdate(a) { } var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); + window.location.reload(); endLoad(); }; startLoad(); @@ -118,7 +119,7 @@ function eva_create_evaluation_detail_status_PutUpdate(a) { function eva_create_evaluation_detail_status_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_status_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js b/wwwroot/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js index b7fc43a..d139d9e 100644 --- a/wwwroot/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_summary1/eva_create_evaluation_detail_summary1_d.js @@ -76,7 +76,7 @@ function eva_create_evaluation_detail_summary1_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_summary1_editMode === "UPDATE") { var successFunc1 = function (result) { - //AlertSuccess(result.code+" "+result.message); + //AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -85,7 +85,7 @@ function eva_create_evaluation_detail_summary1_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -96,7 +96,7 @@ function eva_create_evaluation_detail_summary1_PutUpdate() { function eva_create_evaluation_detail_summary1_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_summary1_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_create_evaluation_detail_summary2/eva_create_evaluation_detail_summary2_d.js b/wwwroot/js/eva_create_evaluation_detail_summary2/eva_create_evaluation_detail_summary2_d.js index 2220f85..8392160 100644 --- a/wwwroot/js/eva_create_evaluation_detail_summary2/eva_create_evaluation_detail_summary2_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_summary2/eva_create_evaluation_detail_summary2_d.js @@ -76,7 +76,7 @@ function eva_create_evaluation_detail_summary2_PutUpdate() { //Update Mode if (eva_create_evaluation_detail_summary2_editMode === "UPDATE") { var successFunc1 = function (result) { - //AlertSuccess(result.code+" "+result.message); + //AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -85,7 +85,7 @@ function eva_create_evaluation_detail_summary2_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -96,7 +96,7 @@ function eva_create_evaluation_detail_summary2_PutUpdate() { function eva_create_evaluation_detail_summary2_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_create_evaluation_detail_summary2_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_evaluation_achievement/eva_evaluation_achievement.js b/wwwroot/js/eva_evaluation_achievement/eva_evaluation_achievement.js index 537e963..a1831a8 100644 --- a/wwwroot/js/eva_evaluation_achievement/eva_evaluation_achievement.js +++ b/wwwroot/js/eva_evaluation_achievement/eva_evaluation_achievement.js @@ -124,7 +124,7 @@ function eva_evaluation_achievement_PutUpdate() { if (eva_evaluation_achievement_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_evaluation_achievementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_achievement_RefreshTable(); endLoad(); }; @@ -135,7 +135,7 @@ function eva_evaluation_achievement_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_evaluation_achievementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_achievement_RefreshTable(); endLoad(); }; @@ -148,7 +148,7 @@ function eva_evaluation_achievement_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_evaluation_achievementModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_achievement_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js index 407b4e2..9c9aace 100644 --- a/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js +++ b/wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js @@ -80,7 +80,7 @@ function eva_evaluation_achievement_process_Get(a, blankItem) { //tag += ''; //tag += ''; //tag += ''; - tag += ''; + tag += ''; tag += '

'; tag += ''; diff --git a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js index feae677..f075160 100644 --- a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js +++ b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js @@ -91,7 +91,7 @@ function eva_evaluation_achievement_process2_Get(a, blankItem) { //tag += ''; tag += '

'; tag += '

'; - tag += ''; + tag += ''; tag += '

'; tag += ''; $('#eva_evaluation_achievement_process2Body').append($(tag)); diff --git a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js index f15c2bb..a399d6c 100644 --- a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js +++ b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js @@ -119,7 +119,7 @@ function eva_evaluation_behavior_PutUpdate() { if (eva_evaluation_behavior_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_evaluation_behaviorModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_behavior_RefreshTable(); endLoad(); }; @@ -130,7 +130,7 @@ function eva_evaluation_behavior_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_evaluation_behaviorModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_behavior_RefreshTable(); endLoad(); }; @@ -143,7 +143,7 @@ function eva_evaluation_behavior_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_evaluation_behaviorModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_behavior_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js index dfde964..c511b2f 100644 --- a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js +++ b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js @@ -81,7 +81,7 @@ function eva_evaluation_behavior_process_Get(a, blankItem) { // tag += '

'; //tag += '

'; // tag += '

'; -tag += ''; +tag += ''; tag += '

'; tag += ''; diff --git a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js index 824f5df..82281ea 100644 --- a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js +++ b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js @@ -89,7 +89,7 @@ function eva_evaluation_behavior_process2_Get(a, blankItem) { tag += ''; tag += '

'; - tag += ''; + tag += ''; //tag += ''; //tag += ''; // tag += ''; @@ -97,7 +97,7 @@ function eva_evaluation_behavior_process2_Get(a, blankItem) { //tag += ''; tag += '

'; tag += '

'; -tag += ''; +tag += ''; tag += '

'; tag += ''; diff --git a/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js b/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js index 6d0dd8e..ff55ec4 100644 --- a/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js +++ b/wwwroot/js/eva_evaluation_group/eva_evaluation_group.js @@ -108,7 +108,7 @@ function eva_evaluation_group_PutUpdate() { if (eva_evaluation_group_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_evaluation_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_RefreshTable(); endLoad(); }; @@ -119,7 +119,7 @@ function eva_evaluation_group_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_evaluation_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_RefreshTable(); endLoad(); }; @@ -132,7 +132,7 @@ function eva_evaluation_group_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_evaluation_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js b/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js index eb8e114..54cd8f6 100644 --- a/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js +++ b/wwwroot/js/eva_evaluation_group/eva_evaluation_group_d.js @@ -62,7 +62,7 @@ function eva_evaluation_group_PutUpdate() { //Update Mode if (eva_evaluation_group_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -71,7 +71,7 @@ function eva_evaluation_group_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -82,7 +82,7 @@ function eva_evaluation_group_PutUpdate() { function eva_evaluation_group_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_evaluation_group_detail/eva_evaluation_group_detail.js b/wwwroot/js/eva_evaluation_group_detail/eva_evaluation_group_detail.js index b3b8bb9..0ea7459 100644 --- a/wwwroot/js/eva_evaluation_group_detail/eva_evaluation_group_detail.js +++ b/wwwroot/js/eva_evaluation_group_detail/eva_evaluation_group_detail.js @@ -111,7 +111,7 @@ function eva_evaluation_group_detail_PutUpdate() { if (eva_evaluation_group_detail_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_evaluation_group_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_detail_RefreshTable(); endLoad(); }; @@ -122,7 +122,7 @@ function eva_evaluation_group_detail_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_evaluation_group_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_detail_RefreshTable(); endLoad(); }; @@ -135,7 +135,7 @@ function eva_evaluation_group_detail_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_evaluation_group_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_evaluation_group_detail_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_idp_plan/eva_idp_plan.js b/wwwroot/js/eva_idp_plan/eva_idp_plan.js index e148539..0b7ae0f 100644 --- a/wwwroot/js/eva_idp_plan/eva_idp_plan.js +++ b/wwwroot/js/eva_idp_plan/eva_idp_plan.js @@ -114,7 +114,7 @@ function eva_idp_plan_PutUpdate() { if (eva_idp_plan_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_idp_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_RefreshTable(); endLoad(); }; @@ -125,7 +125,7 @@ function eva_idp_plan_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_idp_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_RefreshTable(); endLoad(); }; @@ -138,7 +138,7 @@ function eva_idp_plan_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_idp_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js b/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js index 6147d77..a985e67 100644 --- a/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js +++ b/wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js @@ -115,7 +115,7 @@ console.log(data); if (eva_idp_plan_owner_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_idp_plan_ownerModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_owner_RefreshTable(); endLoad(); }; @@ -126,7 +126,7 @@ console.log(data); else { var successFunc2 = function (result) { $("#eva_idp_plan_ownerModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_owner_RefreshTable(); endLoad(); }; @@ -139,7 +139,7 @@ function eva_idp_plan_owner_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_idp_plan_ownerModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_idp_plan_owner_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_level_score/eva_level_score.js b/wwwroot/js/eva_level_score/eva_level_score.js index d65a009..0711568 100644 --- a/wwwroot/js/eva_level_score/eva_level_score.js +++ b/wwwroot/js/eva_level_score/eva_level_score.js @@ -112,7 +112,7 @@ function eva_level_score_PutUpdate() { if (eva_level_score_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_level_scoreModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_RefreshTable(); endLoad(); }; @@ -123,7 +123,7 @@ function eva_level_score_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_level_scoreModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_RefreshTable(); endLoad(); }; @@ -136,7 +136,7 @@ function eva_level_score_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_level_scoreModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_level_score/eva_level_score_d.js b/wwwroot/js/eva_level_score/eva_level_score_d.js index 3f04e0e..44de390 100644 --- a/wwwroot/js/eva_level_score/eva_level_score_d.js +++ b/wwwroot/js/eva_level_score/eva_level_score_d.js @@ -66,7 +66,7 @@ function eva_level_score_PutUpdate() { //Update Mode if (eva_level_score_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -75,7 +75,7 @@ function eva_level_score_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -86,7 +86,7 @@ function eva_level_score_PutUpdate() { function eva_level_score_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_level_score_basic/eva_level_score_basic.js b/wwwroot/js/eva_level_score_basic/eva_level_score_basic.js index f9811f2..9da5115 100644 --- a/wwwroot/js/eva_level_score_basic/eva_level_score_basic.js +++ b/wwwroot/js/eva_level_score_basic/eva_level_score_basic.js @@ -112,7 +112,7 @@ function eva_level_score_basic_PutUpdate() { if (eva_level_score_basic_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_level_score_basicModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_basic_RefreshTable(); endLoad(); }; @@ -123,7 +123,7 @@ function eva_level_score_basic_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_level_score_basicModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_basic_RefreshTable(); endLoad(); }; @@ -136,7 +136,7 @@ function eva_level_score_basic_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_level_score_basicModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_level_score_basic_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan.js b/wwwroot/js/eva_performance_plan/eva_performance_plan.js index 40bab61..d80104e 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan.js @@ -110,7 +110,7 @@ function eva_performance_plan_PutUpdate() { if (eva_performance_plan_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_performance_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_RefreshTable(); endLoad(); }; @@ -121,7 +121,7 @@ function eva_performance_plan_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_performance_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_RefreshTable(); endLoad(); }; @@ -134,7 +134,7 @@ function eva_performance_plan_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_performance_planModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js index 02b750e..aa32e75 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js @@ -62,7 +62,7 @@ function eva_performance_plan_PutUpdate() { //Update Mode if (eva_performance_plan_editMode === "UPDATE") { var successFunc1 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -71,7 +71,7 @@ function eva_performance_plan_PutUpdate() { // Create mode else { var successFunc2 = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); endLoad(); }; startLoad(); @@ -82,7 +82,7 @@ function eva_performance_plan_PutUpdate() { function eva_performance_plan_GoDelete(a) { if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) { var successFunc = function (result) { - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_performance_plan_detail/eva_performance_plan_detail.js b/wwwroot/js/eva_performance_plan_detail/eva_performance_plan_detail.js index 1f243cc..18e6535 100644 --- a/wwwroot/js/eva_performance_plan_detail/eva_performance_plan_detail.js +++ b/wwwroot/js/eva_performance_plan_detail/eva_performance_plan_detail.js @@ -116,7 +116,7 @@ function eva_performance_plan_detail_PutUpdate() { if (eva_performance_plan_detail_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_performance_plan_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_detail_RefreshTable(); endLoad(); }; @@ -127,7 +127,7 @@ function eva_performance_plan_detail_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_performance_plan_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_detail_RefreshTable(); endLoad(); }; @@ -140,7 +140,7 @@ function eva_performance_plan_detail_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_performance_plan_detailModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_performance_plan_detail_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js b/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js index ed21a1b..52df2ba 100644 --- a/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js +++ b/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js @@ -116,7 +116,7 @@ function eva_promoted_percentage_PutUpdate() { if (eva_promoted_percentage_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_promoted_percentageModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_promoted_percentage_RefreshTable(); endLoad(); }; @@ -127,7 +127,7 @@ function eva_promoted_percentage_PutUpdate() { else { var successFunc2 = function (result) { $("#eva_promoted_percentageModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_promoted_percentage_RefreshTable(); endLoad(); }; @@ -140,7 +140,7 @@ function eva_promoted_percentage_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_promoted_percentageModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); eva_promoted_percentage_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/external_employee/external_employee.js b/wwwroot/js/external_employee/external_employee.js index 21e6c64..c41af87 100644 --- a/wwwroot/js/external_employee/external_employee.js +++ b/wwwroot/js/external_employee/external_employee.js @@ -102,7 +102,7 @@ function external_employee_PutUpdate() { if (external_employee_editMode === "UPDATE") { var successFunc1 = function (result) { $("#external_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); external_employee_RefreshTable(); external_employee_AfterUpdate(result.id); endLoad(); @@ -114,7 +114,7 @@ function external_employee_PutUpdate() { else { var successFunc2 = function (result) { $("#external_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); external_employee_RefreshTable(); external_employee_AfterInsert(result.id); endLoad(); @@ -128,7 +128,7 @@ function external_employee_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#external_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); external_employee_RefreshTable(); external_employee_AfterDelete(a); endLoad(); diff --git a/wwwroot/js/search_employee/search_employee.js b/wwwroot/js/search_employee/search_employee.js index 278c140..a29f38a 100644 --- a/wwwroot/js/search_employee/search_employee.js +++ b/wwwroot/js/search_employee/search_employee.js @@ -122,7 +122,7 @@ function search_employee_PutUpdate() { if (search_employee_editMode === "UPDATE") { var successFunc1 = function (result) { $("#search_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_RefreshTable(); endLoad(); }; @@ -133,7 +133,7 @@ function search_employee_PutUpdate() { else { var successFunc2 = function (result) { $("#search_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_RefreshTable(); endLoad(); }; @@ -146,7 +146,7 @@ function search_employee_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#search_employeeModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_RefreshTable(); endLoad(); }; diff --git a/wwwroot/js/search_employee_for_group/search_employee_for_group.js b/wwwroot/js/search_employee_for_group/search_employee_for_group.js index 3621b92..9f550f8 100644 --- a/wwwroot/js/search_employee_for_group/search_employee_for_group.js +++ b/wwwroot/js/search_employee_for_group/search_employee_for_group.js @@ -122,7 +122,7 @@ function search_employee_for_group_PutUpdate() { if (search_employee_for_group_editMode === "UPDATE") { var successFunc1 = function (result) { $("#search_employee_for_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_for_group_RefreshTable(); endLoad(); }; @@ -133,7 +133,7 @@ function search_employee_for_group_PutUpdate() { else { var successFunc2 = function (result) { $("#search_employee_for_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_for_group_RefreshTable(); endLoad(); }; @@ -146,7 +146,7 @@ function search_employee_for_group_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#search_employee_for_groupModel").modal("hide"); - AlertSuccess(result.code+" "+result.message); + AlertSuccess(result.message); search_employee_for_group_RefreshTable(); endLoad(); };