diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..0771f82 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(2, org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..ad71ec5 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(2,org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..cb28407 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 currSalary = emp.getSalary(); + var newSalary = currSalary > 5000 ? (bonusPer * currSalary) / 100 + currSalary : currSalary; + emp.updateSalary(newSalary); + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..62bc899 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 currSalary = emp.getSalary(); + let newSalary = currSalary > 5000 ? (bonusPer*currSalary)/100 + currSalary: currSalary; + emp.updateSalary(newSalary); + }) } } \ No newline at end of file diff --git a/do-it/src/app/home/home.component.html b/do-it/src/app/home/home.component.html index 9884264..f1e94a6 100644 --- a/do-it/src/app/home/home.component.html +++ b/do-it/src/app/home/home.component.html @@ -1,12 +1,12 @@
-
-
diff --git a/do-it/src/app/home/home.component.ts b/do-it/src/app/home/home.component.ts deleted file mode 100644 index c7407e2..0000000 --- a/do-it/src/app/home/home.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { TodoService } from '../todo.service'; -import { Todo } from '../models/todo'; - -@Component({ - selector: 'app-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.css'] -}) -export class HomeComponent implements OnInit { - - projectList: Todo[]; - personalList: Todo[]; - - constructor(private todoService: TodoService) { - - } - - ngOnInit() { - this.projectList = this.todoService.getProjectList(); - this.personalList = this.todoService.getPersonalList(); - } - - onProjectTaskAdded(taskName: string) { - console.log(taskName); - this.todoService.addTaskToProjects(taskName); - } - - onPersonalTaskAdded(taskName: string) { - console.log(taskName); - this.todoService.addTaskToPersonal(taskName); - } - -} diff --git a/do-it/src/app/todo.service.ts b/do-it/src/app/todo.service.ts deleted file mode 100644 index 051a0c6..0000000 --- a/do-it/src/app/todo.service.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Todo } from './models/todo'; - -@Injectable() -export class TodoService { - - projectList: string[]; - personalList: string[]; - - todoList: Todo[] = []; - - constructor() { - - let todo1 = new Todo('Fix bug 3434', 'project'); - this.todoList.push(todo1); - let todo2 = new Todo('Analyze requirement XYZ', 'project'); - this.todoList.push(todo2); - let todo3 = new Todo('Read daily', 'personal'); - this.todoList.push(todo3); - let todo4 = new Todo('Drink water', 'personal'); - this.todoList.push(todo4); - // this.projectList = [ - // 'Fix bug 3434', - // 'Analyze requirement XYZ' - // ]; - // this.personalList = [ - // 'Read daily', - // 'Drink water' - // ] - } - - getProjectList() { - return this.todoList.filter(todo => todo.category === 'project'); - } - - getPersonalList() { - return this.todoList.filter(todo => todo.category === 'personal'); - } - - addTaskToProjects(taskName: string) { - this.projectList.push(taskName); - } - - addTaskToPersonal(taskName: string) { - this.personalList.push(taskName); - } - - -}