thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

แก้บักโปรแกรม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-26 23:21:31 +07:00
parent 60dd022bea
commit 69b0b48bc4
20 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_adjust_postponement_normal"; ViewData["Title"] = "eva_adjust_postponement_normal";
} }
<div class="modal fade" id="eva_adjust_postponement_normalModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_adjust_postponement_normalModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_adjust_postponement_normalModel" style="z-index:1500" role="dialog" aria-labelledby="eva_adjust_postponement_normalModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_adjust_postponement_quota"; ViewData["Title"] = "eva_adjust_postponement_quota";
} }
<div class="modal fade" id="eva_adjust_postponement_quotaModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_adjust_postponement_quotaModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_adjust_postponement_quotaModel" style="z-index:1500" role="dialog" aria-labelledby="eva_adjust_postponement_quotaModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_create_evaluationView/eva_create_evaluation.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_create_evaluation"; ViewData["Title"] = "eva_create_evaluation";
} }
<div class="modal fade" id="eva_create_evaluationModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_create_evaluationModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_create_evaluationModel" style="z-index:1500" role="dialog" aria-labelledby="eva_create_evaluationModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
View File

@@ -5,7 +5,7 @@
Layout = "_LayoutDirect"; Layout = "_LayoutDirect";
} }
<div class="modal fade" id="eva_create_evaluation_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_create_evaluation_detailModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_create_evaluation_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_create_evaluation_detailModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

4
Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
View File

@@ -5,7 +5,7 @@
Layout = "_LayoutDirect"; Layout = "_LayoutDirect";
} }
<div class="modal fade" id="eva_evaluation_behaviorModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_behaviorModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_evaluation_behaviorModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_behaviorModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -66,7 +66,7 @@
</div> </div>
</div> </div>
<div class="modal fade" id="eva_evaluation_achievementModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_achievementModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_evaluation_achievementModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_achievementModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -5,7 +5,7 @@
Layout = "_LayoutDirect"; Layout = "_LayoutDirect";
} }
<div class="modal fade" id="eva_idp_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_idp_planModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_idp_planModel" style="z-index:1500" role="dialog" aria-labelledby="eva_idp_planModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_evaluation_group"; ViewData["Title"] = "eva_evaluation_group";
} }
<div class="modal fade" id="eva_evaluation_groupModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_groupModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_evaluation_groupModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_groupModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_evaluation_group_detailView/eva_evaluation_group_detail.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_evaluation_group_detail"; ViewData["Title"] = "eva_evaluation_group_detail";
} }
<div class="modal fade" id="eva_evaluation_group_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_group_detailModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_evaluation_group_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_group_detailModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_level_scoreView/eva_level_score.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_level_score"; ViewData["Title"] = "eva_level_score";
} }
<div class="modal fade" id="eva_level_scoreModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_level_scoreModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_level_scoreModel" style="z-index:1500" role="dialog" aria-labelledby="eva_level_scoreModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_level_scoreView/eva_level_score_d.cshtml
View File

@@ -5,7 +5,7 @@
Layout = "_LayoutDirect"; Layout = "_LayoutDirect";
} }
<div class="modal fade" id="eva_promoted_percentageModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_promoted_percentageModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_promoted_percentageModel" style="z-index:1500" role="dialog" aria-labelledby="eva_promoted_percentageModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_level_score_basicView/eva_level_score_basic.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_level_score_basic"; ViewData["Title"] = "eva_level_score_basic";
} }
<div class="modal fade" id="eva_level_score_basicModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_level_score_basicModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_level_score_basicModel" style="z-index:1500" role="dialog" aria-labelledby="eva_level_score_basicModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_performance_planView/eva_performance_plan.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_performance_plan"; ViewData["Title"] = "eva_performance_plan";
} }
<div class="modal fade" id="eva_performance_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_planModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_performance_planModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_planModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_performance_planView/eva_performance_plan_d.cshtml
View File

@@ -5,7 +5,7 @@
Layout = "_LayoutDirect"; Layout = "_LayoutDirect";
} }
<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_performance_plan_detailView/eva_performance_plan_detail.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_performance_plan_detail"; ViewData["Title"] = "eva_performance_plan_detail";
} }
<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
View File

@@ -4,7 +4,7 @@
ViewData["Title"] = "eva_salary_cylinder"; ViewData["Title"] = "eva_salary_cylinder";
} }
<div class="modal fade" id="eva_salary_cylinderModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_salary_cylinderModelLabel" aria-hidden="true"> <div class="modal fade" id="eva_salary_cylinderModel" style="z-index:1500" role="dialog" aria-labelledby="eva_salary_cylinderModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

2
wwwroot/BackendScript/assets/bootstrap-switch/examples/index.html
View File

@@ -792,7 +792,7 @@ $('#disable-switch').bootstrapSwitch('setActive', false); // true || false</pre
</div> </div>
</div> </div>
<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="myModal" class="modal hide fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>Modal</h3> <h3>Modal</h3>

5
wwwroot/BackendScript/css/style-custom.css
View File

@@ -991,7 +991,8 @@ input.is-invalid:focus {
} }
.select2-container--default .select2-search--dropdown .select2-search__field { .select2-container--default .select2-search--dropdown .select2-search__field {
font-size: 19px font-size: 19px;
} }
.select2-container--default .select2-selection--multiple { .select2-container--default .select2-selection--multiple {
@@ -1037,7 +1038,7 @@ input.is-invalid:focus {
.select2-container--default .select2-search--inline .select2-search__field { .select2-container--default .select2-search--inline .select2-search__field {
font-size: 19px; font-size: 19px;
line-height: 1 line-height: 1;
} }
li.select2-results__option { li.select2-results__option {

7
wwwroot/js/coregen.js
View File

@@ -1,7 +1,12 @@
 
function formatNumber(num) { function formatNumber(num) {
if(num === "" || num === null) return ""; if(num === "" || num === null) return "";
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,') return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
}
function formatNumberTemp(num) {
if(num === "" || num === null) return "";
return num.toString();
} }
function getUrlParameter(sParam) { function getUrlParameter(sParam) {

10
wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
View File

@@ -24,13 +24,13 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
$("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id); $("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id);
$("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id); $("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id);
$("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id); $("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id);
$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumber(data.sarary)); $("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumberTemp(data.sarary));
$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumber(data.cost_living)); $("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumber(data.middle)); $("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumberTemp(data.middle));
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage); $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote); $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary)); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living)); $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumberTemp(data.new_cost_living));
$("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark); $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark);
$("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code); $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code);
$("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(data.emp_fullname); $("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(data.emp_fullname);

17
wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
View File

@@ -26,16 +26,16 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
$("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id); $("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
$("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id); $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
$("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id); $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary)); $("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumberTemp(data.sarary));
$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living)); $("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle)); $("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumberTemp(data.middle));
$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumber(data.promoted_percentage)); $("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumberTemp(data.promoted_percentage));
$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote)); $("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumberTemp(data.total_promote));
$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumber(data.new_sarary)); $("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living)); $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumberTemp(data.new_cost_living));
$("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark); $("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark);
$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota); $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota);
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(data.new_sarary_with_quota)); $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumberTemp(data.new_sarary_with_quota));
$("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code); $("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code);
$("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname); $("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname);
$("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position); $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position);
@@ -102,6 +102,7 @@ var cur_dep = "";
var tag = ""; var tag = "";
if(cur_dep !== data.emp_department_name){ if(cur_dep !== data.emp_department_name){
tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>'; tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>';
cur_dep = data.emp_department_name;
} }
tag += '<tr>'; tag += '<tr>';