From d36c5e24926aee9099f7dd65e24961d86d603f76 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 May 2017 07:45:29 +0100 Subject: [PATCH] Added bonus --- 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, 16 insertions(+), 4 deletions(-) diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..8a88e0f 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(5, org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..9354fd7 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -7,4 +7,5 @@ org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); - +salaryUpgrader.addBonus(5,org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..39ebde4 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 (bonusPer, empList) { + empList.map(function (emp) { + var actSalary = emp.getSalary(); + var newSalary = actSalary > 5000 ? ((actSalary * bonusPer / 100) + actSalary) : actSalary; + emp.updateSalary(newSalary); + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..471e1df 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(bonusPer: number , empList: Employee[]) { + empList.map(emp => { + let actSalary = emp.getSalary(); + let newSalary = actSalary >5000 ? ((actSalary*bonusPer/100) + actSalary) :actSalary; + emp.updateSalary(newSalary); + }) } } \ No newline at end of file