finished planningclass12

mkruijt · mkruijt · commit 1cfb7024a497 · 2017-11-28T15:18:16.000+01:00
diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
@@ -72,21 +72,16 @@ console.log('I'm awesome');
 ```
 2\.1 Copy the code in your `.js` file and run it. You will see that you will get a SyntaxError. Find a solution for this error, Hint read the error message carefully, it also gives an indication of where the problem is.
 
-3\. Declare a variable `x` and initialize it with an integer.  
-
-3\.1 First, _declare_ your variable `x`.
-
+3\. Declare a variable `x` and initialize it with an integer.    
+3\.1 First, _declare_ your variable `x`.  
 3\.2 Add a console.log statement that explains that explains in words what _you think_ the value of `x` is, like in this example:
 ```js
   // TODO -> here you initialize your variable
   console.log('the value of my variable x will be: whateverYouThinkItWillLog');
 ```
-3\.3 Add a console.log statement that logs the value of `x`
-
-3\.4 Now _initialize_ your variable `x` with an integer
-
-3\.5 Now add a console.log statement that explains what _you think_ the value of `x` is.
-
+3\.3 Add a console.log statement that logs the value of `x`.  
+3\.4 Now _initialize_ your variable `x` with an integer.  
+3\.5 Now add a console.log statement that explains what _you think_ the value of `x` is.  
 3\.6 Add a console.log statement that logs the value of `x`.
   Steps to be taken:
   
@@ -100,16 +95,11 @@ console.log('I'm awesome');
 ```
 
 4\. Declare a variable `y` and assign a string to it.  
-
-4\.1 Write a console.log statement in which you explain in words what _you think_ the value of the string is
-
-4\.2 Now console.log the variable `y`.
-
-4\.3 Now assign a new string to the variable `y`
-
-4\.4 Just like you did before write a console.log statement that explains in words what you think will be logged to the console.
-
-4\.5 Now console.log `y` again.
+4\.1 Write a console.log statement in which you explain in words what _you think_ the value of the string is.  
+4\.2 Now console.log the variable `y`.  
+4\.3 Now assign a new string to the variable `y`.  
+4\.4 Just like you did before write a console.log statement that explains in words what you think will be logged to the console.  
+4\.5 Now console.log `y` again.  
 ```js
   // TODO -> here you declare AND assign your string
   console.log('the value of my string will be: whateverYouThinkItWillLog');
@@ -120,61 +110,39 @@ console.log('I'm awesome');
 ```
 
 5\. How do you round the number 7.25, to the nearest integer?  
-
-5\.1 Declare a variable `z` and assign the number 7.25 to it.
-
-5\.2 Console.log `z`.
-
-5\.3 Declare another variable `a` that has the value of z but rounded to the nearest integer.
-
-5\.4 Console.log `a`
-
-5\.5 So now we have `z` and `a` find a way to compare the two values and store the highest of the two in a new variable.
-
-5\.6 Console.log the highest value.
+5\.1 Declare a variable `z` and assign the number 7.25 to it.  
+5\.2 Console.log `z`.  
+5\.3 Declare another variable `a` that has the value of z but rounded to the nearest integer.  
+5\.4 Console.log `a`.  
+5\.5 So now we have `z` and `a` find a way to compare the two values and store the highest of the two in a new variable.  
+5\.6 Console.log the highest value.  
 
 6\. Arrays!  
-
-6\.1 Declare an empty array (you can decide on how to call it yourself, but read on a bit here and see if you can find a good name that exactly describes what this variable will hold).
-
-6\.2 Write a console.log statement that explains in words what you think the value of the array is.
-
-6\.3 Console.log your array.
-
-6\.4 Create an array that has your favorite animals inside
-
-6\.5 Log your array
-
-6\.6 Add a statement that adds Daan's favorite animal (baby pig) to the *existing array*
-
-6\.7 Log your new array!
-
-7\. More strings 
-
-7\.1 Let's consider the following string: `let myString = "this,is,a,test"`.
-
-7\.2 Add the string to your file and console.log it.
-
-7\.3 Find a way to get the length of `myString`.
-
-7\.4 Console.log the length of `myString`.
+6\.1 Declare an empty array (you can decide on how to call it yourself, but read on a bit here and see if you can find a good name that exactly describes what this variable will hold).  
+6\.2 Write a console.log statement that explains in words what you think the value of the array is.  
+6\.3 Console.log your array.  
+6\.4 Create an array that has your favorite animals inside.  
+6\.5 Log your array.  
+6\.6 Add a statement that adds Daan's favorite animal (baby pig) to the *existing array*.  
+6\.7 Log your new array!  
+
+7\. More strings  
+7\.1 Let's consider the following string: `let myString = "this,is,a,test"`.  
+7\.2 Add the string to your file and console.log it.  
+7\.3 Find a way to get the length of `myString`.  
+7\.4 Console.log the length of `myString`.  
 
 8\. Write a program that checks the types of two variables and prints out `SAME TYPE` if they are the same type.  
-
-8\.1 First declare at least four variables and assign them different data types.
-
-8\.2 For each variable write a `console.log` statement that logs the value 
+8\.1 First declare at least four variables and assign them different data types.  
+8\.2 For each variable write a `console.log` statement that logs the value  
   ```js 
   let foo = 3;
   console.log('The value of my variable foo is: ' + foo);
   ```
-8\.3 Now write a console.log statement wherein you first explain in words what you think the _type_ of your variables is.
-
-8\.4 Now use `typeof` to log the actual _type_ of your variables.
-
-8\.5 Now compare the types of your different variables with one another.
-
-8\.6 Make sure to also show a message when the variables you are comparing are not the same type.
+8\.3 Now write a console.log statement wherein you first explain in words what you think the _type_ of your variables is.  
+8\.4 Now use `typeof` to log the actual _type_ of your variables.  
+8\.5 Now compare the types of your different variables with one another.  
+8\.6 Make sure to also show a message when the variables you are comparing are not the same type.  
 
 For example:
 
@@ -189,16 +157,12 @@ if () {
 ```
 
 9\. If `x` equals 7, and the only other statement is `x = x % 3`, what would be the new value of `x`?  
-
-9\.1 Add at least 3 `console.log` statements in which you show that you understand what `%` does.
+9\.1 Add at least 3 `console.log` statements in which you show that you understand what `%` does.  
 
 10\. Write a program to answer the following questions:  
-
-10\.1 Can you store multiple types in an array? Numbers and strings? Make an example that illustrates your answer.
-
-10\.2 Can you compare infinities? (Not in Eyad's world) - does 6/0 === 10/0? How can you test this?
-
-10\.3 Add console.log statements to the above program's in which you show that you understand the concepts (just like you've done in the above assignments).
+10\.1 Can you store multiple types in an array? Numbers and strings? Make an example that illustrates your answer.  
+10\.2 Can you compare infinities? (Not in Eyad's world) - does 6/0 === 10/0? How can you test this?  
+10\.3 Add console.log statements to the above program's in which you show that you understand the concepts (just like you've done in the above assignments).  
 
 ### Step 4: **Some freeCodeCamp challenges (10 hours):**
 
diff --git a/Week1/README.md b/Week1/README.md
@@ -28,7 +28,7 @@ Please watch the following parts of the course, [Programming Foundations Fundame
 - Program structure ~ http://eloquentjavascript.net/02_program_structure.html
 
 ### Review
-- Go through the review of [week 1](https://github.com/HackYourFuture/JavaScript/blob/master/Week1/REVIEW.md)
-- Go through the review of [week 2](https://github.com/HackYourFuture/JavaScript/blob/master/Week2/REVIEW.md)
+- Go through the review of [week 1](/Week1/REVIEW.md)
+- Go through the review of [week 2](/Week2/REVIEW.md)
 
 _Please go through the material and come to class prepared!_
diff --git a/Week5/MAKEME.md b/Week5/MAKEME.md
@@ -23,31 +23,26 @@ _Deadline Wednesday_
 
 1. Say you would like to write a program that doubles the odd numbers in an array and throws away the even number.
 
-Your solution could be something like this:
-```js
-let numbers = [1, 2, 3, 4];
-let newNumbers = [];
-
-for(let i = 0; i < numbers.length; i++) {
-    if(numbers[i] % 2 !== 0) {
-        newNumbers[i] = numbers[i] * 2;
+    Your solution could be something like this:
+    ```js
+    let numbers = [1, 2, 3, 4];
+    let newNumbers = [];
+
+    for(let i = 0; i < numbers.length; i++) {
+        if(numbers[i] % 2 !== 0) {
+            newNumbers.push(numbers[i] * 2);
+        }
     }
-}
 
-console.log("The doubled numbers are", newNumbers); // [2, 6]
+    console.log("The doubled numbers are", newNumbers); // [2, 6]
 
-```
+    ```
 
-rewrite the above program using `map` and `filter` don't forget to use `=>`
+    Rewrite the above program using `map` and `filter` don't forget to use `=>`
 
-2. Use the array of the previous assignment, write a program that add the even numbers to the resulting array twice, but the odd numbers only once. Don't forget to use `=>`.
-
-Your output should be:
-```js
-console.log("The final numbers are", newNumbers);// [1, 2, 2, 3, 4, 4]
-```
 
 Underneath you see a very interesting small insight in Maartje's work:
+
 ```js
 let monday = [
         {
@@ -67,10 +62,10 @@ let monday = [
             duration : 200
         }
     ];
- 
+
 let tuesday = [
         {
-            name     : 'Keep writing summery',
+            name     : 'Keep writing summary',
             duration : 240
         },
         {
@@ -90,17 +85,16 @@ let tuesday = [
             duration : 40
         }
     ];
-     
-let tasks = [monday, tuesday];
+
+let tasks = monday.concat(tuesday);
 ```
 
-3. Write a program that does the following:
+2. Write a program that does the following below. Use `map` and `filter`. You will also need a `forEach` or a `for` loop for the 'summing up' part.
 
 - Collect two days' worth of tasks.
 - Convert the task durations to hours, instead of minutes.
-- Filter out everything that took two hours or more.
-- Sum it all up.
-- Multiply the result by a per-hour rate for billing (you can decide yourself what Maartje should make per hour).
+- Filter out everything that took two hours or more
+- Multiply the each duration by a per-hour rate for billing (you can decide yourself what Maartje should make per hour) and sum it all up.
 - Output a formatted Euro amount.
 - Don't forget to use `=>`
 
@@ -114,6 +108,7 @@ _Deadline Saturday_
 
 3. [Iterate over Arrays with map](https://www.freecodecamp.com/challenges/iterate-over-arrays-with-map)
 
+
 ### Step 4: Read before next lecture
 
 _Deadline Sunday morning_
diff --git a/Week6/MAKEME.md b/Week6/MAKEME.md
@@ -16,7 +16,12 @@ _Deadline Monday_
 
 Give feedback on `step 3` of `week 5` to one of your fellow students (do this by creating issues in Github). 
 
-### Step 2: JavaScript
+## Step 2: Git Homework
+
+[Make these assignments](https://github.com/HackYourFuture/Git/blob/master/Lecture-3.md). For handing in homework follow the Forking workflow that is described  in our lecture-3.md  file of HackYourFuture’s Git repository (there is also a video that explains this).
+
+
+### Step 3: JavaScript
 
 _Deadline Wednesday_
 
@@ -100,7 +105,7 @@ If you are confused please run the code and then consult the Google for "javaScr
 
 <!-- Write assignment with more fun API -->
 
-### Step 3: Some more JavaScript
+### Step 4: Some more JavaScript
 
 _Deadline Saturday_
 
@@ -129,7 +134,7 @@ You can see `CommandLine` in the URL. These are called "query parameters" and le
 __Bonus__: Write a function takes this array `['a', 'b', 'c', 'd', 'a', 'e', 'f', 'c']` and returns an array which only has unique values in it (so it removes the duplicate ones). Make it a 'smart' algorithm that could do it for every array (only strings/number). Try to make it as fast as possible!
 
 
-### Step 4: Read before next lecture
+### Step 5: Read before next lecture
 
 _Deadline Sunday morning_
 
diff --git a/Week7/MAKEME.md b/Week7/MAKEME.md
@@ -9,25 +9,21 @@ Topics discussed this week:
 
 >[Here](/Week7/README.md) you find the readings you have to complete before the eighth lecture.
 
-## Step 1: Git Homework
-
-[Make these assignments](https://github.com/HackYourFuture/Git/blob/master/Lecture-3.md). For handing in homework follow the Forking workflow that is described  in our lecture-3.md  file of HackYourFuture’s Git repository (there is also a video that explains this).
-
-## Step 2: Give feedback on Step 3 and 4 of last weeks homework.
+## Step 1: Give feedback on Step 3 and 4 of last weeks homework.
 
 Give feedback on the SPA (Github API) and git branching homework of one of you fellow students. Please provide the feedback in an issue.
 
-## Step 3: Issues
+## Step 2: Issues
 
 - Solve all your Git issues. DO NO CLOSE AN ISSUE WITHOUT AN EXPLANATION OR CODE COMMIT REFERENCING THAT ISSUE. 
 
 
-### Step 2: Fix issues and API
+### Step 3: Fix issues and API
 
 - Fix the issues from the last week and make sure you explain how you fixed the issue in a comment (or commit message)
 
 
-### Step 3: SPA :sweat_drops:
+### Step 4: SPA :sweat_drops:
 You are going to write a SPA (Single Page Application) that uses the [Github API](https://developer.github.com/guides/getting-started/). Make sure that your app uses a logical pattern just like [this codepen](http://codepen.io/Razpudding/pen/MmVpeW).
 
 Just like last week:
