From 36988769abb277774f5d96db367ef8d671b76836 Mon Sep 17 00:00:00 2001 From: ElenaBarker <113217019+ElenaBarker@users.noreply.github.com> Date: Mon, 20 Feb 2023 23:23:51 +0000 Subject: [PATCH 1/4] Update 1-syntax-errors.js test passed --- mandatory/1-syntax-errors.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index d9e004465..078c5e5ae 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +1,18 @@ // 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}`; } /* From 4007c72541b668240c6354ce8842687fe1e5adf0 Mon Sep 17 00:00:00 2001 From: ElenaBarker <113217019+ElenaBarker@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:29:11 +0000 Subject: [PATCH 2/4] Update 3-function-output.js test passed --- mandatory/3-function-output.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..77006fd1d 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,16 +1,15 @@ -// Add comments to explain what this function does. You're meant to use Google! +// The Math.round() method rounds a number to the nearest integer. This function also multiply youranswer by 10. function getRandomNumber() { return Math.random() * 10; } -// Add comments to explain what this function does. You're meant to use Google! +// The concat() method returns the new string after merging the existing string with other strings without affecting the existing string. function combine2Words(word1, word2) { return word1.concat(word2); } 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 } /* From 34416221d6f12afab8230c44e01a83660f7f15e5 Mon Sep 17 00:00:00 2001 From: ElenaBarker <113217019+ElenaBarker@users.noreply.github.com> Date: Tue, 21 Feb 2023 14:42:18 +0000 Subject: [PATCH 3/4] Update 2-logic-error.js test passed --- mandatory/2-logic-error.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9eb8c8cd7..1b073aba3 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; + ; } /* From 00969faf8c7a0284c48c56126aa47a213c018a27 Mon Sep 17 00:00:00 2001 From: ElenaBarker <113217019+ElenaBarker@users.noreply.github.com> Date: Tue, 21 Feb 2023 21:32:26 +0000 Subject: [PATCH 4/4] Update 4-tax.js test passed --- mandatory/4-tax.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..c05f35562 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,9 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} +function calculateSalesTax(taxPrice) { +return taxPrice * 1.2 +} /* CURRENCY FORMATTING @@ -17,7 +19,10 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(taxPrice) { + let fullPrice = calculateSalesTax(taxPrice); + return "£" + fullPrice.toFixed(2) +} /* ===================================================