From e03e6e62df78340a744742e36b54bd673ca4c71f Mon Sep 17 00:00:00 2001
From: EABarton123 <83503987+EABarton123@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:21:13 +0100
Subject: [PATCH 1/2] mandatory exercises completed

---
 exercises/C-variables/exercise.js             |  4 +++-
 exercises/D-strings/exercise.js               |  4 +++-
 exercises/E-strings-concatenation/exercise.js |  4 +++-
 exercises/F-strings-methods/exercise.js       |  4 +++-
 exercises/F-strings-methods/exercise2.js      |  4 +++-
 exercises/G-numbers/exercise.js               |  9 +++++++++
 exercises/I-floats/exercise.js                |  6 ++++++
 exercises/J-functions/exercise.js             |  2 ++
 exercises/J-functions/exercise2.js            |  1 +
 exercises/K-functions-parameters/exercise.js  |  3 ++-
 exercises/K-functions-parameters/exercise2.js |  3 +++
 exercises/K-functions-parameters/exercise3.js |  5 ++++-
 exercises/K-functions-parameters/exercise4.js |  6 ++++--
 exercises/K-functions-parameters/exercise5.js |  5 ++++-
 exercises/L-functions-nested/exercise.js      | 18 ++++++++++++++++++
 mandatory/1-syntax-errors.js                  | 11 ++++++-----
 mandatory/2-logic-error.js                    |  8 ++++----
 mandatory/3-function-output.js                |  3 +++
 mandatory/4-tax.js                            | 11 ++++++++---
 19 files changed, 89 insertions(+), 22 deletions(-)

diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..fd47b4fad 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+const 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
index 2cffa6a81..9cffab7a9 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+const message = "Hello world."
+const 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
index 2cffa6a81..51cdc6049 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+const string = "My name is "
+const name = "Emily!";
+const message = string + name;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..f196ea2cc 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+const name = "Emily";
+const nameCount = name.length;
+const message = name + " has " + nameCount + " characters.";
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..8fd7e24b7 100644
--- 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 nameCount = name.length;
+const message = "My name is " + nameTrim + " and my name is " + nameCount + " characters long";
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..272d02008 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,10 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+const numberOfStudents = 30;
+const numberOfMentors = 5;
+const total = numberOfStudents + numberOfMentors;
+const messageStudents = "Number of Students: " + numberOfStudents;
+const messageMentors = "Number of Mentors: " + numberOfMentors;
+const messageTotal = "Total number of students and mentors: "  + total;
+console.log(messageStudents);
+console.log(messageMentors);
+console.log(messageTotal);
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..e21c90e83 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,8 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var percentageStudents = (numberOfStudents / (numberOfStudents + numberOfMentors)) *100;
+var roundedPercentStudents = Math.round(percentageStudents);
+var percentageMentors = (numberOfMentors / (numberOfStudents + numberOfMentors)) * 100;
+var roundedPercentMentors = Math.round(percentageMentors);
+console.log("Percentage students: " + roundedPercentStudents + "%");
+console.log("Percentage mentors: " + roundedPercentMentors + "%");
\ No newline at end of file
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..dadab7d60 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,9 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
 
 console.log(result);
+
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..468d45596 100644
--- 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
index 8d5db5e69..1978048ea 100644
--- 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(num1, num2) {
   // Calculate the result of the function and return it
+return num1 * num2;
 }
 
 // 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
index db7a8904b..4805ef7dc 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,4 +1,7 @@
 // Declare your function first
+function divide(num1, num2) {
+    return num1 / num2;
+}
 
 var result = divide(3, 4);
 
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
index 537e9f4ec..a5fe9a932 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,8 @@
 // Write your function here
-
+function createGreeting(name) {
+    wholeGreeting = "My name is " + name;
+    return wholeGreeting;
+}
 var greeting = createGreeting("Daniel");
 
 console.log(greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..189b627bf 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function add(num1, num2) {
+    return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
-
+let sum = add(13, 124);
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..cbd6fd906 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,8 @@
 // Declare your function here
-
+function createLongGreeting(name, age){
+    const sentence = "Hello, my name is " + name + " and I'm " + age + " years old";
+    return sentence;
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..2eac4c29e 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,21 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function shoutyGreeting(name) {
+    let nameCaps = name.toUpperCase();
+    let greeting = "HELLO " + nameCaps;
+    return greeting;
+}
+
+var greetingOne = shoutyGreeting(mentor1);
+var greetingTwo = shoutyGreeting(mentor2);
+var greetingThree = shoutyGreeting(mentor3);
+var greetingFour = shoutyGreeting(mentor4);
+var greetingFive = shoutyGreeting(mentor5);
+
+console.log(greetingOne);
+console.log(greetingTwo);
+console.log(greetingThree);
+console.log(greetingFour);
+console.log(greetingFive);
\ No newline at end of file
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..98360ac6b 100644
--- 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
index 9cca7603b..fb3129a50 100644
--- 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;
+  sum = a * b * c;
+  return sum;
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..0c8a46d63 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -2,15 +2,18 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
+//This function gets a random number and multiplies it by 10.
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
+//This function joins 2 or more strings together without changing them.
 
 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
index ba77c7ae2..cfbb7c6d5 100644
--- 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(price) {
+  let tax = (price / 100) * 20;
+  return tax + price;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,8 +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) {
+  let actualPrice = calculateSalesTax(price);
+  return "£" + actualPrice.toFixed(2);
+}
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

From b477c91cff234e45437ef10966297c1362519b04 Mon Sep 17 00:00:00 2001
From: EABarton123 <83503987+EABarton123@users.noreply.github.com>
Date: Sat, 17 Sep 2022 21:14:40 +0100
Subject: [PATCH 2/2] error on coursework

when checked with solutions I forgot to declare my variable
---
 mandatory/1-syntax-errors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index 98360ac6b..f72632d88 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -9,7 +9,7 @@ function introduceMe(name, age) {
 }
 
 function getTotal(a, b) {
-  total = a + b;
+  let total = a + b;
 
   return "The total is " + total;
 }