test1

Nirmalaashok · Nirmalaashok · commit e1dec700d0c9 · 2024-01-18T14:34:27.000-08:00
diff --git a/Week1/homework/index.html b/Week1/homework/index.html
@@ -1 +1,13 @@
-<!-- replace this with your HTML content -->
+<!-- replace this with your HTML content -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Squirtle</title>
+    <script src=""
+</head>
+<body>
+    
+</body>
+</html>
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
@@ -19,20 +19,28 @@ _Deadline Wednesday_
 Your solution could be something like this:
 
 ```js
-function doubleOddNumbers(numbers) {
-  const newNumbers = [];
-  for (let i = 0; i < numbers.length; i++) {
-    if (numbers[i] % 2 !== 0) {
-      newNumbers.push(numbers[i] * 2);
-    }
-  }
-  return newNumbers;
-}
-
-const myNumbers = [1, 2, 3, 4];
-console.log(doubleOddNumbers(myNumbers)); // ==> [2, 6]
+//function doubleOddNumbers(numbers) {
+ // const newNumbers = [];
+  //for (let i = 0; i < numbers.length; i++) {
+    //if (numbers[i] % 2 !== 0) {
+   //   newNumbers.push(numbers[i] * 2);
+  //  }
+ // }
+ // return newNumbers;
+//}
+
+//const myNumbers = [1, 2, 3, 4];
+//console.log(doubleOddNumbers(myNumbers)); // ==> [2, 6]
 ```
 
+// Pass a function to map
+function doubleOddNumbers(){
+const numbers = [1,3,5,7,9,11]
+const doubled = numbers.map((number)=> number*2); // function inside array map is copying numbers values
+  return doubled
+}
+const result = doubleOddNumbers()
+console.log(result);
 Rewrite the above `doubleOddNumbers` function using `map` and `filter`; don't forget to use `=>`.
 
 ---
diff --git a/Week2/homework/maartjes-work.js b/Week2/homework/maartjes-work.js
@@ -14,7 +14,7 @@ const monday = [
     duration: 20,
   },
   {
-    name: 'Talk to a lot of people!',
+    name: 'Talk to a lot of people',
     duration: 200,
   },
 ];
@@ -45,17 +45,25 @@ const tuesday = [
 const maartjesTasks = monday.concat(tuesday);
 const maartjesHourlyRate = 20;
 
-function computeEarnings(tasks, hourlyRate) {
+//function computeEarnings(tasks, hourlyRate) {
   // Replace this comment and the next line with your code
-  console.log(tasks, hourlyRate);
-}
+  
+//  console.log(tasks, hourlyRate);
+//}
+
+function computeEarnings(tasks, hourlyRate){
+const computeEarnings = (tasks, hourlyRate) => {
+  const durationsInHours = maartjesTasks.map(task => task.duration / 60);
+  const filteredHours = durationsInHours.filter(hour => hour >= 2);
+  const totalEarnings = filteredHours.reduce((acc, cv) => acc + cv * hourlyRate, 0);
+  return totalEarnings;
+} };
 
 // eslint-disable-next-line no-unused-vars
 const earnings = computeEarnings(maartjesTasks, maartjesHourlyRate);
+//two decimal
+console.log(`Maartje has earned: €${maartjesEarnings.toFixed(2)}`);
 
-// 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'}`);
 
 // 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,10 +1,10 @@
 'use strict';
 
+
+
 function doubleOddNumbers(numbers) {
-  // Replace this comment and the next line with your code
-  console.log(numbers);
+  return numbers.filter(num => num % 2 !== 0).map(oddNum => oddNum * 2);
 }
-
 const myNumbers = [1, 2, 3, 4];
 console.log(doubleOddNumbers(myNumbers));
 
diff --git a/Week2/test/map-filter.test.js b/Week2/test/map-filter.test.js
@@ -6,3 +6,4 @@ describe('map_filter', () => {
     expect(result).toEqual([2, 6]);
   });
 });
+ 
diff --git a/package-lock.json b/package-lock.json

-Original file line number
+Diff line change
     expect(result).toEqual([2, 6]);
   });
 });
++