From b3c7cd12d8b75dc16e4f96880be793991a12e97c Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Mon, 6 Apr 2020 16:40:05 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=20=E0=B9=82?= =?UTF-8?q?=E0=B8=94=E0=B8=A2=E0=B8=95=E0=B9=89=E0=B8=99=20=E0=B8=99?= =?UTF-8?q?=E0=B8=84=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_evaluation_behavior.xlsx | Bin 10918 -> 10925 bytes .../eva_create_evaluation_detailService.cs | 2 +- .../eva_evaluation_behaviorInputModel.cs | 10 +++++ .../eva_evaluation_behaviorService.cs | 17 +++++++- .../eva_evaluation_behaviorViewModel.cs | 10 +++++ .../external_linkageService.cs | 2 +- ...reate_evaluation_detail_agreement_d.cshtml | 39 ++++++++++++------ ..._evaluation_achievement_process2_inline.js | 4 +- .../eva_evaluation_behavior.js | 15 +++++-- .../eva_evaluation_behavior_process_inline.js | 10 ++--- ...eva_evaluation_behavior_process2_inline.js | 2 +- 11 files changed, 82 insertions(+), 29 deletions(-) diff --git a/EXCEL/eva_evaluation_behavior.xlsx b/EXCEL/eva_evaluation_behavior.xlsx index a52e2dfed7bc826ce54abdbc0c9ea6f2c2f27692..26255b8ada76048f589a50c95c7f9a7712d6ea17 100644 GIT binary patch delta 2619 zcmV-B3dHrMRjpO9zzYeXW=qjv0ssKClgSGne`^y#6nz)`56iyWO{0|}n+;eEO0@`0 zpTlJLnjM&(jXSex;**7f`s9l~q=MiF2#QcY9wz^0eu{UeEylU2;6vUfXJ*bh_uM<# zxH~OGFo8<(Qg*`4jaC?dOv{YRQ71g;_pWV+fznK7Oq3Ej;S5yRO|D*vmC^y;m8uiw ze_D@kMUhH#D45zP#~^X%aak2i!kHkZv9B5iFkzx*O)!HD zG~;5xiHoH(EX_Ggpa7{?96SU*%C)bw(xf$SoNcV7F(07DAicyAC7ipef4Usze=dq6 z|Iq&sW{~29iLTE3g@vdU5^Mnpdu0C(b{n(e%!x zG5388A!id_R;06OS&><`=GdB3yFgWphH$C6c}p}>wDj3I{O4`WsuAdcYJ@i_$zOLb zT8vd6+r^8EcAr}F+Le4_7tfj;Th0ds)Tr1_4>M03GuS(jdiIK z;$_vXb*U2K2W$w!SL?%6-!7+nbpaJ8|H|HU2c&CmG%tbaVfPqTjMVDau!7bRQ2e}z zKea{p)lGf_lc56?vrP_k3>`0d(tY8Ds! zIHLubyPu?Xzu*1(%k4X@Ug{$u%mEKYJ$H|cl{cPOCr6UU^?;V70L_6`dCcHv_3YJu zWkuqBW0YrJFdR<3JWdN&c(|#);)5OzX+oAXdCf_|gp-P7F@yEj$F!`aw>u~;`D1G6; z4Ty%|vTgv}Wt_0|jogzgo4YH20yX@%iNgPf5MCEU{a?llo0|PzIeT)5Uo-XxeP5IG z`N$yfc+fbLP#hP3+MkYx(*S}euQj9jKSJa41$34{YYEr)RzDn!rla86zhF6PE#WFH z!AVc3accnA{}~EWXwrjgYZ*)i-5Q@r&BBzE(;I%;I)SSU5BFBjdaqgoxJm2IV&MC#50IkDALzs$<+GE zx^eN`g*&f*%OpUAEd&Jqo*;;^dkNw5fVacawDD0bSJ)=B*r4h@V4JlNz}?)f%|~n7 zm>K%G6w)nkThx@>9^FpWomxbr9hkMz&c!{iUO<9o3^%k(fkFqW z=E{Tws4}6&3oZnXycPnr5CQ7d&E=dU>DE>VRfkr8yi;{&3IR8(tq@#1cVWDqSVrBk z5D>KxJ}!iS1kK#@heMS4QmWr(udPd z)13^p=I3uK$}>aG94>~3hkDbZ(YFu~t@#lj_tHx@bFg5A1)&+(U>V!2g+OB&jfld;f;+F*{V9^dZ+46cd|w@JpXMZbFofxfJqjRUXrDkj$|xYVL@mH9-|rbfNj=7 zpprbo)8leJk%VxPQOK>T!zA17G?IZN8_8U(lRU;_TtIqBmR>rNv0#M-p(QXT8QZLd zKqYyMpOqH3Xw*d#Vk24A;Sp`O(@5qURLi)3;9{NR5vt%qKzd1*UOJMoV1)&t8Q2&X z*k&yRS|=kWHkb2>B*aFtszak>XSdTxhK+!YWG+UXjGu!7(o3@R(vge>D=Y{tf$@_M z+pL8^>tr@WFHP+Y%Di&)XON_MT=2+Hr_WnKYZ=M1l`7e z%TC?Ba2S%%vXlwBtsV@kbt}>O8x5Y#7m|#$1km!gni3CdO?l>#=%dYQw@DS-CH2i? zgn};`+qv6Mzw~p4eyKjuk0oInMqP?YKek%8RvP_iKyNIbagtGo;RzrITTN-uucm&E ze!efV403*KfG0VAT(+2g`qh1xrTg&~E^*ZbmIVndOEKv;cAKr0Mn9U8n=g~~A2@%0 zA<3x2aQadGwwltQUrqfS{bzQXa3pLzV)1)Si|MCd+p(GS8=K88@QHqNDJK2KezWzX z(U0G4zK~?pVL1K9nOEPQQ?tbMi<5A1W?3HL69-EZIQc%%g7H&z@XJ0+I4>>eJuTYr zB>d#0jGxJGarK-QwUdzpoC6F8P=IDi9FsTyGg>xMNd1X2H~^Qwj_?(Pz6CFvs>k#v1c!GATBY#4qxsA+cS~BaDoz=kr-J+^tToP-WeO*$@KMF( zpK~A!O;p{akWIDOH>dAj_wnZLKa-Io6$EnR_?WXPAtwQU%WA_g5JmTe{)5rpmh3cX z5Vk`fWYs{SE-l>&X_A;)4TF4zh{9z`9zi0;LH-5h$)j ztu_UEt(Nf|Mb0xNSfdpb=m-ui%Im9~8_KnXXR8fZUxSMRNjb_*fwtZoim~Hckjy2) zp@O*9Rx%%do_2!`L}?X5VVG8de3 z3(RX<-U(T&9FHpP^%~~T>=0A5dZ)H0000000000 d00177=_x(|pOYvmQ~|M*eJUdcaVG!(008dF^%VdB delta 2627 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 diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs index befbb31..6f8c89a 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs @@ -317,7 +317,7 @@ namespace TodoAPI2.Models p.id = k1; p.create_evaluation_detail_id = n.id; p.behavior = k.competency_code + " " + k.competency_topic; - p.weight = 0; + p.weight = 20; p.created = DateTime.Now; p.updated = DateTime.Now; p.isActive = true; diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs index c6fcd87..4908f1a 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs @@ -22,6 +22,16 @@ namespace TodoAPI2.Models public decimal? weight { get; set; } + public string target_score1 { get; set; } + + public string target_score2 { get; set; } + + public string target_score3 { get; set; } + + public string target_score4 { get; set; } + + public string target_score5 { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs index 2157001..8b7ad43 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs @@ -103,6 +103,11 @@ namespace TodoAPI2.Models create_evaluation_detail_id = m_eva_evaluation_behavior.create_evaluation_detail_id, behavior = m_eva_evaluation_behavior.behavior, weight = m_eva_evaluation_behavior.weight, + target_score1 = m_eva_evaluation_behavior.target_score1, + target_score2 = m_eva_evaluation_behavior.target_score2, + target_score3 = m_eva_evaluation_behavior.target_score3, + target_score4 = m_eva_evaluation_behavior.target_score4, + target_score5 = m_eva_evaluation_behavior.target_score5, create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id = fk_eva_create_evaluation_detailResult1.create_evaluation_id, @@ -193,7 +198,11 @@ namespace TodoAPI2.Models existingEntity.create_evaluation_detail_id = model.create_evaluation_detail_id; existingEntity.behavior = model.behavior; existingEntity.weight = model.weight; - + existingEntity.target_score1 = model.target_score1; + existingEntity.target_score2 = model.target_score2; + existingEntity.target_score3 = model.target_score3; + existingEntity.target_score4 = model.target_score4; + existingEntity.target_score5 = model.target_score5; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -223,7 +232,11 @@ namespace TodoAPI2.Models 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; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs index 22fc203..95b6546 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs @@ -20,6 +20,16 @@ namespace TodoAPI2.Models public decimal? weight { get; set; } + public string target_score1 { get; set; } + + public string target_score2 { get; set; } + + public string target_score3 { get; set; } + + public string target_score4 { get; set; } + + public string target_score5 { get; set; } + public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; } } diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index b8a7e21..b999469 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -249,7 +249,7 @@ namespace TodoAPI2.Models public List GetDepartmentData() { - var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != ''; ",'"'.ToString()); + var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != '' and deleted_at is null; ", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); var result = new List(); 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 142dbd5..3019154 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 @@ -19,7 +19,6 @@
-
@@ -29,11 +28,33 @@
- + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
- -
@@ -268,20 +289,12 @@ เครื่องมือ - - - -   -   -

