From c0a702886b6cec41975c446592fc5074f33c60f9 Mon Sep 17 00:00:00 2001
From: Monika Dangol <dangolmonika@yahoo.com>
Date: Mon, 13 Dec 2021 20:30:33 +0000
Subject: [PATCH 1/5] completed first exerise

---
 exercises/L-functions-nested/exercise.js | 41 ++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..8fd129a7c 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,46 @@
+// - In `exercise.js` you have been provided with the names of some mentors. Write a program that logs a shouty greeting to each one.
+// - Your program should include a function that spells their name in uppercase, and a function that creates a shouty greeting.
+// - Log each greeting to the console.
+
+// ## Expected result
+
+// ```
+// HELLO DANIEL
+// HELLO IRINA
+// HELLO MIMI
+// HELLO ROB
+// HELLO YOHANNES
+
+
+
+
+function createShoutyMessage(name) {
+    var largeName = makeCapital(name);
+    return "HELLO " + largeName;
+}
+function makeCapital(str) {
+    return str.toUpperCase();
+}
+
+
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+
+
+const greetMentor1 = createShoutyMessage(mentor1);
+const greetMentor2 = createShoutyMessage(mentor2);
+const greetMentor3 = createShoutyMessage(mentor3);
+const greetMentor4 = createShoutyMessage(mentor4);
+const greetMentor5 = createShoutyMessage(mentor5);
+
+console.log(greetMentor1)
+console.log(greetMentor2)
+console.log(greetMentor3)
+console.log(greetMentor4)
+console.log(greetMentor5)
+
+

From 09d2bdccb76e111608283f4653324d5fbd4f092c Mon Sep 17 00:00:00 2001
From: Monika Dangol <dangolmonika@yahoo.com>
Date: Wed, 15 Dec 2021 01:17:08 +0000
Subject: [PATCH 2/5] finished the extra exercise

---
 extra/1-currency-conversion.js | 10 ++++++++--
 extra/2-piping.js              | 27 +++++++++++++++++++--------
 extra/3-magic-8-ball.js        | 30 ++++++++++++++++++++++++++++--
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
index d82e59480..cb2abd5cc 100644
--- a/extra/1-currency-conversion.js
+++ b/extra/1-currency-conversion.js
@@ -5,7 +5,10 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(gbp) {
+  var usd = gbp * 1.4
+  return usd
+} 
 
 /*
   CURRENCY CONVERSION
@@ -15,7 +18,10 @@ function convertToUSD() {}
   They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL.
 */
 
