แก้ไข OP2596

2020-05-04 20:50:12 +07:00
parent 69b0b48bc4
commit 94f50c3953
10 changed files with 117 additions and 82 deletions
--- 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();
--- 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();
--- 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 += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_evaluation_achievement_process" value="1" /><input class="form-control" type="hidden" id="eva_evaluation_achievement_process_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_evaluation_achievement_process_create_evaluation_detail_id_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process_achievement_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process_weight_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_evaluation_achievement_process_target_score1_' + (i + 1)+'">ร้อยละ<br/> 60-69</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process_target_score2_' + (i + 1)+'">ร้อยละ<br/> 70-79</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process_target_score3_' + (i + 1)+'">ร้อยละ<br/> 80</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process_target_score4_' + (i + 1)+'">ร้อยละ<br/> 81-90</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process_target_score5_' + (i + 1)+'">ร้อยละ<br/> 91-100</p></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process_target_score1_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process_target_score2_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process_target_score3_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process_target_score4_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process_target_score5_' + (i + 1)+'"/></td>';
 tag += '<td><input class="form-control" type="number" min="0" max="5" step=".01" onchange="javascript:Oneva_evaluation_achievement_process_scoreChange();" id="eva_evaluation_achievement_process_score_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process_sumary_' + (i + 1)+'" /></td>';

--- 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 += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_evaluation_achievement_process2" value="1" /><input class="form-control" type="hidden" id="eva_evaluation_achievement_process2_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_evaluation_achievement_process2_create_evaluation_detail_id_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process2_achievement_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process2_weight_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_evaluation_achievement_process2_target_score1_' + (i + 1)+'">ร้อยละ<br/> 60-69</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process2_target_score2_' + (i + 1)+'">ร้อยละ<br/> 70-79</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process2_target_score3_' + (i + 1)+'">ร้อยละ<br/> 80</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process2_target_score4_' + (i + 1)+'">ร้อยละ<br/> 81-90</p></td>';
- tag += '<td><p id="eva_evaluation_achievement_process2_target_score5_' + (i + 1)+'">ร้อยละ<br/> 91-100</p></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process2_target_score1_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process2_target_score2_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process2_target_score3_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process2_target_score4_' + (i + 1)+'"/></td>';
+ tag += '<td><input class="form-control" id="eva_evaluation_achievement_process2_target_score5_' + (i + 1)+'"/></td>';
 tag += '<td><p id="eva_evaluation_achievement_process2_score_' + (i + 1)+'" /></td>';
 tag += '<td><p id="eva_evaluation_achievement_process2_sumary_' + (i + 1)+'" /></td>';
 tag += '<td><input class="form-control" type="number" min="0" max="5" step=".01" onchange="javascript:Oneva_evaluation_achievement_process2_scoreChange();" id="eva_evaluation_achievement_process2_score2_' + (i + 1)+'" /></td>';
--- 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();
--- 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();