Changes Week1 and Week2

Radhikajram · Radhikajram · commit 23784be4f8f9 · 2019-07-07T16:11:16.000+05:30
diff --git a/Week1/homework/app.js b/Week1/homework/app.js
@@ -19,7 +19,8 @@ const bookTitles = [
 
 // Create ul  element  and assign id
 
-const ul = document.createElement('ol');
+const ul = document.createElement('ul');
+ul.setAttribute('id', 'booktitle');
 
 // eslint-disable-next-line no-unused-vars
 function createBookList(bookId) {
@@ -111,7 +112,7 @@ function createBookListUsingObject(bookObj) {
     li.appendChild(head);
     li.appendChild(headLanguageContent);
     li.appendChild(headAuthor);
-    document.write('<br>');
+    li.style.cssFloat = 'left';
 
     ul.appendChild(li);
 
@@ -149,3 +150,30 @@ function imageDisplay(imageObject) {
 }
 
 imageDisplay(bookimage);
+
+// eslint-disable-next-line no-undef
+ul.style.display = 'grid';
+ul.style.gridTemplateColumns = 'auto auto';
+ul.style.gridAutoColumns = 'minmax(auto,auto)';
+ul.style.gridAutoRows = 'minmax(auto,auto)';
+
+// eslint-disable-next-line no-unused-vars
+function createGrid(x) {
+  for (let rows = 0; rows < x; rows++) {
+    for (let col = 0; col < x; col++) {
+      // eslint-disable-next-line no-undef
+    //  $('#booktitle').append("<div> class='grid'></div>");
+      const grid = document.getElementById("booktitle");
+      grid.appendChild(li)
+    }
+  }
+
+  // eslint-disable-next-line no-undef
+  $('.grid').height(960 / x);
+  // eslint-disable-next-line no-undef
+  $('.grid').width(960 / x);
+}
+
+// eslint-disable-next-line no-undef
+createGrid(2);
+*/
diff --git a/Week2/homework/maartjes-work.js b/Week2/homework/maartjes-work.js
@@ -45,10 +45,19 @@ const tuesday = [
 const maartjesTasks = monday.concat(tuesday);
 const maartjesHourlyRate = 20;
 
-function computeEarnings(tasks, hourlyRate) {
-  // Replace this comment and the next line with your code
-  console.log(tasks, hourlyRate);
-}
+const computeEarnings = maartjesTasks
+  .map(tasks => [tasks.duration] / 60)
+  .filter(duration => [duration] >= 2)
+  .map(duration => duration * maartjesHourlyRate)
+  .reduce((prev, curr) => [+prev + +curr])
+  .map(amount => '€' + amount.toFixed(2));
+
+console.log(computeEarnings);
+
+// /function computeEarnings(tasks, hourlyRate) {
+// Replace this comment and the next line with your code
+// console.log(tasks, hourlyRate);
+// }
 
 // eslint-disable-next-line no-unused-vars
 const earnings = computeEarnings(maartjesTasks, maartjesHourlyRate);
diff --git a/Week2/homework/map-filter.js b/Week2/homework/map-filter.js
@@ -1,12 +1,22 @@
 'use strict';
 
-function doubleOddNumbers(numbers) {
-  // Replace this comment and the next line with your code
-  console.log(numbers);
-}
-
 const myNumbers = [1, 2, 3, 4];
-console.log(doubleOddNumbers(myNumbers));
+
+/* function doubleOddNumbers(numbers) {
+  //   // Replace this comment and the next line with your code
+  const newNumbers = [];
+  for (let i = 0; i < numbers.length; i++) {
+    if (numbers[i] % 2 !== 0) {
+      newNumbers.push(numbers[i] * 2);
+    }
+  }
+  return newNumbers;
+} */
+
+const doubleOddNumbers = myNumbers.filter(numbers => numbers % 2 !== 0).map(numbers => numbers * 2);
+// eslint-disable-next-line no-unused-vars
+const result = doubleOddNumbers(myNumbers);
+console.log(result);
 
 // Do not change or remove anything below this line
 module.exports = {
diff --git a/Week2/test/map-filter.test.js b/Week2/test/map-filter.test.js
@@ -1,4 +1,4 @@
-const { myNumbers, doubleOddNumbers } = require(`../homework/map-filter`);
+const { myNumbers, doubleOddNumbers } = require(`../homework/map-filter`).default;
 
 describe('map_filter', () => {
   test('result -> [2, 6]', () => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-const { myNumbers, doubleOddNumbers } = require(`../homework/map-filter`);
	`1`	+const { myNumbers, doubleOddNumbers } = require(`../homework/map-filter`).default;
`2`	`2`
`3`	`3`	`describe('map_filter', () => {`
`4`	`4`	`test('result -> [2, 6]', () => {`