From 8f76efd959a506eefa6f0a458f2e520aa83432b0 Mon Sep 17 00:00:00 2001 From: Rajarajan Rajasekaran Date: Fri, 5 May 2017 16:41:18 +0530 Subject: [PATCH 1/2] test --- Day-2/salary-upgrader.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..37f2bb2 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -12,5 +12,8 @@ export class SalaryUpgrader { } addBonus() { + } + rateEmployee(){ + } } \ No newline at end of file From 632e8bd6e778321050967429c556afaf1bfd5540 Mon Sep 17 00:00:00 2001 From: Rajarajan Rajasekaran Date: Fri, 5 May 2017 17:07:41 +0530 Subject: [PATCH 2/2] changes --- Day-2/Employee.js | 7 ++++++- Day-2/Employee.ts | 8 +++++++- Day-2/Organization.js | 2 +- Day-2/Organization.ts | 2 +- Day-2/salary-updater.js | 6 ++++++ Day-2/salary-updater.ts | 7 ++++++- Day-2/salary-upgrader.js | 7 ++++++- Day-2/salary-upgrader.ts | 11 ++++++----- 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/Day-2/Employee.js b/Day-2/Employee.js index f55454a..0db2e60 100644 --- a/Day-2/Employee.js +++ b/Day-2/Employee.js @@ -1,10 +1,12 @@ "use strict"; exports.__esModule = true; var Employee = (function () { - function Employee(id, name, salary) { + function Employee(id, name, salary, star) { this.id = id; this.name = name; this.salary = salary; + this.star = star; + console.log("Employee Rating :" + star); } Employee.prototype.printInfo = function () { console.log(this.name + " gets " + this.salary); @@ -15,6 +17,9 @@ var Employee = (function () { Employee.prototype.getSalary = function () { return this.salary; }; + Employee.prototype.getStar = function () { + return this.star; + }; return Employee; }()); exports.Employee = Employee; diff --git a/Day-2/Employee.ts b/Day-2/Employee.ts index ee0002f..611c7d5 100644 --- a/Day-2/Employee.ts +++ b/Day-2/Employee.ts @@ -2,10 +2,13 @@ export class Employee { id: number; name: string; salary: number; - constructor(id: number, name: string, salary: number) { + star: number; + constructor(id: number, name: string, salary: number,star: number) { this.id = id; this.name = name; this.salary = salary; + this.star = star; + console.log("Employee Rating :"+star); } printInfo() { console.log(`${this.name} gets ${this.salary}`); @@ -16,5 +19,8 @@ export class Employee { getSalary() { return this.salary; } + getStar(){ + return this.star; + } } diff --git a/Day-2/Organization.js b/Day-2/Organization.js index 4ec45dd..4b80c44 100644 --- a/Day-2/Organization.js +++ b/Day-2/Organization.js @@ -8,7 +8,7 @@ var Organization = (function () { } Organization.prototype.createEmployees = function () { for (var i = 1; i <= 10; i++) { - var emp = new Employee_1.Employee(i, 'A' + i, i * 1000); + var emp = new Employee_1.Employee(i, 'A' + i, i * 1000, Math.floor(Math.random() * 5) + 1); this.listOfEmployees.push(emp); } }; diff --git a/Day-2/Organization.ts b/Day-2/Organization.ts index 165daaf..8d5cd19 100644 --- a/Day-2/Organization.ts +++ b/Day-2/Organization.ts @@ -8,7 +8,7 @@ export class Organization { } createEmployees() { for (let i = 1; i <= 10; i++) { - let emp: Employee = new Employee(i, 'A' + i, i * 1000); + let emp: Employee = new Employee(i, 'A' + i, i * 1000, Math.floor(Math.random() * 5) + 1 ); this.listOfEmployees.push(emp); } } diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..570748e 100644 --- a/Day-2/salary-updater.js +++ b/Day-2/salary-updater.js @@ -4,7 +4,13 @@ var Organization_1 = require("./Organization"); var salary_upgrader_1 = require("./salary-upgrader"); var org = new Organization_1.Organization('ABC'); org.createEmployees(); +console.log("\n Employee Salary: "); org.printEmployeesInfo(); var salaryUpgrader = new salary_upgrader_1.SalaryUpgrader(); +console.log("\n Salary After Increment : "); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); +console.log("\n Salary After Bonus : "); +salaryUpgrader.addBonus(2, org.getEmployeeList()); +//Check the workflow +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..dafd708 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -3,8 +3,13 @@ import { SalaryUpgrader } from './salary-upgrader'; let org: Organization = new Organization('ABC'); org.createEmployees(); +console.log("\n Employee Salary: "); org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); +console.log("\n Salary After Increment : "); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); - +console.log("\n Salary After Bonus : "); +salaryUpgrader.addBonus(2,org.getEmployeeList()); +//Check the workflow +org.printEmployeesInfo(); diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..5de1a15 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 (percentRaise, empList) { + empList.map(function (emp) { + var oldSalary = emp.getSalary(); + var newSalary = emp.getStar() >= 4 ? (oldSalary * percentRaise / 100) + oldSalary : oldSalary; + emp.updateSalary(newSalary); + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 37f2bb2..75115e6 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,10 +10,11 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } - addBonus() { - - } - rateEmployee(){ - + addBonus(percentRaise: number,empList: Employee[]) { + empList.map(emp=>{ + let oldSalary = emp.getSalary(); + let newSalary = emp.getStar() >= 4 ? (oldSalary*percentRaise/100) + oldSalary : oldSalary; + emp.updateSalary(newSalary); + }) } } \ No newline at end of file