From 55f5a63692549a9815e1338184f9e851c6132a16 Mon Sep 17 00:00:00 2001 From: swathishikari Date: Tue, 9 May 2017 14:41:12 +0530 Subject: [PATCH] First Commit --- Day-2/salary-updater.js | 2 ++ Day-2/salary-updater.ts | 2 ++ Day-2/salary-upgrader.js | 8 +++++++- Day-2/salary-upgrader.ts | 8 +++++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..ec25e2f 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(20, org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..8140d24 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -7,4 +7,6 @@ org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); +salaryUpgrader.addBonus(20, org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..7e9405b 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -10,7 +10,13 @@ var SalaryUpgrader = (function () { emp.updateSalary(newSalary); }); }; - SalaryUpgrader.prototype.addBonus = function () { + SalaryUpgrader.prototype.addBonus = function (percentRaise, empList) { + empList.map(function (emp) { + var orginalSalary = emp.getSalary(); + var hikeSalary = (orginalSalary * percentRaise / 100) + orginalSalary; + var newBonusSal = hikeSalary > 10000 ? hikeSalary + 1000 : hikeSalary + 500; + emp.updateSalary(newBonusSal); + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..ae1ea54 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,7 +10,13 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } - addBonus() { + addBonus(percentRaise: number, empList: Employee[]) { + empList.map(emp => { + let orginalSalary = emp.getSalary(); + let hikeSalary = (orginalSalary*percentRaise/100) + orginalSalary; + let newBonusSal = hikeSalary>10000 ? hikeSalary+1000 : hikeSalary+500; + emp.updateSalary(newBonusSal); + }) } } \ No newline at end of file