From 6b22fc4694b091aec47e46509a9f7557da08fa9a Mon Sep 17 00:00:00 2001 From: Jose Pabl Domingo Aramburo Sanchez Date: Tue, 14 Aug 2018 07:38:25 -0600 Subject: [PATCH] [add] Loading salary data --- api-payroll/public/html/registerWorkDays.php | 32 +++++++++++++++++ api-payroll/public/js/registerWorkDays.js | 36 ++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/api-payroll/public/html/registerWorkDays.php b/api-payroll/public/html/registerWorkDays.php index 5bdd05d..0bd287b 100644 --- a/api-payroll/public/html/registerWorkDays.php +++ b/api-payroll/public/html/registerWorkDays.php @@ -79,7 +79,39 @@
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
diff --git a/api-payroll/public/js/registerWorkDays.js b/api-payroll/public/js/registerWorkDays.js index 5579599..83bda05 100644 --- a/api-payroll/public/js/registerWorkDays.js +++ b/api-payroll/public/js/registerWorkDays.js @@ -50,6 +50,7 @@ $(document).ready(function(){ loadEmployeeDataForWorkDays(datum.code); validateEmployeeCanDoOtherRoles(datum.code); + loadSalaryDetails(datum.code); $('#hidenEmployeeCodeForWorkDaysCode').val(datum.code); // For future reference }); }); @@ -178,6 +179,40 @@ function validateEmployeeCanDoOtherRoles(code){ }); } +function loadSalaryDetails(code){ + let baseUrl = getbaseUrl(); + + $.ajax({ + url: baseUrl + '/api/employee/salary/' + code, + type: 'GET', + dataType: 'json', + success:function(data){ + $('#workDaysEmployeeSalaryRaw').val(data['raw']); + $('#workDaysEmployeeSalaryTaxes').val(data['taxes']); + $('#workDaysEmployeeSalaryFinal').val(data['real']); + $('#workDaysEmployeeSalaryVouchers').val(data['vouchers']); + }, + error:function(x,e) { + let responseText = $.parseJSON(x["responseText"]); + + if (x.status==0) { + $('#modalErrorInternetConnection').modal('show'); + } else if(x.status==404) { + $('#modalError404').modal('show'); + } else if(x.status==500) { + $('#modalServerResponseError').modal('show'); + document.getElementById('modalResponseError').innerHTML = responseText['message']; + } else if(e=='parsererror') { + $('#modalErrorParsererror').modal('show'); + } else if(e=='timeout'){ + $('#modalErrorTimeout').modal('show'); + } else { + $('#modalErrorOther').modal('show'); + } + }, + }); +} + function saveNewWorkDay(){ let baseUrl = getbaseUrl(); @@ -196,6 +231,7 @@ function saveNewWorkDay(){ success:function(data){ $('#modalServerResponseSuccess').modal('show'); document.getElementById('serverResponseSuccess').innerHTML = data['message']; + loadSalaryDetails($('#hidenEmployeeCodeForWorkDaysCode').val()); }, error:function(x,e) { let responseText = $.parseJSON(x["responseText"]);