From 40d93b88014e08d8a57657a110b8973693d36fad Mon Sep 17 00:00:00 2001
From: nfarah22 <61600465+nfarah22@users.noreply.github.com>
Date: Sat, 25 Feb 2023 10:09:06 +0000
Subject: [PATCH] najah

these are my solutions to this weeks coursework
---
 mandatory/1-syntax-errors.js   |  8 ++++----
 mandatory/2-logic-error.js     |  8 ++++----
 mandatory/3-function-output.js |  9 ++++-----
 mandatory/4-tax.js             | 10 ++++++++--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index d9e004465..2b42388a5 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +1,16 @@
 // 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`;
+  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 9eb8c8cd7..774f970de 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..b0c08503d 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -2,16 +2,15 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
-
+// returns   random number between 0 and 1/
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
-
+// combines 2 or more elements together 
 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..308de38db 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) {
+  return price * 1.2;
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +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) {
+
+  return `£${calculateSalesTax(price).toFixed(2)}`;
+}
 
 /* 
 ===================================================