glasgow class 6-siver omar-javascript 1-week1

mandatory/1-syntax-errors.js

@@ -1,16 +1,16 @@
-// There are syntax errors in this code - can you fix it to pass the tests?
+// 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;
+  total = a + b;
 
-  return "The total is total";
+  return `The total is ${total}`;
 }
 
 /* 

mandatory/2-logic-error.js

@@ -1,16 +1,15 @@
 // 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;
 }
 
 /* 

mandatory/3-function-output.js

@@ -1,18 +1,20 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getRandomNumber() {
   return Math.random() * 10;
+
 }
+// It generates a random number using Math.random() and it multiplies by 10
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
-
+// the concat() method is used to merge two or more arrays.
 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);
 }
-
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

mandatory/4-tax.js

@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice) {
+  let salesTax = productPrice * 0.2;
+  return productPrice + salesTax
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,8 +20,12 @@ 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 productPriceRes = calculateSalesTax(price);
 
+  return `£${productPriceRes.toFixed(2)}`; 
+
+}
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====