Skip to content

add bonus #7

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 4 commits into
base: master
Choose a base branch
from
Open

add bonus #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33fa658
add bonus
May 9, 2017
d13b3ed
adding to do service
shinuthom May 9, 2017
a99841a
new hompage
May 10, 2017
05e7ee1
commit
May 10, 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
2 changes: 2 additions & 0 deletions Day-2/salary-updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ org.printEmployeesInfo();
var salaryUpgrader = new salary_upgrader_1.SalaryUpgrader();
salaryUpgrader.incrementSalary(10, org.getEmployeeList());
org.printEmployeesInfo();
salaryUpgrader.addBonus(2, org.getEmployeeList());
org.printEmployeesInfo();
2 changes: 2 additions & 0 deletions Day-2/salary-updater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ org.printEmployeesInfo();
let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader();
salaryUpgrader.incrementSalary(10, org.getEmployeeList());
org.printEmployeesInfo();
salaryUpgrader.addBonus(2,org.getEmployeeList());
org.printEmployeesInfo();

7 changes: 6 additions & 1 deletion Day-2/salary-upgrader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 currSalary = emp.getSalary();
var newSalary = currSalary > 5000 ? (bonusPer * currSalary) / 100 + currSalary : currSalary;
emp.updateSalary(newSalary);
});
};
return SalaryUpgrader;
}());
Expand Down
8 changes: 6 additions & 2 deletions Day-2/salary-upgrader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ export class SalaryUpgrader {
emp.updateSalary(newSalary);
})
}
addBonus() {

addBonus(bonusPer: number , empList: Employee[]) {
empList.map(emp => {
let currSalary = emp.getSalary();
let newSalary = currSalary > 5000 ? (bonusPer*currSalary)/100 + currSalary: currSalary;
emp.updateSalary(newSalary);
})
}
}
4 changes: 2 additions & 2 deletions do-it/src/app/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="container">
<div class="row">
<div class="col s6">
<app-check-list title="Project To Do" [checkList]="projectList"
<app-check-list title="Project To Do" [checkList]="todoService.getProjectList()"
(taskAdded)="onProjectTaskAdded($event)">
</app-check-list>
</div>
<div class="col s6">
<app-check-list title="Personal To Do" [checkList]="personalList"
<app-check-list title="Personal To Do" [checkList]="todoService.getPersonalList()"
(taskAdded)="onPersonalTaskAdded($event)">
</app-check-list>
</div>
Expand Down
34 changes: 0 additions & 34 deletions do-it/src/app/home/home.component.ts
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions do-it/src/app/todo.service.ts
View file
Open in desktop

This file was deleted.