foocoding · chichiglacierz · Jul 23, 2019
diff --git a/Week2/homework/.vscode/settings.json b/Week2/homework/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "squirtle"
+  ]
+}
diff --git a/Week2/homework/index.html b/Week2/homework/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+    <title>Pokemon Sprites</title>
+  </head>
+  <body>
+    <h2>Pokemon Sprites</h2>
+    <script type="text/javascript" src="squirtle-sprites.js"></script>
+  </body>
+</html>
diff --git a/Week2/homework/maartjes-work.js b/Week2/homework/maartjes-work.js
@@ -45,17 +45,25 @@ const tuesday = [
 const maartjesTasks = monday.concat(tuesday);
 const maartjesHourlyRate = 20;
 
+/**
+ * Use of High order functions: map, filter, toFixed
+ */
+
 function computeEarnings(tasks, hourlyRate) {
-  // Replace this comment and the next line with your code
-  console.log(tasks, hourlyRate);
+  // mapping duration of tasks from minutes to hours and filtering out duties < 2h
+  const timeInHours = tasks.map(time => time.duration / 60).filter(duty => duty >= 2);
+  const salaryPerDay = timeInHours.map(hoursPerDay => hoursPerDay * hourlyRate);
+  const totalSalary = salaryPerDay.reduce((sum, dailySalary) => sum + dailySalary, 0);
+  const euroSalary = totalSalary.toFixed(2);
+  return euroSalary;
 }
 
 // eslint-disable-next-line no-unused-vars
 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}`);
 
 // 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
@@ -1,12 +1,16 @@
 'use strict';
-
 function doubleOddNumbers(numbers) {
   // Replace this comment and the next line with your code
+  // the following iterates the variables in numbers(with filter) and checking if they´re divisible by 2
+  // const newNumbers = [];
+  // for (let i = 0; i =numbers.length)
+  numbers = numbers.filter(num => num % 2 === 1).map(num => num * 2);
   console.log(numbers);
+  return numbers;
 }
 
 const myNumbers = [1, 2, 3, 4];
-console.log(doubleOddNumbers(myNumbers));
+console.log(doubleOddNumbers(myNumbers)); // output : [2, 6]
 
 // Do not change or remove anything below this line
 module.exports = {

diff --git a/Week2/homework/squirtle-sprites.js b/Week2/homework/squirtle-sprites.js