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 8050406..3e8f47a 100644
--- a/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs
+++ b/Models/eva_evaluation_achievement_process/eva_evaluation_achievement_processService.cs
@@ -216,11 +216,11 @@ namespace TodoAPI2.Models
existingEntity.sumary = 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;
- //existingEntity.target_score4 = i.target_score4;
- //existingEntity.target_score5 = i.target_score5;
+ existingEntity.target_score1 = i.target_score1;
+ existingEntity.target_score2 = i.target_score2;
+ existingEntity.target_score3 = i.target_score3;
+ existingEntity.target_score4 = i.target_score4;
+ existingEntity.target_score5 = i.target_score5;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}
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 4df49ff..9fb3501 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
@@ -365,11 +365,11 @@
-
+
-
+
-
+
@@ -436,7 +436,6 @@
}
function searchVacation_FeedDataToForm(data) {
-
$("#sum_day_sick_leave").text(data.sum_day_sick_leave);
$("#count_sick_leave").text(data.count_sick_leave);
$("#sum_day_personal_leave").text(data.sum_day_personal_leave);
@@ -447,7 +446,18 @@
$("#count_absence_tad_processing_time_results").text(data.count_absence_tad_processing_time_results);
$("#sum_day_sick_personal_leave").text(data.sum_day_sick_personal_leave);
$("#count_sick_personal_leave").text(data.count_sick_personal_leave);
+ }
+ function saveStatus(s){
+ saveAll();
+ eva_create_evaluation_detail_status_PutUpdate(s);
+ }
+
+ function saveAll(){
+ eva_evaluation_achievement_process_Save(getUrlParameter('id'));
+ eva_evaluation_behavior_process_Save(getUrlParameter('id'));
+ eva_create_evaluation_detail_summary1_PutUpdate();
+ eva_create_evaluation_detail_review01_PutUpdate();
}
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 c4502e3..385ea12 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
@@ -223,7 +223,7 @@
| ลำดับ |
- |
+ |
|
|
@@ -232,10 +232,10 @@
|
|
- |
- |
- |
- |
+ |
+ |
+ |
+ |
@@ -243,19 +243,19 @@
| รวม |
- |
- |
+ |
+ |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
@@ -492,11 +492,11 @@
-
+
-
+
-
+
@@ -542,11 +542,11 @@
-
+
-
+
-
+
@@ -590,11 +590,11 @@
-
+
-
+
-
+
@@ -723,6 +723,31 @@
$("#count_sick_personal_leave").text(data.count_sick_personal_leave);
}
+
+ function saveReview02(){
+ saveAll();
+ eva_create_evaluation_detail_review02_PutUpdate();
+ }
+
+ function saveReview03(){
+ saveAll();
+ eva_create_evaluation_detail_review03_PutUpdate();
+ }
+
+ function saveReview04(){
+ saveAll();
+ eva_create_evaluation_detail_review04_PutUpdate();
+ }
+
+ function saveStatus(s){
+ saveAll();
+ }
+
+ function saveAll(){
+ eva_evaluation_achievement_process2_Save(getUrlParameter('id'));
+ eva_evaluation_behavior_process2_Save(getUrlParameter('id'));
+ eva_create_evaluation_detail_summary2_PutUpdate();
+ }
}
diff --git a/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml b/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml
index 6d51e70..14e3990 100644
--- a/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml
+++ b/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml
@@ -33,12 +33,12 @@
-
+
-
+
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 d6ea2d9..d24cb40 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.code+" "+result.message);
endLoad();
};
startLoad();
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 38189ee..40e7c0d 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.code+" "+result.message);
endLoad();
};
startLoad();
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 9860304..03976b7 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
@@ -6,11 +6,11 @@ $("#eva_evaluation_achievement_process_achievement_" + i).text("");
$("#eva_evaluation_achievement_process_weight_" + i).text("");
$("#eva_evaluation_achievement_process_score_" + i).val("");
$("#eva_evaluation_achievement_process_sumary_" + i).text("");
-$("#eva_evaluation_achievement_process_target_score1_" + i).text("");
-$("#eva_evaluation_achievement_process_target_score2_" + i).text("");
-$("#eva_evaluation_achievement_process_target_score3_" + i).text("");
-$("#eva_evaluation_achievement_process_target_score4_" + i).text("");
-$("#eva_evaluation_achievement_process_target_score5_" + i).text("");
+$("#eva_evaluation_achievement_process_target_score1_" + i).val("");
+$("#eva_evaluation_achievement_process_target_score2_" + i).val("");
+$("#eva_evaluation_achievement_process_target_score3_" + i).val("");
+$("#eva_evaluation_achievement_process_target_score4_" + i).val("");
+$("#eva_evaluation_achievement_process_target_score5_" + i).val("");
}
@@ -22,11 +22,11 @@ $("#eva_evaluation_achievement_process_achievement_" + i).text(data.achievement)
$("#eva_evaluation_achievement_process_weight_" + i).text(data.weight);
$("#eva_evaluation_achievement_process_score_" + i).val(data.score);
$("#eva_evaluation_achievement_process_sumary_" + i).text(data.sumary);
-$("#eva_evaluation_achievement_process_target_score1_" + i).text(data.target_score1);
-$("#eva_evaluation_achievement_process_target_score2_" + i).text(data.target_score2);
-$("#eva_evaluation_achievement_process_target_score3_" + i).text(data.target_score3);
-$("#eva_evaluation_achievement_process_target_score4_" + i).text(data.target_score4);
-$("#eva_evaluation_achievement_process_target_score5_" + i).text(data.target_score5);
+$("#eva_evaluation_achievement_process_target_score1_" + i).val(data.target_score1);
+$("#eva_evaluation_achievement_process_target_score2_" + i).val(data.target_score2);
+$("#eva_evaluation_achievement_process_target_score3_" + i).val(data.target_score3);
+$("#eva_evaluation_achievement_process_target_score4_" + i).val(data.target_score4);
+$("#eva_evaluation_achievement_process_target_score5_" + i).val(data.target_score5);
}
@@ -38,11 +38,11 @@ eva_evaluation_achievement_processObject.achievement = obj.find("#eva_evaluation
eva_evaluation_achievement_processObject.weight = obj.find("#eva_evaluation_achievement_process_weight_" + i).text();
eva_evaluation_achievement_processObject.score = obj.find("#eva_evaluation_achievement_process_score_" + i).val();
eva_evaluation_achievement_processObject.sumary = obj.find("#eva_evaluation_achievement_process_sumary_" + i).text();
-eva_evaluation_achievement_processObject.target_score1 = obj.find("#eva_evaluation_achievement_process_target_score1_" + i).text();
-eva_evaluation_achievement_processObject.target_score2 = obj.find("#eva_evaluation_achievement_process_target_score2_" + i).text();
-eva_evaluation_achievement_processObject.target_score3 = obj.find("#eva_evaluation_achievement_process_target_score3_" + i).text();
-eva_evaluation_achievement_processObject.target_score4 = obj.find("#eva_evaluation_achievement_process_target_score4_" + i).text();
-eva_evaluation_achievement_processObject.target_score5 = obj.find("#eva_evaluation_achievement_process_target_score5_" + i).text();
+eva_evaluation_achievement_processObject.target_score1 = obj.find("#eva_evaluation_achievement_process_target_score1_" + i).val();
+eva_evaluation_achievement_processObject.target_score2 = obj.find("#eva_evaluation_achievement_process_target_score2_" + i).val();
+eva_evaluation_achievement_processObject.target_score3 = obj.find("#eva_evaluation_achievement_process_target_score3_" + i).val();
+eva_evaluation_achievement_processObject.target_score4 = obj.find("#eva_evaluation_achievement_process_target_score4_" + i).val();
+eva_evaluation_achievement_processObject.target_score5 = obj.find("#eva_evaluation_achievement_process_target_score5_" + i).val();
eva_evaluation_achievement_processObject.active_mode = obj.find("#isActive_" + i + "_eva_evaluation_achievement_process").val();
return eva_evaluation_achievement_processObject;
@@ -58,7 +58,7 @@ function eva_evaluation_achievement_process_Save(id) {
});
var successFunc = function (result) {
- AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
+ //AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
endLoad();
};
startLoad();
@@ -75,11 +75,11 @@ function eva_evaluation_achievement_process_Get(a, blankItem) {
tag += ' | ';
tag += ' | ';
tag += ' | ';
- tag += 'ร้อยละ 60-69 | ';
- tag += 'ร้อยละ 70-79 | ';
- tag += 'ร้อยละ 80 | ';
- tag += 'ร้อยละ 81-90 | ';
- tag += 'ร้อยละ 91-100 | ';
+ 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 b47cd25..32a3eef 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
@@ -8,11 +8,11 @@ $("#eva_evaluation_achievement_process2_weight_" + i).text("");
$("#eva_evaluation_achievement_process2_score_" + i).text("");
$("#eva_evaluation_achievement_process2_score2_" + i).val("");
$("#eva_evaluation_achievement_process2_sumary2_" + i).text("");
-$("#eva_evaluation_achievement_process2_target_score1_" + i).text("");
-$("#eva_evaluation_achievement_process2_target_score2_" + i).text("");
-$("#eva_evaluation_achievement_process2_target_score3_" + i).text("");
-$("#eva_evaluation_achievement_process2_target_score4_" + i).text("");
-$("#eva_evaluation_achievement_process2_target_score5_" + i).text("");
+$("#eva_evaluation_achievement_process2_target_score1_" + i).val("");
+$("#eva_evaluation_achievement_process2_target_score2_" + i).val("");
+$("#eva_evaluation_achievement_process2_target_score3_" + i).val("");
+$("#eva_evaluation_achievement_process2_target_score4_" + i).val("");
+$("#eva_evaluation_achievement_process2_target_score5_" + i).val("");
}
@@ -27,11 +27,11 @@ $("#eva_evaluation_achievement_process2_score_" + i).text(data.score);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary);
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2);
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary2);
-$("#eva_evaluation_achievement_process2_target_score1_" + i).text(data.target_score1);
-$("#eva_evaluation_achievement_process2_target_score2_" + i).text(data.target_score2);
-$("#eva_evaluation_achievement_process2_target_score3_" + i).text(data.target_score3);
-$("#eva_evaluation_achievement_process2_target_score4_" + i).text(data.target_score4);
-$("#eva_evaluation_achievement_process2_target_score5_" + i).text(data.target_score5);
+$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1);
+$("#eva_evaluation_achievement_process2_target_score2_" + i).val(data.target_score2);
+$("#eva_evaluation_achievement_process2_target_score3_" + i).val(data.target_score3);
+$("#eva_evaluation_achievement_process2_target_score4_" + i).val(data.target_score4);
+$("#eva_evaluation_achievement_process2_target_score5_" + i).val(data.target_score5);
}
@@ -45,11 +45,11 @@ eva_evaluation_achievement_process2Object.weight = obj.find("#eva_evaluation_ach
eva_evaluation_achievement_process2Object.score = obj.find("#eva_evaluation_achievement_process2_score_" + i).text();
eva_evaluation_achievement_process2Object.score2 = obj.find("#eva_evaluation_achievement_process2_score2_" + i).val();
eva_evaluation_achievement_process2Object.sumary2 = obj.find("#eva_evaluation_achievement_process2_sumary2_" + i).text();
-eva_evaluation_achievement_process2Object.target_score1 = obj.find("#eva_evaluation_achievement_process2_target_score1_" + i).text();
-eva_evaluation_achievement_process2Object.target_score2 = obj.find("#eva_evaluation_achievement_process2_target_score2_" + i).text();
-eva_evaluation_achievement_process2Object.target_score3 = obj.find("#eva_evaluation_achievement_process2_target_score3_" + i).text();
-eva_evaluation_achievement_process2Object.target_score4 = obj.find("#eva_evaluation_achievement_process2_target_score4_" + i).text();
-eva_evaluation_achievement_process2Object.target_score5 = obj.find("#eva_evaluation_achievement_process2_target_score5_" + i).text();
+eva_evaluation_achievement_process2Object.target_score1 = obj.find("#eva_evaluation_achievement_process2_target_score1_" + i).val();
+eva_evaluation_achievement_process2Object.target_score2 = obj.find("#eva_evaluation_achievement_process2_target_score2_" + i).val();
+eva_evaluation_achievement_process2Object.target_score3 = obj.find("#eva_evaluation_achievement_process2_target_score3_" + i).val();
+eva_evaluation_achievement_process2Object.target_score4 = obj.find("#eva_evaluation_achievement_process2_target_score4_" + i).val();
+eva_evaluation_achievement_process2Object.target_score5 = obj.find("#eva_evaluation_achievement_process2_target_score5_" + i).val();
eva_evaluation_achievement_process2Object.active_mode = obj.find("#isActive_" + i + "_eva_evaluation_achievement_process2").val();
return eva_evaluation_achievement_process2Object;
@@ -65,7 +65,7 @@ function eva_evaluation_achievement_process2_Save(id) {
});
var successFunc = function (result) {
- AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
+ //AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
endLoad();
};
startLoad();
@@ -84,11 +84,11 @@ function eva_evaluation_achievement_process2_Get(a, blankItem) {
tag += ' | ';
tag += ' | ';
tag += ' | ';
- tag += 'ร้อยละ 60-69 | ';
- tag += 'ร้อยละ 70-79 | ';
- tag += 'ร้อยละ 80 | ';
- tag += 'ร้อยละ 81-90 | ';
- tag += 'ร้อยละ 91-100 | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
tag += ' | ';
tag += ' | ';
tag += ' | ';
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 15b64a2..ae29891 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
@@ -57,7 +57,7 @@ function eva_evaluation_behavior_process_Save(id) {
});
var successFunc = function (result) {
- AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
+ //AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
endLoad();
};
startLoad();
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 498e6ad..b8fa40e 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
@@ -71,7 +71,7 @@ function eva_evaluation_behavior_process2_Save(id) {
});
var successFunc = function (result) {
- AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
+ //AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
endLoad();
};
startLoad();