diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index 75b3c6aab..837b23448 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,7 +5,10 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(amount) { + let poundToDollar=amount*1.4; + return poundToDollar; +} /* CURRENCY CONVERSION @@ -15,7 +18,10 @@ function convertToUSD() {} They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL. */ -function convertToBRL() {} +function convertToBRL(amountTwo) { + let poundToBrazilian= ((amountTwo)*(0.99)*5.700).toFixed(2) ; + return parseFloat(poundToBrazilian); +} /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. diff --git a/extra/2-piping.js b/extra/2-piping.js index b4f8c4c1b..94d11f448 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,26 +16,26 @@ the final result to the variable goodCode */ -function add() { - +function add(a,b) { + return a + b; } -function multiply() { - +function multiply(a,b) { +return parseFloat(a)* parseFloat(b); } -function format() { - +function format(a) { +return `£${a}`; } const startingValue = 2; // Why can this code be seen as bad practice? Comment your answer. -let badCode = +let badCode =format(multiply(add(startingValue,10),2)) /* BETTER PRACTICE */ -let goodCode = +let goodCode =format((startingValue+10)*2) /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index d9e004465..4b0e7eee4 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,17 +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; + let 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..5f0be790c 100644 --- a/mandatory/2-logic-error.js +++ b/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; } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..464c21607 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -2,15 +2,20 @@ function getRandomNumber() { return Math.random() * 10; } - +/* In this function the main purpose is to pick a random number with .random method that are >0 but <1 + */ // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { return word1.concat(word2); } - +/* This function is to combine 2 different string and give us a new string. + */ 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. + let allString= firstWord+" "+secondWord+" "+ thirdWord; + return allString; + } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..7abd008a1 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(productPrice) { + let productTotal=productPrice+(productPrice*0.2); + return productTotal; +}; /* 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(product) { + let amountOne=( (product*1.2).toFixed(2)).toString(); + // let amountTwo= parseFloat(amountOne); + return `£${amountOne}`; +}; /* ===================================================