From 4d73cc804886451059026d9279ee7d9144e72c3c Mon Sep 17 00:00:00 2001 From: paulcortez Date: Thu, 19 Sep 2024 18:16:37 +0800 Subject: [PATCH] modified EmpPayInfo to add work_days modified EmpPayInfo to add work_days --- ...4-09-19-095336_AddWorkDaysOnEmpPayInfo.php | 30 +++++++++++ app/Entities/EmployeePayrollInfo.php | 1 + app/Models/EmployeePayrollInfoModel.php | 1 + app/Views/payroll/empinfoview.php | 50 +++++++++++++++---- 4 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 app/Database/Migrations/2024-09-19-095336_AddWorkDaysOnEmpPayInfo.php diff --git a/app/Database/Migrations/2024-09-19-095336_AddWorkDaysOnEmpPayInfo.php b/app/Database/Migrations/2024-09-19-095336_AddWorkDaysOnEmpPayInfo.php new file mode 100644 index 0000000..b08606c --- /dev/null +++ b/app/Database/Migrations/2024-09-19-095336_AddWorkDaysOnEmpPayInfo.php @@ -0,0 +1,30 @@ + [ + 'type' => 'INT', + 'constraint' => 11, + 'null' => false, + 'after' => 'savings_account', + ], + ]; + $this->forge->addColumn('emp_pay_info', $fields); + } + + public function down() + { + $fields = [ + 'work_days', + ]; + + $this->forge->dropColumn('emp_pay_info', $fields); + } +} diff --git a/app/Entities/EmployeePayrollInfo.php b/app/Entities/EmployeePayrollInfo.php index 35173a3..8d67eb4 100644 --- a/app/Entities/EmployeePayrollInfo.php +++ b/app/Entities/EmployeePayrollInfo.php @@ -12,6 +12,7 @@ class EmployeePayrollInfo extends Entity 'paytype_id' => null, 'is_ATM' => null, 'savings_account' => null, + 'work_days' => null, 'basic_monthly_pay' => null, 'basic_semi_monthly_pay' => null, 'basic_daily_pay' => null, diff --git a/app/Models/EmployeePayrollInfoModel.php b/app/Models/EmployeePayrollInfoModel.php index 3f4e4a3..0e146f3 100644 --- a/app/Models/EmployeePayrollInfoModel.php +++ b/app/Models/EmployeePayrollInfoModel.php @@ -16,6 +16,7 @@ class EmployeePayrollInfoModel extends Model 'paytype_id', 'is_ATM', 'savings_account', + 'work_days', 'basic_monthly_pay', 'basic_semi_monthly_pay', 'basic_daily_pay', diff --git a/app/Views/payroll/empinfoview.php b/app/Views/payroll/empinfoview.php index 62ede14..63278a7 100644 --- a/app/Views/payroll/empinfoview.php +++ b/app/Views/payroll/empinfoview.php @@ -76,28 +76,42 @@ +
+ + +
- + - +

Click compute so other salary field will be filled with computed value

- +
- - + +
+ + + + +
+

Click compute so other salary field will be filled with computed value

- +
+

@@ -194,11 +208,27 @@ $(document).ready(function() { }); }); -function computeBasicPay() +function computeBasicPay(fromSource) { - $("#txtSemiMonthlyBasicPay").val($("#txtMonthlyBasicPay").val() / 2); - $("#txtDailyBasicPay").val($("#txtMonthlyBasicPay").val() * 12 / 313); - $("#txtHourlyBasicPay").val($("#txtMonthlyBasicPay").val() * 12 / 313 / 8); + var monthlyBasic = 0; + + switch(fromSource) + { + case 'fromDaily': + monthlyBasic = Number($("#txtDailyBasicPay").val()) * Number($("#lstWorkDays").val()) / 12; + break; + + case 'fromMonthly': + monthlyBasic = Number($("#txtMonthlyBasicPay").val()); + break; + } + + if(fromSource != 'fromMonthly') $("#txtMonthlyBasicPay").val(monthlyBasic); + $("#txtSemiMonthlyBasicPay").val(monthlyBasic / 2); + if(fromSource != 'fromDaily') $("#txtDailyBasicPay").val(monthlyBasic * 12 / Number($("#lstWorkDays").val())); + $("#txtHourlyBasicPay").val(monthlyBasic * 12 / Number($("#lstWorkDays").val()) / 8); + + $("#txtSalaryFormula").html("Formula: Basic Salary x 12 x " + $("#lstWorkDays").val()); }