-function convertToBRL() {}
+function convertToBRL(gbp) {
+  const brlAfterFees = (gbp*0.99)*5.7;
+  return brlAfterFees;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
diff --git a/extra/2-piping.js b/extra/2-piping.js
index 9c8ebc76a..7c287ac7a 100644
--- a/extra/2-piping.js
+++ b/extra/2-piping.js
@@ -16,26 +16,37 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(a, b) {
+  return a + b
 }
 
-function multiply() {
-
+function multiply(a, b) {
+  return a * b
 }
 
-function format() {
-
+function format(a) {
+ return '£' + a.toString
 }
 
 const startingValue = 2;
 
+
+
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+let badCode = myFunction() {
+  return ((startingValue + 10) * 2).toString();
+}
+//Answer : It is bad practice because the function is trying to convert the global value of startingValue. It wont't even work because the variable is decalred as const
 
 /* BETTER PRACTICE */
 
-let goodCode =
+let goodCode = myFunction() {
+  const startingValue = 2;
+  return ((startingValue += 10) * 2).toString();
+}
+//Answer: this is goodCode because the starting value is declared within the function
+
+
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
index f3adbefa5..88bc37f47 100644
--- a/extra/3-magic-8-ball.js
+++ b/extra/3-magic-8-ball.js
@@ -46,7 +46,8 @@
 // This should log "The ball has shaken!"
 // and return the answer.
 function shakeBall() {
-  //Write your code in here
+  console.log("The ball has shaken!")
+  return answer
 }
 
 /* 
@@ -59,7 +60,32 @@ function shakeBall() {
   This function should expect to be called with any value which was returned by the shakeBall function.
 */
 function checkAnswer(answer) {
-  //Write your code in here
+  if ( (answer === ' It is certain') 
+  || (answer === 'It is decidedly so') 
+  || (answer === 'Yes - definitely')
+  || (answer === 'You may rely on it.')
+  || (answer == 'Without a doubt') ) {
+    return 'Very positive'
+  } else if ( (answer === 'As I see it, yes.') 
+  || (answer === 'Most likely.') 
+  || (answer === 'Outlook good.')
+  || (answer === 'Yes.')
+  || (answer == 'Signs point to yes.') ) {
+    return 'Positive'
+  } else if ( (answer === 'Reply hazy, try again.') 
+  || (answer === 'Ask again later.') 
+  || (answer === 'Better not tell you now.')
+  || (answer === 'Cannot predict now.')
+  || (answer === 'Concentrate and ask again.') ) {
+    return 'Negetive'
+  } else if ( (answer === 'Don\'t count on it.') 
+  || (answer === 'My reply is no')
+  || (answer === 'My source say no.')
+  || (answer === 'Outlook not so good.')
+  || (answer === 'Very doubtful.') ) {
+    return 'Very negetive'
+  }
+
 }
 
 /* 

From 8d14b74d4f50f91217ea102c42c8d9bfab7569bb Mon Sep 17 00:00:00 2001
From: Monika Dangol <dangolmonika@yahoo.com>
Date: Wed, 15 Dec 2021 16:44:57 +0000
Subject: [PATCH 3/5] finished exercises

---
 exercises/C-variables/exercise.js             |  4 +++-
 exercises/D-strings/exercise.js               | 12 ++++++++--
 exercises/E-strings-concatenation/exercise.js |  5 ++++-
 exercises/F-strings-methods/exercise.js       | 10 +++++++--
 exercises/F-strings-methods/exercise2.js      | 10 ++++++++-
 exercises/G-numbers/exercise.js               | 18 +++++++++++++++
 exercises/I-floats/exercise.js                | 22 +++++++++++++++++++
 exercises/J-functions/exercise.js             | 13 ++++++++++-
 exercises/J-functions/exercise2.js            | 10 ++++++++-
 exercises/K-functions-parameters/exercise.js  |  5 +++--
 exercises/K-functions-parameters/exercise2.js |  4 +++-
 exercises/K-functions-parameters/exercise3.js |  3 +++
 exercises/K-functions-parameters/exercise4.js | 14 ++++++++++++
 exercises/K-functions-parameters/exercise5.js | 11 ++++++++++
 14 files changed, 129 insertions(+), 12 deletions(-)

diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..d0d1cdf61 100644
--- 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
index 2cffa6a81..22d867f6e 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,11 @@
-// Start by creating a variable `message`
 
-console.log(message);
+// ## Exercise
+
+// - Write a program that logs a message with a greeting and your name
+
+let message = "Merry Christmas!!!"
+
+let myVariableType = "This is a " + typeof message;
+
+
+console.log(myVariableType)
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..d14333f64 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+var myName = "Daniel ";
+var message = "Hello, my name is "
 
-console.log(message);
+var greeting = message + myName;
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..eba566685 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,9 @@
-// Start by creating a variable `message`
+// Exercise 1
 
-console.log(message);
+// - Log a message that includes the length of your name
+
+var myName = "Daniel";
+var lengthOfMyName = myName.length;
+var message = "My name is " + myName + " and my name is " + lengthOfMyName + "character long.";
+
+console.log(message);
\ No newline at end of file
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..4b57997bc 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,11 @@
-const name = " Daniel  ";
+// ## Exercise 2
+
+// - Log the same message using the variable, `name` provided
+// - Use the `.trim` method to remove the extra whitespace
+
+const myName = " Daniel  ";
+var lengthOfMyName = myName.length;
+
+var message = "My name is " + myName.trim() + " and my name is " + lengthOfMyName + " character long.";
 
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..485a46364 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,19 @@
+// ## Exercise
+
+// - Create two variables `numberOfStudents` and `numberOfMentors`
+// - Log a message that displays the total number of students and mentors
+
+// ## Expected result
+
+// ```
+// Number of students: 15
+// Number of mentors: 8
+// Total numnber of students and mentors: 23
+
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var noOfStudents = 15;
+var noOfMentors = 8;
+var total = noOfStudents + noOfMentors
+var message = "Total number of students and mentors: " + total;
+
+console.log(message)
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..36db1939d 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,24 @@
+
+// ## Exercise
+
+// - Using the variables provided in the exercise calculate the percentage of mentors and students in the group
+
+// ## Expected result
+
+
+// Percentage students: 65%
+// Percentage mentors: 35%
+
+
+
+
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+var total = numberOfMentors + numberOfStudents;
+
+var studentsPercentage = Math.round((numberOfStudents/total)*100);
+var mentorsPercentage = Math.round((numberOfMentors/total)*100);
+
+console.log("Percentage students: " + studentsPercentage + "%");
+console.log("Percentage mentors: " + mentorsPercentage + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..901dbc6c6 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,5 +1,16 @@
+// Exercise
+
+// - Complete the function in exercise.js so that it halves the input
+// - Try calling the function more than once with some different numbers
+
+// > Remember to use the return keyword to get a value out of the function
+
+// Expected result
+// 6
+
+
 function halve(number) {
-  // complete the function here
+  return number/2
 }
 
 var result = halve(12);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..507b8cf17 100644
--- a/exercises/J-functions/exercise2.js
+++ b/exercises/J-functions/exercise2.js
@@ -1,5 +1,13 @@
+// Exercise 2
+
+// - Complete the function in exercise2.js so that it triples the input
+
+// ## Expected result
+// 36
+
+
 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..549b2d271 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() {
-  // 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
index db7a8904b..38f4309f8 100644
--- 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
index 537e9f4ec..fd5efdab7 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(yourName) {
+    return "Hello, my name is " + yourName;
+}
 
 var greeting = createGreeting("Daniel");
 
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..559cc849c 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,19 @@
+// Exercise 4
+
+// - Write a function that adds two numbers together
+// - Call the function, passing `13` and `124` as parameters, and assigning the returned value to a variable `sum`
+
+// ## Expected result
+// 137
+
+
 // 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
index 7c5bcd605..3096487c5 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,16 @@
+//Exercise 5
+
+// - Write a function that takes a name (a string) and an age (a number) and returns a greeting (a string)
+// ## Expected result
+// Hello, my name is Daniel and I'm 30 years old
+
 // Declare your function here
 
+function createLongGreeting(userName, userAge) {
+    return `Hello, my name is ${userName} and I'm ${userAge} years old`
+}
+
+
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);

From f508739cf930c061be9ddd7e9b2ffa6fe3d4aa9c Mon Sep 17 00:00:00 2001
From: Monika Dangol <dangolmonika@yahoo.com>
Date: Wed, 15 Dec 2021 20:53:41 +0000
Subject: [PATCH 4/5] finished mendatory

---
 extra/1-currency-conversion.js |  2 +-
 extra/2-piping.js              | 20 ++++++++++----------
 extra/3-magic-8-ball.js        | 33 ++++++++++++++++++++++++++++-----
 mandatory/1-syntax-errors.js   | 13 +++++++------
 mandatory/2-logic-error.js     |  8 ++++----
 mandatory/3-function-output.js |  4 ++++
 mandatory/4-tax.js             | 11 ++++++++---
 package.json                   | 12 +++++++++---
 8 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
index cb2abd5cc..68b4529cc 100644
--- a/extra/1-currency-conversion.js
+++ b/extra/1-currency-conversion.js
@@ -19,7 +19,7 @@ function convertToUSD(gbp) {
 */
 
 function convertToBRL(gbp) {
-  const brlAfterFees = (gbp*0.99)*5.7;
+  const brlAfterFees = parseFloat(((gbp*0.99)*5.7).toFixed(2));
   return brlAfterFees;
 }
 
diff --git a/extra/2-piping.js b/extra/2-piping.js
index 7c287ac7a..4cfa82638 100644
--- a/extra/2-piping.js
+++ b/extra/2-piping.js
@@ -25,7 +25,7 @@ function multiply(a, b) {
 }
 
 function format(a) {
- return '£' + a.toString
+ return '£' + a.toString()
 }
 
 const startingValue = 2;
@@ -33,19 +33,19 @@ const startingValue = 2;
 
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode = myFunction() {
-  return ((startingValue + 10) * 2).toString();
-}
-//Answer : It is bad practice because the function is trying to convert the global value of startingValue. It wont't even work because the variable is decalred as const
+let badCode = format(multiply((add(startingValue, 10)), 2))
+//Answer : It is bad practice because the function is very difficult for any other programmer to understand. Code should be written such simple format that is simple to read and understand.
 
 /* BETTER PRACTICE */
 
-let goodCode = myFunction() {
-  const startingValue = 2;
-  return ((startingValue += 10) * 2).toString();
-}
-//Answer: this is goodCode because the starting value is declared within the function
 
+  let addedValue = add(startingValue, 10);
+  let multipliedValue = multiply(addedValue, 2);
+  let formattedFinalValue = format(multipliedValue)
+  let goodCode = formattedFinalValue;
+
+  
+//Answer: this is goodCode because the code is much simpler to read and understand.
 
 
 /* ======= TESTS - DO NOT MODIFY ===== 
diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
index 88bc37f47..2ca685c77 100644
--- a/extra/3-magic-8-ball.js
+++ b/extra/3-magic-8-ball.js
@@ -42,11 +42,34 @@
     Outlook not so good.
     Very doubtful.
 */
+var possibleAnswers = [
+  'It is certain.',
+  'It is decidedly so.',
+  'Without a doubt.',
+  'Yes - definitely.',
+  'You may rely on it.',
+  'As I see it, yes.',
+  'Most likely.',
+  'Outlook good.',
+  'Yes.',
+  'Signs point to yes.',
+  'Reply hazy, try again.',
+  'Ask again later.',
+  'Better not tell you now.',
+  'Cannot predict now.',
+  'Concentrate and ask again.',
+  'Don\'t count on it.',
+  'My reply is no.',
+  'My sources say no.',
+  'Outlook not so good.',
+  'Very doubtful.'
+]
 
 // This should log "The ball has shaken!"
 // and return the answer.
-function shakeBall() {
+function shakeBall(answer) {
   console.log("The ball has shaken!")
+  answer = possibleAnswers[Math.floor(Math.random(0, possibleAnswers.length-1))];
   return answer
 }
 
@@ -65,25 +88,25 @@ function checkAnswer(answer) {
   || (answer === 'Yes - definitely')
   || (answer === 'You may rely on it.')
   || (answer == 'Without a doubt') ) {
-    return 'Very positive'
+    return 'very positive'
   } else if ( (answer === 'As I see it, yes.') 
   || (answer === 'Most likely.') 
   || (answer === 'Outlook good.')
   || (answer === 'Yes.')
   || (answer == 'Signs point to yes.') ) {
-    return 'Positive'
+    return 'positive'
   } else if ( (answer === 'Reply hazy, try again.') 
   || (answer === 'Ask again later.') 
   || (answer === 'Better not tell you now.')
   || (answer === 'Cannot predict now.')
   || (answer === 'Concentrate and ask again.') ) {
-    return 'Negetive'
+    return 'negetive'
   } else if ( (answer === 'Don\'t count on it.') 
   || (answer === 'My reply is no')
   || (answer === 'My source say no.')
   || (answer === 'Outlook not so good.')
   || (answer === 'Very doubtful.') ) {
-    return 'Very negetive'
+    return 'very negetive'
   }
 
 }
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..4ef4b3540 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) {
-  return 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..a7235f9bb 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;
+  
+  return a * b * c;
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..424496305 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -2,15 +2,19 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
+//Answer:  it returns any floating point number between 0 to 1; multiplied to 10. Hence the output can be between number 1 to 10
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+//Answer: it concatenates word2 right behind word1 to make one word. Eg combine2Words('sea', 'food') will give output on 'seafood'
+
 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
index ba77c7ae2..e8c181d24 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -4,8 +4,10 @@
   A business requires a program that calculates how much the price of a product is including sales tax
   Sales tax is 20% of the price of the product.
 */
-
-function calculateSalesTax() {}
+const salesTax = 0.2
+function calculateSalesTax(price) {
+  return (price + (price * salesTax));
+}
 
 /*
   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) {
+  var priceWithTax = calculateSalesTax(price);
+  return `£${priceWithTax.toFixed(2)}`
+}
 
 /* 
 ===================================================
diff --git a/package.json b/package.json
index 93e0861e3..9e7f2ffeb 100644
--- a/package.json
+++ b/package.json
@@ -14,15 +14,21 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"],
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ],
     "projects": [
       {
         "displayName": "mandatory",
-        "testMatch": ["<rootDir>/mandatory/*.js"]
+        "testMatch": [
+          "<rootDir>/mandatory/*.js"
+        ]
       },
       {
         "displayName": "extra",
-        "testMatch": ["<rootDir>/extra/*.js"]
+        "testMatch": [
+          "<rootDir>/extra/*.js"
+        ]
       }
     ]
   },

From 4e9f5b4c69c8204936f2703135e86d612b04fe4f Mon Sep 17 00:00:00 2001
From: Monika Dangol <dangolmonika@yahoo.com>
Date: Fri, 17 Dec 2021 16:53:27 +0000
Subject: [PATCH 5/5] finished mendatory

---
 extra/3-magic-8-ball.js      | 154 ++++++++---------------------------
 mandatory/1-syntax-errors.js |   2 +-
 2 files changed, 35 insertions(+), 121 deletions(-)

diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
index 2ca685c77..abf6bf5b1 100644
--- a/extra/3-magic-8-ball.js
+++ b/extra/3-magic-8-ball.js
@@ -42,126 +42,40 @@
     Outlook not so good.
     Very doubtful.
 */
-var possibleAnswers = [
-  'It is certain.',
-  'It is decidedly so.',
-  'Without a doubt.',
-  'Yes - definitely.',
-  'You may rely on it.',
-  'As I see it, yes.',
-  'Most likely.',
-  'Outlook good.',
-  'Yes.',
-  'Signs point to yes.',
-  'Reply hazy, try again.',
-  'Ask again later.',
-  'Better not tell you now.',
-  'Cannot predict now.',
-  'Concentrate and ask again.',
-  'Don\'t count on it.',
-  'My reply is no.',
-  'My sources say no.',
-  'Outlook not so good.',
-  'Very doubtful.'
-]
-
-// This should log "The ball has shaken!"
-// and return the answer.
-function shakeBall(answer) {
-  console.log("The ball has shaken!")
-  answer = possibleAnswers[Math.floor(Math.random(0, possibleAnswers.length-1))];
-  return answer
-}
-
-/* 
-  This function should say whether the answer it is given is
-    - very positive
-    - positive
-    - negative
-    - very negative
-
-  This function should expect to be called with any value which was returned by the shakeBall function.
-*/
-function checkAnswer(answer) {
-  if ( (answer === ' It is certain') 
-  || (answer === 'It is decidedly so') 
-  || (answer === 'Yes - definitely')
-  || (answer === 'You may rely on it.')
-  || (answer == 'Without a doubt') ) {
-    return 'very positive'
-  } else if ( (answer === 'As I see it, yes.') 
-  || (answer === 'Most likely.') 
-  || (answer === 'Outlook good.')
-  || (answer === 'Yes.')
-  || (answer == 'Signs point to yes.') ) {
-    return 'positive'
-  } else if ( (answer === 'Reply hazy, try again.') 
-  || (answer === 'Ask again later.') 
-  || (answer === 'Better not tell you now.')
-  || (answer === 'Cannot predict now.')
-  || (answer === 'Concentrate and ask again.') ) {
-    return 'negetive'
-  } else if ( (answer === 'Don\'t count on it.') 
-  || (answer === 'My reply is no')
-  || (answer === 'My source say no.')
-  || (answer === 'Outlook not so good.')
-  || (answer === 'Very doubtful.') ) {
-    return 'very negetive'
-  }
-
-}
-
-/* 
-==================================
-======= TESTS - DO NOT MODIFY =====
-
-There are some Tests in this file that will help you work out if your code is working.
-
-To run these tests type `npm run extraTo run the tests for just this one file, type `npm run extra-tests -- --testPathPattern 3-magic-8-ball` into your terminal
-(Reminder: You must have run `npm install` one time before this will work!)
-==================================
-*/
-
-test("whole magic 8 ball sequence", () => {
-  const consoleLogSpy = jest.spyOn(global.console, "log");
-  const answer = shakeBall();
-
-  expect(typeof answer).toEqual("string");
-
-  expect(consoleLogSpy).toHaveBeenCalledTimes(1);
-  expect(consoleLogSpy).toHaveBeenLastCalledWith("The ball has shaken!");
-
-  expect(checkAnswer(answer)).toBeOneOf([
-    "very positive",
-    "positive",
-    "negative",
-    "very negative",
-  ]);
-});
-
-test("magic 8 ball returns different values each time", () => {
-  const seenAnswers = new Set();
-  for (let i = 0; i < 10; ++i) {
-    seenAnswers.add(shakeBall());
-  }
-  if (seenAnswers.size < 2) {
-    throw Error(
-      "Expected to get different random answers each time shakeBall was called, but always got the same one"
-    );
+const answer_very_positive = ['It is certain.', 'It is decidedly so.', 'Without a doubt.', 'Yes - definitely.', 'You may rely on it.']
+  const answer_positive = ['As I see it, yes.', 'Most likely.', 'Outlook good.', 'Yes.', 'Signs point to yes.']
+  const answer_negetive = ['Reply hazy, try again.', 'Ask again later.', 'Better not tell you now.', 'Cannot predict now.', 'Concentrate and ask again.']
+  const answer_very_negetive = ['Don\'t count on it.', 'My reply is no.', 'My sources say no.', 'Outlook not so good.', 'Very doubtful.']
+  
+  var allPossibleAnswers = answer_very_positive
+  .concat(answer_very_positive)
+  .concat(answer_positive)
+  .concat(answer_negetive)
+  .concat(answer_very_negetive)
+ 
+  
+//   This should log "The ball has shaken!"
+//   and return the answer.
+
+    let myAnswer = allPossibleAnswers[Math.ceil((Math.random(0)* allPossibleAnswers.length))]
+  
+  function shakeBall(answer) {
+    console.log("The ball has shaken!")
+    return answer
   }
 
-  let seenPositivities = new Set(Array.from(seenAnswers.values()).map(checkAnswer));
-  if (seenPositivities.size < 2) {
-    throw Error(
-      "Expected to random answers with different positivities each time shakeBall was called, but always got the same one"
-    );
+ 
+
+  function checkAnswer(myAnswer) {
+    if (answer_very_positive.includes(shakeBall(myAnswer))) {
+        return "very positive"
+    } else if (answer_positive.includes(shakeBall(myAnswer))) {
+        return "positive"
+    } else if (answer_negetive.includes(shakeBall(myAnswer))) {
+        return "negetive"
+    } else if (answer_very_negetive.includes(shakeBall(myAnswer))) {
+        return "very negetive"
+    }
+  
   }
-});
-
-test("checkAnswer works for `It is decidedly so.`", () => {
-  expect(checkAnswer("It is decidedly so.")).toEqual("very positive");
-});
-
-test("checkAnswer works for `My reply is no.`", () => {
-  expect(checkAnswer("My reply is no.")).toEqual("very negative");
-});
+  checkAnswer(myAnswer)
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index 4ef4b3540..d4854f344 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -5,7 +5,7 @@ function addNumbers(a, b, c) {
 }
 
 function introduceMe(name, age) {
-  return "Hello, my name is " + name + "and I am " + age + " years old";
+  return "Hello, my name is " + name + " and I am " + age + " years old";
 }
 
 function getTotal(a, b) {