South Africa-class 1 AashiqAbrahams JS-core1 week1

README.md

@@ -2,7 +2,7 @@
 
 Like learning a musical instrument, programming requires daily practise.
 
-The exercises are split into three folders: `exercises`, `mandatory` and `extra`. All homework in the `exercise` and `mandatory` section **must** be completed for homework by the following lesson. 
+The exercises are split into three folders: `exercises`, `mandatory` and `extra`. All homework in the `exercise` and `mandatory` section **must** be completed for homework by the following lesson.
 
 The `extra` folder contains exercises that you can complete to challenge yourself, but are not required for the following lesson.
 

exercises/B-hello-world/exercise.js

@@ -1 +1,3 @@
 console.log("Hello world");
+console.log("Hello World. I just started learning JavaScript!");
+console.log(2);

exercises/C-variables/exercise.js

@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
+const greeting = "Hello World";
 
 console.log(greeting);
+console.log(greeting);
+console.log(greeting);

exercises/D-strings/exercise.js

@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
+const message = "This is a String";
 
 console.log(message);
+console.log(typeof message);

exercises/E-strings-concatenation/exercise.js

@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+let greetingStart = "Hello, my name is ";
+let name = "Aashiq"
 
-console.log(message);
+let greeting = greetingStart + name;
+
+console.log(greeting);

exercises/F-strings-methods/exercise.js

@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
+const name = "Aashiq";
 
-console.log(message);
+console.log("My name is " + name + " and my name is " + name.length + " characters long"); 

exercises/F-strings-methods/exercise2.js

@@ -1,3 +1,3 @@
 const name = " Daniel  ";
 
-console.log(message);
+console.log("My name is " + name.trim() + " and my name is " + name.trim().length + " characters long"); 

exercises/G-numbers/exercise.js

@@ -1 +1,7 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+const numberOfStudents = 15;
+const numberOfMentors = 8;
+
+console.log("Number of students: " + numberOfStudents);
+console.log("Number of mentors: " + numberOfMentors);
+console.log("Total number of students and mentors: " + (numberOfMentors + numberOfStudents));

exercises/I-floats/exercise.js

@@ -1,2 +1,5 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+console.log("Percentage students: " + Math.round(numberOfStudents/(numberOfStudents + numberOfMentors)*100)+"%");
+console.log("Percentage mentors: " + Math.round(numberOfMentors/(numberOfStudents + numberOfMentors)*100)+"%");

exercises/J-functions/exercise.js

@@ -1,5 +1,6 @@
 function halve(number) {
   // complete the function here
+  return number/2;
 }
 
 var result = halve(12);

exercises/J-functions/exercise2.js

@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  return number*3;
 }
 
 var result = triple(12);

exercises/K-functions-parameters/exercise.js

@@ -1,6 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(a, b) {
   // Calculate the result of the function and return it
+  return a*b;
 }
 
 // Assign the result of calling the function the variable `result`

exercises/K-functions-parameters/exercise2.js

@@ -1,4 +1,7 @@
 // Declare your function first
+function divide(a, b) {
+    return a/b;
+}
 
 var result = divide(3, 4);
 

exercises/K-functions-parameters/exercise3.js

@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(greet) {
+    return "Hello, my name is " + greet;
+}
 
 var greeting = createGreeting("Daniel");
 

exercises/K-functions-parameters/exercise4.js

@@ -1,5 +1,9 @@
 // Declare your function first
+function addition(a, b) {
+    return a + b;
+}
 
 // Call the function and assign to a variable `sum`
+let sum = addition(13, 124);
 
 console.log(sum);

exercises/K-functions-parameters/exercise5.js

@@ -1,4 +1,7 @@
 // Declare your function here
+function createLongGreeting(name, age) {
+    return "Hello, my name is "+ name + " and I'm " + age + " years old ";
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

exercises/L-functions-nested/exercise.js

@@ -3,3 +3,17 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function shoutName(name) {
+    return name.toUpperCase();
+}
+
+function shoutGreeting(mentor) {
+    return "HELLO " + shoutName(mentor);
+}
+
+console.log(shoutGreeting(mentor1));
+console.log(shoutGreeting(mentor2));
+console.log(shoutGreeting(mentor3));
+console.log(shoutGreeting(mentor4));
+console.log(shoutGreeting(mentor5));

mandatory/1-syntax-errors.js

@@ -1,16 +1,17 @@
 // There are syntax errors in this code - can you fix it to pass the tests?
 
-function addNumbers(a b c) {
+function addNumbers(a, b, c) {
     return a + b + c;
 }
 
-function introduceMe(name, age)
-return "Hello, my name is " + name "and I am " age + "years old";
+function introduceMe(name, age) {
+return "Hello, my name is " + name + " and I am " + age + " years old";
+}
 
 function getTotal(a, b) {
-    total = a ++ b;
+   const total = a + b;
 
-    return "The total is total"
+    return "The total is " + total;
 }
 
 /* 

mandatory/2-logic-error.js

@@ -1,16 +1,15 @@
 // The syntax for this function is valid but it has an error, find it and fix it.
 
 function trimWord(word) {
-  return wordtrim();
+  return word.trim();
 }
 
 function getWordLength(word) {
-  return "word".length();
+  return word.length;
 }
 
 function multiply(a, b, c) {
-  a * b * c;
-  return;
+  return a * b * c; 
 }
 
 /* 

mandatory/3-function-output.js

@@ -1,18 +1,23 @@
 // Add comments to explain what this function does. You're meant to use Google!
-function getRandomNumber() {
-  return Math.random() * 10;
+// This function returns a random number >= 0 and < 10
+function getNumber() {
+  return Math.random() * 10; // returns the number entered multiplied by a random integer from 0 to 9
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
-function combine2Words(word1, word2) {
-  return word1.concat(word2);
+// This function returns the two input parameters concatenated (i.e. the second one following the first)
+function combine2Words(w1, w2) {
+  return word1.concat(w2); // concatenates w1 and w2 without white space
 }
 
 function concatenate(firstWord, secondWord, thirdWord) {
   // Write the body of this function to concatenate three words together.
   // Look at the test case below to understand what this function is expected to return.
+   return `${firstWord} ${secondWord} ${thirdWord}`;
 }
 
+console.log(concatenate("Code","Your","Future"));
+
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

mandatory/4-tax.js

@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice) {
+  return productPrice * 1.2;
+}
+console.log(calculateSalesTax(15));
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(price) {
+  price = calculateSalesTax(price);
+  return `£${price.toFixed(2)}`
+}
 
 /* 
 ===================================================