From 33fa6587066d7194594bdc9ed849f4389ccb9e32 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 May 2017 08:40:19 +0100 Subject: [PATCH 1/3] add bonus --- Day-2/salary-updater.js | 2 ++ Day-2/salary-updater.ts | 2 ++ Day-2/salary-upgrader.js | 7 ++++++- Day-2/salary-upgrader.ts | 8 ++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) 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 From d13b3edd6376ad1edf0c7922b5aa04da0c82cb41 Mon Sep 17 00:00:00 2001 From: shinuthom Date: Tue, 9 May 2017 20:22:01 +0530 Subject: [PATCH 2/3] adding to do service --- do-it/src/app/home/home.component.ts | 14 ++++++++++---- do-it/src/app/todo.service.ts | 6 ++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/do-it/src/app/home/home.component.ts b/do-it/src/app/home/home.component.ts index c7407e2..ec44f3a 100644 --- a/do-it/src/app/home/home.component.ts +++ b/do-it/src/app/home/home.component.ts @@ -9,16 +9,16 @@ import { Todo } from '../models/todo'; }) export class HomeComponent implements OnInit { - projectList: Todo[]; - personalList: Todo[]; + //projectList: Todo[]; + //personalList: Todo[]; constructor(private todoService: TodoService) { } ngOnInit() { - this.projectList = this.todoService.getProjectList(); - this.personalList = this.todoService.getPersonalList(); + //this.projectList = this.todoService.getProjectList(); + //this.personalList = this.todoService.getPersonalList(); } onProjectTaskAdded(taskName: string) { @@ -30,5 +30,11 @@ export class HomeComponent implements OnInit { console.log(taskName); this.todoService.addTaskToPersonal(taskName); } + get projectList():Todo[]{ + return this.todoService.getProjectList(); + } + get personalList():Todo[]{ + return (this.todoService.getPersonalList()); + } } diff --git a/do-it/src/app/todo.service.ts b/do-it/src/app/todo.service.ts index 051a0c6..4bd70de 100644 --- a/do-it/src/app/todo.service.ts +++ b/do-it/src/app/todo.service.ts @@ -38,11 +38,13 @@ export class TodoService { } addTaskToProjects(taskName: string) { - this.projectList.push(taskName); + //this.projectList.push(taskName); + this.todoList.push(new Todo(taskName, 'project')); } addTaskToPersonal(taskName: string) { - this.personalList.push(taskName); + //this.personalList.push(taskName); + this.todoList.push(new Todo(taskName, 'personal')); } From a99841ac0d67db11b71cfc317c40deba17098e8f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 May 2017 06:50:20 +0100 Subject: [PATCH 3/3] new hompage --- do-it/src/app/home/home.component.html | 4 ++-- do-it/src/app/home/home.component.ts | 17 +++++++++++------ do-it/src/app/todo.service.ts | 17 ++++++++++++----- 3 files changed, 25 insertions(+), 13 deletions(-) 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 index c7407e2..4f5fee4 100644 --- a/do-it/src/app/home/home.component.ts +++ b/do-it/src/app/home/home.component.ts @@ -9,26 +9,31 @@ import { Todo } from '../models/todo'; }) export class HomeComponent implements OnInit { - projectList: Todo[]; - personalList: Todo[]; + constructor(private todoService: TodoService) { } ngOnInit() { - this.projectList = this.todoService.getProjectList(); - this.personalList = this.todoService.getPersonalList(); + //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); } + get projectList():Todo[]{ + return this.todoService.getProjectList(); + } + get personalList():Todo[]{ + return this.todoService.getPersonalList(); + } } diff --git a/do-it/src/app/todo.service.ts b/do-it/src/app/todo.service.ts index 051a0c6..f9e3103 100644 --- a/do-it/src/app/todo.service.ts +++ b/do-it/src/app/todo.service.ts @@ -4,14 +4,13 @@ import { Todo } from './models/todo'; @Injectable() export class TodoService { - projectList: string[]; - personalList: string[]; + todoList: Todo[] = []; constructor() { - let todo1 = new Todo('Fix bug 3434', 'project'); + let todo1 = new Todo('Fix bug 34341', 'project'); this.todoList.push(todo1); let todo2 = new Todo('Analyze requirement XYZ', 'project'); this.todoList.push(todo2); @@ -19,6 +18,9 @@ export class TodoService { this.todoList.push(todo3); let todo4 = new Todo('Drink water', 'personal'); this.todoList.push(todo4); + + let todo5 = new Todo('Drink ', 'personal'); + this.todoList.push(todo5); // this.projectList = [ // 'Fix bug 3434', // 'Analyze requirement XYZ' @@ -38,11 +40,16 @@ export class TodoService { } addTaskToProjects(taskName: string) { - this.projectList.push(taskName); + console.log(taskName); + //this.projectList.push(taskName); + this.todoList.push(new Todo(taskName, 'project')); + console.log(this.todoList); } addTaskToPersonal(taskName: string) { - this.personalList.push(taskName); + console.log(taskName); + //this.personalList.push(taskName); + this.todoList.push(new Todo(taskName, 'personal')); }