Skip to content

Added bonus functionality #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added bonus functionality #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cd8231
Modified Organazation.ts
May 8, 2017
9a9e2a1
reverting back to master
May 8, 2017
b4300cc
Bonus functionality
May 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Day-2/salary-updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
3 changes: 2 additions & 1 deletion Day-2/salary-updater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

9 changes: 7 additions & 2 deletions Day-2/salary-upgrader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
12 changes: 8 additions & 4 deletions Day-2/salary-upgrader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
}
}