From 28c51ffc46a6061beb355a207ed708d09f1a17ed Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 May 2017 08:26:33 +0100 Subject: [PATCH] Bonus Addition to the salary --- Day-2/salary-updater.js | 2 ++ Day-2/salary-updater.ts | 3 +++ Day-2/salary-upgrader.js | 7 ++++++- Day-2/salary-upgrader.ts | 8 ++++++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..6c246f6 100644 --- a/Day-2/salary-updater.js +++ b/Day-2/salary-updater.js @@ -8,3 +8,5 @@ org.printEmployeesInfo(); var salaryUpgrader = new salary_upgrader_1.SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); +salaryUpgrader.addBonus(org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..9e86515 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -7,4 +7,7 @@ org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); +salaryUpgrader.addBonus(org.getEmployeeList()); +org.printEmployeesInfo(); + diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..ca02b45 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -10,7 +10,12 @@ var SalaryUpgrader = (function () { emp.updateSalary(newSalary); }); }; - SalaryUpgrader.prototype.addBonus = function () { + SalaryUpgrader.prototype.addBonus = function (empList) { + empList.map(function (emp) { + var actualSalary = emp.getSalary(); + var bonusSalary = (actualSalary < 40000 ? actualSalary + 10000 : actualSalary); + emp.updateSalary(bonusSalary); + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..18b0fe9 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,7 +10,11 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } - addBonus() { - + addBonus(empList: Employee[]) { + empList.map(emp => { + let actualSalary = emp.getSalary(); + let bonusSalary = (actualSalary < 40000 ? actualSalary + 10000 : actualSalary); + emp.updateSalary(bonusSalary); + }) } } \ No newline at end of file