CodeYourFuture · PeterAhern · Aug 11, 2021 · Aug 12, 2021
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,4 @@
-console.log("Hello world");
+console.log(
+  "Hello world I am talking to you in Javascript," + " I am learning fast."
+  //5
+);
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 everybody"
+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 the official message.";
+var messageType = typeof message;
 console.log(message);
+console.log("The message is a : " + messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
-
-console.log(message);
+var message = "Hello, my name is ";
+var myName = "Pete";
+console.log(message + myName);
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`
-
-console.log(message);
+var message = "My name is ";
+var myName = "Pete";
+var charLength = ", which is made up of " + myName.length + " characters.";
+console.log(message + myName + charLength);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,4 @@
-const name = " Daniel  ";
+const name = " Pete  ";
+var message = "My name is ";
 
-console.log(message);
+console.log(message + name.trim());
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`
+var numberOfStudents = 10;
+var numberOfMentors = 5;
+var total = numberOfStudents + numberOfMentors;
+console.log("Number of Students:" + numberOfStudents);
+console.log("Number of Mentors:" + numberOfMentors);
+console.log("Total number of students & mentors:" + total);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,9 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var totalNum = numberOfMentors + numberOfStudents;
+var percentageStud = Math.round(numberOfStudents/totalNum*100);
+var percentageMent = Math.round((numberOfMentors / totalNum) * 100);
+
+console.log("Student percentage: " + percentageStud + "%");
+
+console.log("Mentor percentage: " + percentageMent + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,10 @@
 function halve(number) {
   // complete the function here
+  return number/2;
 }
 
 var result = halve(12);
 
 console.log(result);
+
+console.log(halve(100));
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  return number * 3;
 }
 
 var result = triple(12);

diff --git a/exercises/K-functions-parameters/exercise.js b/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`

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,7 @@
 // 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,9 @@
 // Declare your function first
-
+function add(a, b) {
+    return a + b;
+}
 // Call the function and assign to a variable `sum`
-
+var sum = add(13, 124);
 console.log(sum);
+
+
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,7 @@
 // Declare your function here
-
+function createLongGreeting(name, age) {
+    return "Hello, my name is " + name + " and I am " + 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
@@ -3,3 +3,16 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function upperCase(name) {
+  return name.toUpperCase();
+}
+function shoutyGreeting(name) {
+  return "HELLO " + upperCase(name);
+}
+
+console.log(shoutyGreeting(mentor1));
+console.log(shoutyGreeting(mentor2));
+console.log(shoutyGreeting(mentor3));
+console.log(shoutyGreeting(mentor4));
+console.log(shoutyGreeting(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,16 @@
 // 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 getStringLength(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,17 @@
-// Add comments to explain what this function does. You're meant to use Google!
+// Function that creates a random number between 0 & 10
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
-// Add comments to explain what this function does. You're meant to use Google!
+// Function that combines two strings together and creates a new string with the strings combined.
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
 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.concat(' ', secondWord,' ', thirdWord)
 }
 
 /* 

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(priceBeforeTax) {
+  return priceBeforeTax * 1.2;
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,9 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(priceBeforeTax) {
+    return "£" + calculateSalesTax(priceBeforeTax).toFixed(2);
+}
 
 /* 
 ===================================================