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

รวม code ปรับปรุงตาม change request จากทีม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-26 13:27:10 +07:00
parent f353f73d17
commit 60dd022bea
29 changed files with 496 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wwwroot/BackendScript/css/bootstrap-reset.css vendored
View File

@@ -95,7 +95,7 @@ a:hover {
}
.form-control {
color: #777 !important;
color: #000000 !important;
font-size: .8rem;
}
@@ -118,7 +118,7 @@ a:hover {
.form-control {
box-shadow: none;
color: #c2c2c2;
color: #000000;
}

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

@@ -184,7 +184,7 @@ div.auth-wrapper .alert {
}
.title-login {
color: #67757c;
color: #000000;
font-size: 19px;
line-height: 26px;
margin: 26px 0 8px;
@@ -202,7 +202,7 @@ div.auth-wrapper .alert {
}
.font-remember {
color: #67757c;
color: #000000;
font-size: 19px;
line-height: 26px;
margin-left: 8px;
@@ -266,7 +266,7 @@ div.auth-wrapper .alert {
#sidebar-right .chat-list .chat-item .name {
margin-left: 17px;
color: #67757c;
color: #000000;
font-weight: 700;
font-size: 19px;
text-overflow: ellipsis;
@@ -401,7 +401,7 @@ div.auth-wrapper .alert {
padding: 9px 0;
display: -webkit-box;
display: flex;
color: #67757c;
color: #000000;
font-size: 19px;
line-height: 1
}
@@ -850,7 +850,7 @@ img.custom-avatar {
}
.breadcrumb-item.active {
color: #a2b8bf
color: #000000
}
@media (max-width:768px) {
@@ -862,7 +862,7 @@ img.custom-avatar {
}
label {
color: #67757c;
color: #000000;
font-weight: 700;
font-size: 19px;
margin: 0
@@ -981,12 +981,12 @@ input.is-invalid:focus {
}
.select2-container--default .select2-selection--single .select2-selection__arrow b {
border-color: #67757c transparent transparent;
border-color: #000000 transparent transparent;
border-width: 5px 5px 0
}
.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
border-color: transparent transparent #67757c;
border-color: transparent transparent #000000;
border-width: 0 5px 5px
}
@@ -1131,7 +1131,7 @@ input.form-control[readonly]~.display-date.form-control {
.file-list>div:nth-child(2) {
font-size: 19px;
font-weight: 700;
color: #67757c
color: #000000
}
.modal {

22
wwwroot/BackendScript/css/style.css
View File

@@ -9,7 +9,7 @@ Website: http://thevectorlab.net/
@import url("//fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic");
body {
color: #797979;
color: #000000;
background: #f1f2f7;
font-family: "Open Sans", sans-serif;
padding: 0px !important;
@@ -1511,7 +1511,7 @@ h3.timeline-title {
padding: 14px 15px;
text-align: center;
border-right: 1px solid #d5d8df;
color: #797979;
color: #000000;
}
.card-footer.revenue-foot ul li a:hover,
@@ -1970,7 +1970,7 @@ ul.ft-link li a i {
}
.fontawesome-icon-list a {
color: #797979;
color: #000000;
}
.fontawesome-icon-list a:hover {
@@ -2004,7 +2004,7 @@ ul.ft-link li a i {
}
.menu-list a {
color: #797979;
color: #000000;
}
.menu-list a:hover {
@@ -2378,7 +2378,7 @@ ul.inbox-pagination li {
.sender-dropdown {
background: #eaeaea;
padding: 0 3px;
color: #777;
color: #000000;
font-size: 10px;
}
@@ -2967,14 +2967,14 @@ ul.amounts li {
}
.dataTables_paginate.paging_bootstrap.pagination li a {
color: #797979;
color: #000000;
padding: 5px 10px;
display: inline-block;
}
.dataTables_paginate.paging_bootstrap.pagination li:hover a,
.dataTables_paginate.paging_bootstrap.pagination li.active a {
color: #797979;
color: #000000;
background: #eee;
border-radius: 3px;
-webkit-border-radius: 3px;
@@ -3115,7 +3115,7 @@ ul.amounts li {
.tab-head .nav-tabs>li.active>a:focus {
background-color: #f1f2f7;
border-color: #f1f2f7;
color: #797979;
color: #000000;
}
/*general page*/
@@ -5239,7 +5239,7 @@ tr.odd.gradeU td.sorting_1 {
.pricing-head h2 {
padding: 30px 0;
background: #777777;
background: #000000777;
color: #fff;
font-size: 50px;
font-weight: 100;
@@ -5329,7 +5329,7 @@ tr.odd.gradeU td.sorting_1 {
margin-bottom: 5px;
border-radius: 4px;
-webkit-border-radius: 4px;
color: #797979;
color: #000000;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
@@ -6300,7 +6300,7 @@ a.guest-on i {
display: inline-block;
border: 1px solid #ddd;
padding: 3px 10px;
color: #797979;
color: #000000;
border-radius: 4px;
font-size: 12px;
}

5
wwwroot/js/coregen.js
View File

@@ -1,4 +1,9 @@

function formatNumber(num) {
if(num === "" || num === null) return "";
return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
}
function getUrlParameter(sParam) {
var sPageURL = decodeURIComponent(window.location.search.substring(1)),
sURLVariables = sPageURL.split('&'),

32
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_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_sarary_" + i).text(data.sarary);
$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(data.cost_living);
$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(data.middle);
$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumber(data.sarary));
$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumber(data.cost_living));
$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumber(data.middle));
$("#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_new_sarary_" + i).text(data.new_sarary);
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(data.new_cost_living);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(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_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_fullname_" + i).text(data.emp_fullname);
@@ -69,9 +69,12 @@ function eva_adjust_postponement_detail_normal_02_Save(id) {
//Insert eva_adjust_postponement_detail_normal_02 List
var eva_adjust_postponement_detail_normal_02 = [];
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i);
eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02);
var i = $(this).find("#rowCount").text();
if(i){
//console.log(i);
var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i);
eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02);
}
});
//console.log(eva_adjust_postponement_detail_normal_02);
var successFunc = function (result) {
@@ -88,8 +91,19 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
var successFunc = function (response) {
//console.log(response);
var cur_dep = "";
$.each(response, function (i, data) {
var tag = '<tr>';
var tag = "";
if(cur_dep !== data.emp_department_name){
cur_dep = data.emp_department_name;
tag = "<tr><td colspan='15'><span>"+cur_dep+"</span></td></tr>";
}
tag += '<tr>';
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_normal_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_adjust_postponement_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_employee_id_' + (i + 1)+'" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_normal_02_emp_code_' + (i + 1)+'" /></td>';

30
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_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_sarary_" + i).text(data.sarary);
$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(data.cost_living);
$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(data.middle);
$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(data.promoted_percentage);
$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(data.total_promote);
$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(data.new_sarary);
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(data.new_cost_living);
$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary));
$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living));
$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle));
$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumber(data.promoted_percentage));
$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote));
$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumber(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_remark_" + i).text(data.remark);
$("#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(data.new_sarary_with_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_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_position_" + i).text(data.emp_position);
@@ -76,8 +76,11 @@ function eva_adjust_postponement_detail_quota_02_Save(id) {
var eva_adjust_postponement_detail_quota_02 = [];
$('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
var eacheva_adjust_postponement_detail_quota_02 = eva_adjust_postponement_detail_quota_02_GetFromForm($(this), i);
if(i){
var eacheva_adjust_postponement_detail_quota_02 = eva_adjust_postponement_detail_quota_02_GetFromForm($(this), i);
eva_adjust_postponement_detail_quota_02.push(eacheva_adjust_postponement_detail_quota_02);
}
});
var successFunc = function (result) {
@@ -92,9 +95,16 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
$('#eva_adjust_postponement_detail_quota_02Body').empty();
var cur_dep = "";
var successFunc = function (response) {
$.each(response, function (i, data) {
var tag = '<tr>';
var tag = "";
if(cur_dep !== data.emp_department_name){
tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>';
}
tag += '<tr>';
tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1)+'" /></td>';
tag += '<td><p id="eva_adjust_postponement_detail_quota_02_emp_code_' + (i + 1)+'" /></td>';

4
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
View File

@@ -159,10 +159,10 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
var new_salary = parseFloat(old_salary + new_added);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(new_salary);
$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
if(new_salary < 13285){
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(1000);
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(1000));
}else{
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
}

4
wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
View File

@@ -149,10 +149,10 @@ function CalculateRemainQuota(){
$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(receive_quota);
var new_sarary_with_quota = new_sarary + receive_quota;
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(new_sarary_with_quota);
$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
if(new_sarary_with_quota < 13285){
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(1000);
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000));
}else{
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0);
}

1
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js
View File

@@ -28,6 +28,7 @@ var item_level_score;
function eva_create_evaluation_detail_process_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_process_id").val(data.id);
$("#eva_create_evaluation_detail_process_employee_id").val(data.employee_id);
$("#eva_create_evaluation_detail_process_evaluation_round").text(data.evaluation_round);
$("#eva_create_evaluation_detail_process_employee_code").text(data.employee_code);
$("#eva_create_evaluation_detail_process_employee_fullname").text(data.employee_fullname);

2
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js
View File

@@ -27,7 +27,9 @@ function cal_level(){
var item_level_score;
function eva_create_evaluation_detail_process_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_process_id").val(data.id);
$("#eva_create_evaluation_detail_process_employee_id").val(data.employee_id);
$("#eva_create_evaluation_detail_process_evaluation_round").text(data.evaluation_round);
$("#eva_create_evaluation_detail_process_employee_code").text(data.employee_code);
$("#eva_create_evaluation_detail_process_employee_fullname").text(data.employee_fullname);

35
wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
View File

@@ -180,6 +180,41 @@ console.log(result);
"render": function (data, type, row, meta) {
return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_salary_cylinder_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_salary_cylinder_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
}
},
{
"targets": 3,
"data": "temporary_min",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 4,
"data": "themin",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 5,
"data": "themax",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 6,
"data": "middle",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 7,
"data": "cost_living",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
}],
"language": {
"url": appsite + "/DataTables-1.10.16/thai.json"