From 1b8c7d4a9fdedffabfd66a617d809cc3b9b958f3 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Wed, 12 Aug 2020 11:42:27 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20Feature/Bug=20=E0=B9=83=E0=B8=99=20OP=20=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=82=E0=B8=97=E0=B8=B5=E0=B9=88=202987,=202988,=202989,=20?= =?UTF-8?q?2991,=202992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/Shared/_LayoutDirect.cshtml | 1 + .../eva_create_evaluation_detail_agreement_d.cshtml | 2 +- .../eva_create_evaluation_detail_process_d.cshtml | 1 + .../eva_create_evaluation_detail_process_d2.cshtml | 2 +- wwwroot/css/mycustom.css | 6 ++++++ wwwroot/js/coregen.js | 2 ++ .../eva_evaluation_achievement_process_inline.js | 2 +- .../eva_evaluation_achievement_process2_inline.js | 2 +- .../eva_evaluation_behavior_process_inline.js | 2 +- .../eva_evaluation_behavior_process2_inline.js | 2 +- wwwroot/js/eva_idp_plan_owner/eva_idp_plan_owner.js | 1 + 11 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Views/Shared/_LayoutDirect.cshtml b/Views/Shared/_LayoutDirect.cshtml index 4201f38..7275c66 100644 --- a/Views/Shared/_LayoutDirect.cshtml +++ b/Views/Shared/_LayoutDirect.cshtml @@ -38,6 +38,7 @@ + @RenderSection("HeadPlaceHolder", required: false) 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 e768b65..fc9b003 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 @@ -157,7 +157,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 f4e1ff8..8424ebf 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 @@ -100,6 +100,7 @@
+
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 527ad39..92b9ed6 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 @@ -150,7 +150,7 @@
- +
ลาป่วย
diff --git a/wwwroot/css/mycustom.css b/wwwroot/css/mycustom.css index d91ca8d..9be5b53 100644 --- a/wwwroot/css/mycustom.css +++ b/wwwroot/css/mycustom.css @@ -25,3 +25,9 @@ justify-content: center; } +select:disabled { + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 1px; + text-overflow: ''; +} \ No newline at end of file diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js index 0a3d938..1992e91 100644 --- a/wwwroot/js/coregen.js +++ b/wwwroot/js/coregen.js @@ -3,6 +3,8 @@ $( this ).attr( 'autocomplete', 'nakorn2' ); }); + + $('*[data-provide="datepicker"]').wrap('
'); $('*[data-provide="datepicker"]').calendarsPicker( 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 287f5da..07ff820 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 @@ -101,7 +101,7 @@ function CheckValidValueachievement(){ var i = $(this).find("#rowCount").text(); var score = $("#eva_evaluation_achievement_process_score_" + i).val(); if(score > 5) $("#eva_evaluation_achievement_process_score_" + i).val(5); - if(score < 0) $("#eva_evaluation_achievement_process_score_" + i).val(0); + if(score < 1) $("#eva_evaluation_achievement_process_score_" + i).val(1); }); } 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 dd1eaa0..472f21f 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 @@ -113,7 +113,7 @@ function CheckValidValueachievement(){ var i = $(this).find("#rowCount").text(); var score = $("#eva_evaluation_achievement_process2_score2_" + i).val(); if(score > 5) $("#eva_evaluation_achievement_process2_score2_" + i).val(5); - if(score < 0) $("#eva_evaluation_achievement_process2_score2_" + i).val(0); + if(score < 1) $("#eva_evaluation_achievement_process2_score2_" + i).val(1); }); } 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 bc0c996..e511593 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 @@ -104,7 +104,7 @@ function CheckValidValuebehavior(){ var i = $(this).find("#rowCount").text(); var score = $("#eva_evaluation_behavior_process_score_" + i).val(); if(score > 5) $("#eva_evaluation_behavior_process_score_" + i).val(5); - if(score < 0) $("#eva_evaluation_behavior_process_score_" + i).val(0); + if(score < 1) $("#eva_evaluation_behavior_process_score_" + i).val(1); }); } 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 5969819..a854c77 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 @@ -119,7 +119,7 @@ function CheckValidValuebehavior(){ var i = $(this).find("#rowCount").text(); var score = $("#eva_evaluation_behavior_process2_score2_" + i).val(); if(score > 5) $("#eva_evaluation_behavior_process2_score2_" + i).val(5); - if(score < 0) $("#eva_evaluation_behavior_process2_score2_" + i).val(0); + if(score < 1) $("#eva_evaluation_behavior_process2_score2_" + i).val(1); }); } 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 3f4b28c..6147d77 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 @@ -109,6 +109,7 @@ function eva_idp_plan_owner_PutUpdate() { } var data = eva_idp_plan_owner_GetFromForm(); +console.log(data); //Update Mode if (eva_idp_plan_owner_editMode === "UPDATE") {
ลาป่วย