From d7e58f13afcc4d4c0226f682bf3a2df744253a4f Mon Sep 17 00:00:00 2001 From: Nadoshka Date: Wed, 27 Mar 2019 21:30:08 +0100 Subject: [PATCH 1/2] homework week 2 js 2 --- Week2/homework/maartjes-work.js | 10 ++++++++-- Week2/homework/map-filter.js | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Week2/homework/maartjes-work.js b/Week2/homework/maartjes-work.js index 49772eb44..a42bf0ca1 100644 --- a/Week2/homework/maartjes-work.js +++ b/Week2/homework/maartjes-work.js @@ -47,7 +47,13 @@ const maartjesHourlyRate = 20; function computeEarnings(tasks, hourlyRate) { // Replace this comment and the next line with your code - console.log(tasks, hourlyRate); + const maartjesTasks = tasks.map(elem => ({ ...elem, duration: elem.duration / 60 })); + const filteredTasks = maartjesTasks.filter(elem => elem.duration > 2); + const sumEarning = filteredTasks.reduce((acc, elem) => { + const earning = elem.duration * hourlyRate; + return acc + earning; + }, 0); + return sumEarning; } // eslint-disable-next-line no-unused-vars @@ -55,7 +61,7 @@ const earnings = computeEarnings(maartjesTasks, maartjesHourlyRate); // add code to convert `earnings` to a string rounded to two decimals (euro cents) -console.log(`Maartje has earned €${'replace this string with the earnings rounded to euro cents'}`); +console.log(`Maartje has earned €${earnings.toFixed(2)}`); // Do not change or remove anything below this line module.exports = { diff --git a/Week2/homework/map-filter.js b/Week2/homework/map-filter.js index c8e8a88c1..3cc65aa4f 100644 --- a/Week2/homework/map-filter.js +++ b/Week2/homework/map-filter.js @@ -1,9 +1,11 @@ 'use strict'; function doubleOddNumbers(numbers) { - // Replace this comment and the next line with your code - console.log(numbers); + var filteredNumbered = numbers.filter(elem => elem % 2); + var doubledNumber = filteredNumbered.map(elem => elem * 2); + return doubledNumber; } +// console.log(numbers); const myNumbers = [1, 2, 3, 4]; console.log(doubleOddNumbers(myNumbers)); From 0d63c239109eb98d962472df5c0bb7738acab596 Mon Sep 17 00:00:00 2001 From: Nadin Atik <42914203+Nadoshka@users.noreply.github.com> Date: Thu, 28 Mar 2019 17:14:25 +0100 Subject: [PATCH 2/2] Update map-filter.js --- Week2/homework/map-filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week2/homework/map-filter.js b/Week2/homework/map-filter.js index 3cc65aa4f..25cdc2a0b 100644 --- a/Week2/homework/map-filter.js +++ b/Week2/homework/map-filter.js @@ -1,7 +1,7 @@ 'use strict'; function doubleOddNumbers(numbers) { - var filteredNumbered = numbers.filter(elem => elem % 2); + var filteredNumbered = numbers.filter(elem => elem % 2 !== 0); var doubledNumber = filteredNumbered.map(elem => elem * 2); return doubledNumber; }