From 420e3475e123dad76057ad8e73a54d66ef41e5f4 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 01:43:08 +0000 Subject: [PATCH 1/9] JS core-1 week-1 homework This is my answer for the home work --- mandatory/1-syntax-errors.js | 16 ++++++++-------- mandatory/2-logic-error.js | 7 +++---- mandatory/3-function-output.js | 9 +++++++-- mandatory/4-tax.js | 9 +++++++-- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index d9e004465..f41244c91 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..143e82f58 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..3ad3828be 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..21e7011be 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 productTax=productSale*0.2; + return productPrice+productTax; +}; /* CURRENCY FORMATTING @@ -17,7 +20,9 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency() { + return "£".concat(calculateSalesTax(priceOfProduct).toFixed(2)) +}; /* =================================================== From 59b90406b573a46d559fa1814851476445e8d3b3 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 12:29:04 +0000 Subject: [PATCH 2/9] Update 1-syntax-errors.js --- mandatory/1-syntax-errors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index f41244c91..4b0e7eee4 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -5,7 +5,7 @@ function addNumbers(a,b,c) { }; function introduceMe(name, age){ - return `Hello, my name is ${name}and I am ${age} years old`; + return `Hello, my name is ${name}` + " and I" + ` am ${age} years old`; }; function getTotal(a, b) { let total = a + b; From 7ba84088730d838aa09314f5d364fb5e95e9f3e0 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 12:37:30 +0000 Subject: [PATCH 3/9] homework fix --- mandatory/2-logic-error.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 143e82f58..5f0be790c 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -5,7 +5,7 @@ function trimWord(word) { } function getStringLength(word) { - return word.length(); + return word.length; } function multiply(a, b, c) { From 29648a1fa1ee2b6cd6db2037787ef9583a7d3a3f Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 12:42:01 +0000 Subject: [PATCH 4/9] function 3 test change --- mandatory/3-function-output.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 3ad3828be..464c21607 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -13,7 +13,7 @@ function combine2Words(word1, 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. - let allString= firstWord + secondWord + thirdWord; + let allString= firstWord+" "+secondWord+" "+ thirdWord; return allString; } From 117468ebde07dc385b7f882d9dfdc5268a25dcb3 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 13:10:44 +0000 Subject: [PATCH 5/9] practice commit --- extra/1-currency-conversion.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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. From 1d5f825b626ba10736707c0e168bb015c6860c16 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 13:12:29 +0000 Subject: [PATCH 6/9] fix pactice 2 --- extra/2-piping.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/2-piping.js b/extra/2-piping.js index b4f8c4c1b..4b8e2e05c 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -35,7 +35,7 @@ let badCode = /* BETTER PRACTICE */ -let goodCode = +//let goodCode = /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. From fbb674b7c4d18054b875957f712e88ccff3d0dfd Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 15:13:35 +0000 Subject: [PATCH 7/9] firsts half of 4-tax answer --- mandatory/4-tax.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 21e7011be..0f939bc73 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -6,8 +6,8 @@ */ function calculateSalesTax(productPrice) { - let productTax=productSale*0.2; - return productPrice+productTax; + let productTotal=productPrice+(productPrice*0.2); + return productTotal; }; /* From 2931dd956b98638e3a9578068b1817b20b5c52fc Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 15:33:36 +0000 Subject: [PATCH 8/9] 4-tax commit --- mandatory/4-tax.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 0f939bc73..7abd008a1 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -20,8 +20,10 @@ function calculateSalesTax(productPrice) { Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() { - return "£".concat(calculateSalesTax(priceOfProduct).toFixed(2)) +function addTaxAndFormatCurrency(product) { + let amountOne=( (product*1.2).toFixed(2)).toString(); + // let amountTwo= parseFloat(amountOne); + return `£${amountOne}`; }; /* From edc7f6505946840b8526a51bf7073191cbbfa346 Mon Sep 17 00:00:00 2001 From: Jacknguyen4438 Date: Sat, 25 Feb 2023 15:48:41 +0000 Subject: [PATCH 9/9] extra 2 commit --- extra/2-piping.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/extra/2-piping.js b/extra/2-piping.js index 4b8e2e05c..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.