Glasgow Class 6 - Cat Smith -JS1-Week 1

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

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

@@ -2,15 +2,19 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
+//Returns a random number between 0 & 10
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
-  return word1.concat(word2);
+  return word1.concat(word2); 
 }
+//concat merges 2 arrays and creates a new one, so this would merge the 2 words
 
 function concatenate(firstWord, secondWord, thirdWord) {
+  return `${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.
+
 }
 
 /* 

mandatory/4-tax.js

@@ -5,7 +5,13 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(a) {
+  subTotal = a * .2;
+  total = subTotal + a;
+
+  return total;
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +23,12 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(a) {
+  subTotal = a * .2;
+  total = subTotal + a;
+
+  return `£${total .toFixed(2)}`
+}
 
 /* 
 ===================================================