- - - +
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 59b1483..a8c33cf 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 @@ -132,7 +132,7 @@ function Oneva_evaluation_achievement_process2_scoreChange(){ total_achievement_weight += parseFloat(weight); total_achievement_score += parseFloat(score); total_achievement_score_old += parseFloat(score_old); - console.log(score_old); + //console.log(score_old); }); $("#h_eva_evaluation_achievement_process2_weight").text(total_achievement_weight.toFixed(2)); $("#h_eva_evaluation_achievement_process2_score2").text(total_achievement_score.toFixed(2)); @@ -142,7 +142,7 @@ function Oneva_evaluation_achievement_process2_scoreChange(){ $("#eva_create_evaluation_detail_summary2_total_summary_supervisor").text((total_achievement*20).toFixed(2)); $("#eva_create_evaluation_detail_summary2_Final_summary_supervisor").text((total_achievement*20).toFixed(2)); - $("#eva_create_evaluation_detail_summary2_achievement_supervisor").text((total_achievement_score*w1/10).toFixed(2)); + $("#eva_create_evaluation_detail_summary2_achievement_supervisor").text(((total_achievement*20)*w1/100).toFixed(2)); calculationAllItem(); } diff --git a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js index c8e1038..edcb85b 100644 --- a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js +++ b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js @@ -22,7 +22,11 @@ $("#eva_evaluation_behavior_id").val(data.id); $("#eva_evaluation_behavior_create_evaluation_detail_id").val(data.create_evaluation_detail_id); $("#eva_evaluation_behavior_behavior").val(data.behavior); $("#eva_evaluation_behavior_weight").val(data.weight); - +$("#eva_evaluation_behavior_target_score1").val(data.target_score1); +$("#eva_evaluation_behavior_target_score2").val(data.target_score2); +$("#eva_evaluation_behavior_target_score3").val(data.target_score3); +$("#eva_evaluation_behavior_target_score4").val(data.target_score4); +$("#eva_evaluation_behavior_target_score5").val(data.target_score5); } function eva_evaluation_behavior_GetFromForm() { @@ -31,7 +35,11 @@ eva_evaluation_behaviorObject.id = $("#eva_evaluation_behavior_id").val(); eva_evaluation_behaviorObject.create_evaluation_detail_id = getUrlParameter("id"); //$("#eva_evaluation_behavior_create_evaluation_detail_id").val(); eva_evaluation_behaviorObject.behavior = $("#eva_evaluation_behavior_behavior").val(); eva_evaluation_behaviorObject.weight = $("#eva_evaluation_behavior_weight").val(); - +eva_evaluation_behaviorObject.target_score1 = $("#eva_evaluation_behavior_target_score1").val(); +eva_evaluation_behaviorObject.target_score2 = $("#eva_evaluation_behavior_target_score2").val(); +eva_evaluation_behaviorObject.target_score3 = $("#eva_evaluation_behavior_target_score3").val(); +eva_evaluation_behaviorObject.target_score4 = $("#eva_evaluation_behavior_target_score4").val(); +eva_evaluation_behaviorObject.target_score5 = $("#eva_evaluation_behavior_target_score5").val(); return eva_evaluation_behaviorObject; } @@ -162,8 +170,7 @@ var eva_evaluation_behavior_setupTable = function (result) { "select": false, "columns": [ { "data": "id" }, - { "data": "behavior" }, - { "data": "weight" }, + { "data": "behavior" } ], "columnDefs": [ { 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 5f8f8ae..1ce41f7 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 @@ -21,11 +21,11 @@ $("#eva_evaluation_behavior_process_behavior_" + i).text(data.behavior); $("#eva_evaluation_behavior_process_weight_" + i).text(data.weight); $("#eva_evaluation_behavior_process_score_" + i).val(data.score); $("#eva_evaluation_behavior_process_sumary_" + i).text(data.sumary); -//$("#eva_evaluation_behavior_process_target_score1_" + i).text(data.target_score1); -//$("#eva_evaluation_behavior_process_target_score2_" + i).text(data.target_score2); -//$("#eva_evaluation_behavior_process_target_score3_" + i).text(data.target_score3); -//$("#eva_evaluation_behavior_process_target_score4_" + i).text(data.target_score4); -//$("#eva_evaluation_behavior_process_target_score5_" + i).text(data.target_score5); +$("#eva_evaluation_behavior_process_target_score1_" + i).text(data.target_score1); +$("#eva_evaluation_behavior_process_target_score2_" + i).text(data.target_score2); +$("#eva_evaluation_behavior_process_target_score3_" + i).text(data.target_score3); +$("#eva_evaluation_behavior_process_target_score4_" + i).text(data.target_score4); +$("#eva_evaluation_behavior_process_target_score5_" + i).text(data.target_score5); } 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 111204e..14abfb2 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 @@ -137,7 +137,7 @@ function Oneva_evaluation_behavior_process2_scoreChange(){ $("#eva_create_evaluation_detail_summary2_total_summary_competency_supervisor").text((total_behavior*20).toFixed(2)); $("#eva_create_evaluation_detail_summary2_Final_summary_competency_supervisor").text((total_behavior*20).toFixed(2)); - $("#eva_create_evaluation_detail_summary2_competency_supervisor").text((total_behavior_score*w2/10).toFixed(2)); + $("#eva_create_evaluation_detail_summary2_competency_supervisor").text(((total_behavior*20)*w2/100).toFixed(2)); calculationAllItem(); }