-
-
Notifications
You must be signed in to change notification settings - Fork 481
LND10 | Adrian Ilovan | JS1 Coursework Week1 #541
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
// 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}`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great use of interpolation |
||
} | ||
|
||
/* | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,15 @@ | ||
// Add comments to explain what this function does. You're meant to use Google! | ||
// It generates a random number using Math.random() and it multiplies by 10 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Math.random() returns a number greater than or equal to 0 and less than 1, so this returns a number greater than or equal to 0 and less than 10 |
||
function getRandomNumber() { | ||
return Math.random() * 10; | ||
} | ||
|
||
// Add comments to explain what this function does. You're meant to use Google! | ||
// the concat() method is used to merge two or more arrays. | ||
function combine2Words(word1, word2) { | ||
return word1.concat(word2); | ||
} | ||
|
||
function concatenate(firstWord, secondWord, thirdWord) { | ||
return firstWord.concat(" ", secondWord.concat(" ", thirdWord)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you can also add all arguments into the .concat() method call, e.g.
|
||
// 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. | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,10 @@ | |
Sales tax is 20% of the price of the product. | ||
*/ | ||
|
||
function calculateSalesTax() {} | ||
function calculateSalesTax(number) { | ||
let priceOfProduct = number * 1.2; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you could use a variable name for the number 1.2 so it's more meaningful, e.g.
|
||
return priceOfProduct; | ||
} | ||
|
||
/* | ||
CURRENCY FORMATTING | ||
|
@@ -17,7 +20,10 @@ function calculateSalesTax() {} | |
Remember that the prices must include the sales tax (hint: you already wrote a function for this!) | ||
*/ | ||
|
||
function addTaxAndFormatCurrency() {} | ||
function addTaxAndFormatCurrency(pound) { | ||
pound = calculateSalesTax(pound); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's better practice to declare a new variable, rather than reassign the value of a parameter, e.g.
|
||
return `£${pound.toFixed(2)}`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 very nice use of .toFixed() and string interpolation |
||
} | ||
|
||
/* | ||
=================================================== | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are you using prettier formatter to format your code on save? I recommend it, as it will fix issues like this where the space should be after the comma not before