CodeYourFuture · nPelvin · Jan 21, 2021 · mulindierick · Jan 21, 2021 · mulindierick
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,2 @@
-console.log("Hello world");
+console.log("Hello world, I just started learning JavaScript!");
+console.log("Potato");
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hello world";
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var message="This is a string";
+var messageType=typeof message;
 console.log(message);
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
-console.log(message);
+var greetingStart="Hello, My name is ";
+var firstName="Nigel";
+var greeting=greetingStart + firstName;
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var firstName="Daniel";
+var nameLength=firstName.length;
+var message=`My name is ${firstName} and my name is ${nameLength} characters long`;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
 const name = " Daniel  ";
-
+const nameTrim=name.trim();
+const nameLength=nameTrim.length;
+const message=`My name is ${nameTrim} and my name is ${nameLength} characters long`
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,7 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+const numberOfStudents=15;
+const numberOfMentors=8;
+const totalHumans=numberOfStudents+numberOfMentors;
+console.log(`Number of Students: ${numberOfStudents}`);
+console.log(`Number of Mentors: ${numberOfMentors}`);
+console.log(`Total Number of Students and Mentors: ${totalHumans}`);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,6 @@
 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) + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,12 @@
 function halve(number) {
-  // complete the function here
+return number/2;
 }
 
 var result = halve(12);
+console.log(result);
+
+var result = halve(1);
+console.log(result);
 
+var result = halve(666);
 console.log(result);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,5 +1,5 @@
 function triple(number) {
-  // complete function here
+return 3*number
 }
 
 var result = triple(12);

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,6 +1,6 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+function multiply(a,b) {
+return a*b;
 }
 
 // Assign the result of calling the function the variable `result`

diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function divide(a,b){
+    return a/b;
+}
 var result = divide(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,6 @@
-// Write your function here
+function createGreeting(name){
+    return `Hello, my name is ${name}`;
+}
 
 var greeting = createGreeting("Daniel");
 

diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
-// Declare your function first
+function adder(a,b){
+    return a+b;
+}
 
-// Call the function and assign to a variable `sum`
+var sum=adder(13,124);
 
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,6 @@
-// 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);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,8 @@
-var mentor1 = "Daniel";
-var mentor2 = "Irina";
-var mentor3 = "Mimi";
-var mentor4 = "Rob";
-var mentor5 = "Yohannes";
+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) + "%");
+
+
diff --git a/exercises/L-functions-nested/exercise2.js b/exercises/L-functions-nested/exercise2.js
@@ -0,0 +1,19 @@
+var mentor1 = "Daniel";
+var mentor2 = "Irina";
+var mentor3 = "Mimi";
+var mentor4 = "Rob";
+var mentor5 = "Yohannes";
+var greeting = "HELLO ";
+
+function shout(name){
+    console.log(greeting + name.toUpperCase());
+}
+
+shout(mentor1);
+shout(mentor2);
+shout(mentor3);
+shout(mentor4);
+shout(mentor5);
+
+
+
diff --git a/mandatory/1-syntax-errors.js b/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;
+    total = a + b;
 
-    return "The total is total"
+    return "The total is " + total;
 }
 
 /* 

diff --git a/mandatory/2-logic-error.js b/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;
 }
 
 /* 

diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
@@ -1,16 +1,15 @@
-// Add comments to explain what this function does. You're meant to use Google!
+// Returns a pseudo-random number between 0 and 10
 function getNumber() {
   return Math.random() * 10;
 }
 
-// Add comments to explain what this function does. You're meant to use Google!
+// Concatenates w1 and w2
 function s(w1, w2) {
   return w1.concat(w2);
 }
 
 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;
 }
 
 /* 

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,9 @@
   Sales tax is 20% of the price of the product
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(price) {
+  return price*1.2;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +19,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) {
+    return "£"+calculateSalesTax(price).toFixed(2);
+
+}
 
 /* 
 ===================================================