From 32452684556a84ad829877f9e9c2db8b58340561 Mon Sep 17 00:00:00 2001
From: Muath Alawadhi <109815858+Muath-Alawadhi@users.noreply.github.com>
Date: Tue, 21 Feb 2023 01:29:12 +0000
Subject: [PATCH] mandatory

---
 mandatory/1-syntax-errors.js   | 19 +++++++++++++------
 mandatory/2-logic-error.js     |  8 ++++----
 mandatory/3-function-output.js |  9 +++++++++
 mandatory/4-tax.js             | 13 +++++++++++--
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index d9e004465..bd9052510 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,18 +1,25 @@
 // 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 "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;
-
-  return "The total is total";
+  let total = a + b;
+  return `The total is ${total}`;
 }
 
+
+
+
+
+
+
+
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====
diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
index 9eb8c8cd7..b1725c284 100644
--- a/mandatory/2-logic-error.js
+++ b/mandatory/2-logic-error.js
@@ -1,16 +1,16 @@
 // The syntax for these functions is valid but there are some errors, find them and fix them
 
 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..0c177e1ff 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,18 +1,27 @@
 // Add comments to explain what this function does. You're meant to use Google!
+
+//The generated number is returned by the function.
 function getRandomNumber() {
   return Math.random() * 10;
+  ////The Math.random() method returns a random decimal number between 0 (inclusive) and 1 (exclusive), and multiplying this number by 10 gives a random decimal number between 0 (inclusive) and 10 (exclusive).
+
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+
 function combine2Words(word1, word2) {
   return word1.concat(word2);
+  //This function takes two strings as input and combines them into a single string using the concat() method, which is a way to join strings together. The combined string is then returned as the output of the function.
 }
 
 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;
+
 }
 
+
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..7557699e9 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -5,7 +5,12 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(money) {
+  let salesTax = money * 0.20;
+  let totalPrice = money + salesTax;
+  return totalPrice;
+}
+
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +22,11 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(money) {
+  let totalPrice = calculateSalesTax(money);
+  let formattedPrice = "£" + totalPrice.toFixed(2);
+  return formattedPrice;
+}
 
 /* 
 ===================================================