From 3cd8231f26e3e142ab65eeed5e9d47b3337486aa Mon Sep 17 00:00:00 2001 From: Ravinder Date: Mon, 8 May 2017 16:50:16 +0530 Subject: [PATCH 1/3] Modified Organazation.ts --- Day-2/Organization.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Day-2/Organization.js b/Day-2/Organization.js index 4ec45dd..33674bc 100644 --- a/Day-2/Organization.js +++ b/Day-2/Organization.js @@ -23,4 +23,5 @@ var Organization = (function () { }; return Organization; }()); +console.log("test"); exports.Organization = Organization; From 9a9e2a14bcd13be1be0007fece2c54fcf9441bc0 Mon Sep 17 00:00:00 2001 From: Ravinder Date: Mon, 8 May 2017 16:53:19 +0530 Subject: [PATCH 2/3] reverting back to master --- Day-2/Organization.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Day-2/Organization.js b/Day-2/Organization.js index 33674bc..4ec45dd 100644 --- a/Day-2/Organization.js +++ b/Day-2/Organization.js @@ -23,5 +23,4 @@ var Organization = (function () { }; return Organization; }()); -console.log("test"); exports.Organization = Organization; From b4300ccb4c61a3bbbb9cad551fcf0ee88e361ca9 Mon Sep 17 00:00:00 2001 From: Ravinder Date: Mon, 8 May 2017 17:13:32 +0530 Subject: [PATCH 3/3] Bonus functionality --- Day-2/salary-updater.js | 3 ++- Day-2/salary-updater.ts | 3 ++- Day-2/salary-upgrader.js | 9 +++++++-- Day-2/salary-upgrader.ts | 12 ++++++++---- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..902bb0f 100644 --- a/Day-2/salary-updater.js +++ b/Day-2/salary-updater.js @@ -6,5 +6,6 @@ var org = new Organization_1.Organization('ABC'); org.createEmployees(); org.printEmployeesInfo(); var salaryUpgrader = new salary_upgrader_1.SalaryUpgrader(); -salaryUpgrader.incrementSalary(10, org.getEmployeeList()); +//salaryUpgrader.incrementSalary(10, org.getEmployeeList()); +salaryUpgrader.addBonus(5, org.getEmployeeList()); org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..810f317 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -5,6 +5,7 @@ let org: Organization = new Organization('ABC'); org.createEmployees(); org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); -salaryUpgrader.incrementSalary(10, org.getEmployeeList()); +//salaryUpgrader.incrementSalary(10, org.getEmployeeList()); +salaryUpgrader.addBonus(5, org.getEmployeeList()); org.printEmployeesInfo(); diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..8637727 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -4,14 +4,19 @@ var SalaryUpgrader = (function () { function SalaryUpgrader() { } SalaryUpgrader.prototype.incrementSalary = function (percentRaise, empList) { + /*empList.map(emp => { + let oldSalary = emp.getSalary(); + let newSalary = (oldSalary*percentRaise/100) + oldSalary; + emp.updateSalary(newSalary); + }) */ + }; + SalaryUpgrader.prototype.addBonus = function (percentRaise, empList) { empList.map(function (emp) { var oldSalary = emp.getSalary(); var newSalary = (oldSalary * percentRaise / 100) + oldSalary; emp.updateSalary(newSalary); }); }; - SalaryUpgrader.prototype.addBonus = function () { - }; return SalaryUpgrader; }()); exports.SalaryUpgrader = SalaryUpgrader; diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..b7c3449 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -4,13 +4,17 @@ export class SalaryUpgrader { } incrementSalary(percentRaise: number, empList: Employee[]) { - empList.map(emp => { + /*empList.map(emp => { let oldSalary = emp.getSalary(); let newSalary = (oldSalary*percentRaise/100) + oldSalary; emp.updateSalary(newSalary); - }) + }) */ } - addBonus() { - + addBonus(percentRaise: number, empList: Employee[]) { + empList.map(emp => { + let oldSalary = emp.getSalary(); + let newSalary = (oldSalary*percentRaise/100) + oldSalary; + emp.updateSalary(newSalary); + }) } } \ No newline at end of file