London10-StellaDelMar_RodriguezFernandez-JavaScript-Core-1-Coursework-Week1

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 "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;
+  stella = a + b;
 
-  return "The total is total";
+  return `The total is ${stella}`;
 }
 
 /* 

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;
 }
 
 /* 

mandatory/3-function-output.js

@@ -5,7 +5,11 @@ function getRandomNumber() {
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
+  console.log();
+  console.log();
+  console.log();
   return word1.concat(word2);
+
 }
 
 function concatenate(firstWord, secondWord, thirdWord) {

mandatory/4-tax.js

@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(sales) {
+  let total = (sales*0.2)+sales;
+  return total;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,11 @@ 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 num = calculateSalesTax(price);
+  return "£" + num.toFixed(2);
+}
+
 
 /* 
 ===================================================