diff --git a/EXCEL/eva_evaluation_behavior.xlsx b/EXCEL/eva_evaluation_behavior.xlsx index 26255b8..b41ded1 100644 Binary files a/EXCEL/eva_evaluation_behavior.xlsx and b/EXCEL/eva_evaluation_behavior.xlsx differ diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs index 1636267..7c1aca7 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs @@ -239,14 +239,15 @@ namespace TodoAPI2.Models throw new Exception("ผู้รับการประเมิน ส่งแบบประเมินไปแล้ว บันทึกไม่ได้"); } - existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id; - existingEntity.behavior = i.behavior; existingEntity.weight = i.weight; - 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.create_evaluation_detail_id = i.create_evaluation_detail_id; + //existingEntity.behavior = i.behavior; + //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_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml index d75552d..fee3847 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml @@ -312,9 +312,9 @@ - - - + + + @@ -343,28 +343,31 @@
+
พฤติกรรมการปฏิบัติงาน (น้ำหนัก %)
เครื่องมือเครื่องมือ
- + - + - + - +
เครื่องมือลำดับ
รวมน้ำหนัก
+ -
+
+
@@ -410,7 +413,7 @@
- + @@ -426,6 +429,7 @@ + @@ -439,8 +443,7 @@ eva_create_evaluation_detail_agreement_SetEditForm(id); eva_evaluation_achievement_InitiateDataTable(id); eva_evaluation_achievement_InitialForm(); - eva_evaluation_behavior_InitiateDataTable(id); - eva_evaluation_behavior_InitialForm(); + eva_evaluation_behavior_InitialForm(id); eva_create_evaluation_detail_status_SetEditForm(id); eva_idp_plan_owner_InitiateDataTable(id); eva_idp_plan_owner_InitialForm(); @@ -459,10 +462,11 @@ }); function CheckPermission() { - if (status_self === "Y") { - $(".status_self").hide(); - $("#status").text("คุณส่งแบบประเมินไปแล้ว"); - } + //if (status_self === "Y") { + // $(".status_self").hide(); + // $(".status_self_text").attr("disabled", true); + // $("#status").text("คุณส่งแบบประเมินไปแล้ว"); + //} } function OnWeightChanged(c) { @@ -482,6 +486,17 @@ } } + function cal_behavior_total() { + var w1 = 0; + $('#eva_evaluation_behaviorBody tr').each(function () { + var i = $(this).find("#rowCount").text(); + var eva_evaluation_behavior = eva_evaluation_behavior_GetFromForm($(this), i); + w1 += parseFloat(eva_evaluation_behavior.weight); + }); + $("#sum_weight_eva_evaluation_behavior").text(w1); + //console.log(w1); + } + function print_report() { var eva_create_evaluation_detail_selectitem = []; eva_create_evaluation_detail_selectitem.push(getUrlParameter("id")); diff --git a/tb320eva.csproj b/tb320eva.csproj index 92e7e82..d8c573c 100644 --- a/tb320eva.csproj +++ b/tb320eva.csproj @@ -69,6 +69,11 @@ + + + + + diff --git a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior_inline.js b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior_inline.js new file mode 100644 index 0000000..37e87f5 --- /dev/null +++ b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior_inline.js @@ -0,0 +1,142 @@ +function eva_evaluation_behavior_ClearForm(i, blankItem) { + var data = blankItem; + $("#eva_evaluation_behavior_id_" + i).val(""); + $("#eva_evaluation_behavior_create_evaluation_detail_id_" + i).val(""); + $("#eva_evaluation_behavior_behavior_" + i).text(""); + $("#eva_evaluation_behavior_weight_" + i).val(""); + $("#eva_evaluation_behavior_score_" + i).val(""); + $("#eva_evaluation_behavior_score2_" + i).val(""); + $("#eva_evaluation_behavior_sumary_" + i).text(""); + $("#eva_evaluation_behavior_sumary2_" + i).text(""); + $("#eva_evaluation_behavior_target_score1_" + i).val(""); + $("#eva_evaluation_behavior_target_score2_" + i).val(""); + $("#eva_evaluation_behavior_target_score3_" + i).val(""); + $("#eva_evaluation_behavior_target_score4_" + i).val(""); + $("#eva_evaluation_behavior_target_score5_" + i).val(""); + +} + +function eva_evaluation_behavior_FeedDataToForm(data, i, blankItem) { + $("#eva_evaluation_behavior_id_" + i).val(data.id); + $("#eva_evaluation_behavior_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id); + $("#eva_evaluation_behavior_behavior_" + i).text(data.behavior); + $("#eva_evaluation_behavior_weight_" + i).val(data.weight); + $("#eva_evaluation_behavior_score_" + i).val(data.score); + $("#eva_evaluation_behavior_score2_" + i).val(data.score2); + $("#eva_evaluation_behavior_sumary_" + i).text(data.sumary); + $("#eva_evaluation_behavior_sumary2_" + i).text(data.sumary2); + $("#eva_evaluation_behavior_target_score1_" + i).val(data.target_score1); + $("#eva_evaluation_behavior_target_score2_" + i).val(data.target_score2); + $("#eva_evaluation_behavior_target_score3_" + i).val(data.target_score3); + $("#eva_evaluation_behavior_target_score4_" + i).val(data.target_score4); + $("#eva_evaluation_behavior_target_score5_" + i).val(data.target_score5); + +} + +function eva_evaluation_behavior_GetFromForm(obj, i) { + var eva_evaluation_behaviorObject = new Object(); + eva_evaluation_behaviorObject.id = obj.find("#eva_evaluation_behavior_id_" + i).val(); + eva_evaluation_behaviorObject.create_evaluation_detail_id = obj.find("#eva_evaluation_behavior_create_evaluation_detail_id_" + i).val(); + eva_evaluation_behaviorObject.behavior = obj.find("#eva_evaluation_behavior_behavior_" + i).text(); + eva_evaluation_behaviorObject.weight = obj.find("#eva_evaluation_behavior_weight_" + i).val(); + eva_evaluation_behaviorObject.score = obj.find("#eva_evaluation_behavior_score_" + i).val(); + eva_evaluation_behaviorObject.score2 = obj.find("#eva_evaluation_behavior_score2_" + i).val(); + eva_evaluation_behaviorObject.sumary = obj.find("#eva_evaluation_behavior_sumary_" + i).text(); + eva_evaluation_behaviorObject.sumary2 = obj.find("#eva_evaluation_behavior_sumary2_" + i).text(); + eva_evaluation_behaviorObject.target_score1 = obj.find("#eva_evaluation_behavior_target_score1_" + i).val(); + eva_evaluation_behaviorObject.target_score2 = obj.find("#eva_evaluation_behavior_target_score2_" + i).val(); + eva_evaluation_behaviorObject.target_score3 = obj.find("#eva_evaluation_behavior_target_score3_" + i).val(); + eva_evaluation_behaviorObject.target_score4 = obj.find("#eva_evaluation_behavior_target_score4_" + i).val(); + eva_evaluation_behaviorObject.target_score5 = obj.find("#eva_evaluation_behavior_target_score5_" + i).val(); + + eva_evaluation_behaviorObject.active_mode = obj.find("#isActive_" + i + "_eva_evaluation_behavior").val(); + return eva_evaluation_behaviorObject; +} + + + +function eva_evaluation_behavior_GetAllData() { + //Insert eva_evaluation_behavior List + var eva_evaluation_behavior = []; + $('#eva_evaluation_behaviorBody tr').each(function () { + var i = $(this).find("#rowCount").text(); + var eacheva_evaluation_behavior = eva_evaluation_behavior_GetFromForm($(this), i); + eva_evaluation_behavior.push(eacheva_evaluation_behavior); + }); + return eva_evaluation_behavior; +} + +function eva_evaluation_behavior_Save(id) { + //Insert eva_evaluation_behavior List + var eva_evaluation_behavior = eva_evaluation_behavior_GetAllData(); + + var successFunc = function (result) { + AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว"); + endLoad(); + }; + startLoad(); + AjaxPutRequest(apisite + '/api/eva_evaluation_behavior/UpdateMultiple', eva_evaluation_behavior, successFunc, AlertDanger); +} + +function eva_evaluation_behavior_Get(id, blankItem) { + + $('#eva_evaluation_behaviorBody').empty(); + + var successFunc = function (response) { + //console.log(response); + $.each(response, function (i, data) { + var tag = ''; + tag += ''; + tag += '

'; + tag += ''; + + tag += ''; + $('#eva_evaluation_behaviorBody').append($(tag)); + eva_evaluation_behavior_FeedDataToForm(data, (i + 1), blankItem); + }); + eva_evaluation_behavior_Summary(); + endLoad(); + }; + startLoad(); + AjaxGetRequest(apisite + '/api/eva_evaluation_behavior?create_evaluation_detail_id=' + getUrlParameter("id"), successFunc, AlertDanger); + +} + + + +function eva_evaluation_behavior_Removeeva_evaluation_behavior(e) { + if (confirm('กรุณากดตกลง เพื่อยืนยันการลบ?')) { + $(e).closest('tr').find("input,select,textarea").attr('disabled', true); + $(e).closest('tr').find("input,select,textarea").css({ opacity: '0.5' }); + $(e).hide(); + $(e).closest('tr').find("#restoreBtn").show(); + $(e).closest('tr').find("input").first().val("0"); + console.log($(e).closest('tr').find("input").first().val()); + eva_evaluation_behavior_Summary(); + } +} + +function eva_evaluation_behavior_Restoreeva_evaluation_behavior(e) { + if (confirm('กรุณากดตกลง เพื่อยืนยันการกู้คืน?')) { + $(e).closest('tr').find("input,select,textarea").attr('disabled', false); + $(e).closest('tr').find("input,select,textarea").css({ opacity: '1' }); + $(e).hide(); + $(e).closest('tr').find("#removeBtn").show(); + $(e).closest('tr').find("input").first().val("1"); + console.log($(e).closest('tr').find("input").first().val()); + eva_evaluation_behavior_Summary(); + } +} + +function eva_evaluation_behavior_Summary() { + cal_behavior_total(); +} + +function eva_evaluation_behavior_InitialForm(id) { + var successFunc = function (result) { + eva_evaluation_behavior_Get(id, result); + endLoad(); + }; + startLoad(); + AjaxGetRequest(apisite + "/api/eva_evaluation_behavior/" + "GetBlankItem", successFunc, AlertDanger); +}