-
-
Notifications
You must be signed in to change notification settings - Fork 480
London10-SAQIB_JAVED-JavaScript-Core-1-Coursework-week1 #523
base: master
Are you sure you want to change the base?
Changes from all commits
d0c28ff
5a0fe97
4bc7687
b983204
231019f
9519b4b
44e89c7
81740ca
4e2372b
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 |
|---|---|---|
|
|
@@ -16,26 +16,34 @@ | |
| the final result to the variable goodCode | ||
| */ | ||
|
|
||
| function add() { | ||
|
|
||
| function add(a, b) { | ||
| return a + b; | ||
| } | ||
|
|
||
| function multiply() { | ||
|
|
||
| function multiply(a, b) { | ||
| return a * b; | ||
| } | ||
|
|
||
| function format() { | ||
|
|
||
| function format(value) { | ||
| return "£" + value; | ||
| } | ||
|
|
||
| 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)); | ||
|
|
||
| /* in this code there is space and no semicolons ; */ | ||
|
|
||
| /* BETTER PRACTICE */ | ||
|
|
||
| let goodCode = | ||
| let goodCode = format(multiply(add(startingValue, 10), 2)); | ||
|
Contributor
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 might be worth thinking about how you can make this easier to read. |
||
|
|
||
| let goodcode = add(10, startingValue); | ||
| console.log("Better practice..", goodCode); | ||
|
|
||
| let multiplyByTwo = multiply(goodCode, 2); | ||
| console.log("Better practice..", multiplyByTwo); | ||
|
|
||
| /* ======= TESTS - DO NOT MODIFY ===== | ||
| There are some Tests in this file that will help you work out if your code is working. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,8 +45,53 @@ | |
|
|
||
| // This should log "The ball has shaken!" | ||
| // and return the answer. | ||
|
|
||
|
Contributor
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 solution on this one 😃 |
||
| let veryPositiveAnswers = [ | ||
| "It is certain.", | ||
| "It is decidedly so.", | ||
| "Without a doubt.", | ||
| "Yes - definitely.", | ||
| "You may rely on it.", | ||
| ]; | ||
|
|
||
| let positiveAnswers = [ | ||
| "As I see it, yes.", | ||
| "Most likely.", | ||
| "Outlook good.", | ||
| "Yes.", | ||
| "Signs point to yes.", | ||
| ]; | ||
|
|
||
| let negativeAnswers = [ | ||
| "Reply hazy.", | ||
| "try again.", | ||
| "Ask again later.", | ||
| "Better not tell you now.", | ||
| "Cannot predict now.", | ||
| "Concentrate and ask again.", | ||
| ]; | ||
|
|
||
| let veryNegativeAnswers = [ | ||
| "Don't count on it.", | ||
| "My reply is no.", | ||
| "My sources say no.", | ||
| "Outlook not so good.", | ||
| "Very doubtful.", | ||
| ]; | ||
|
|
||
| let answers = [ | ||
| ...veryPositiveAnswers, | ||
| ...positiveAnswers, | ||
| ...negativeAnswers, | ||
| ...veryNegativeAnswers, | ||
| ]; | ||
|
|
||
| //Write your code in here | ||
|
|
||
| function shakeBall() { | ||
| //Write your code in here | ||
| console.log("The ball has shaken!"); | ||
| let randomIndex = Math.floor(Math.random() * answers.length); | ||
| return answers[randomIndex]; | ||
| } | ||
|
|
||
| /* | ||
|
|
@@ -60,6 +105,16 @@ function shakeBall() { | |
| */ | ||
| function checkAnswer(answer) { | ||
| //Write your code in here | ||
|
|
||
| if (veryPositiveAnswers.includes(answer)) { | ||
| return "very positive"; | ||
| } else if (positiveAnswers.includes(answer)) { | ||
| return "positive"; | ||
| } else if (negativeAnswers.includes(answer)) { | ||
| return "negative"; | ||
| } else if (veryNegativeAnswers.includes(answer)) { | ||
| return "very negative"; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
|
|
@@ -101,7 +156,9 @@ test("magic 8 ball returns different values each time", () => { | |
| ); | ||
| } | ||
|
|
||
| let seenPositivities = new Set(Array.from(seenAnswers.values()).map(checkAnswer)); | ||
| let seenPositivities = new Set( | ||
| Array.from(seenAnswers.values()).map(checkAnswer) | ||
| ); | ||
| if (seenPositivities.size < 2) { | ||
| throw Error( | ||
| "Expected to random answers with different positivities each time shakeBall was called, but always got the same one" | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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`; | ||
|
Contributor
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. Nice 😄 |
||
| } | ||
|
|
||
| function getTotal(a, b) { | ||
| total = a ++ b; | ||
| const total = a + b; | ||
|
|
||
| return "The total is total"; | ||
| return "The total is " + total; | ||
| } | ||
|
|
||
| /* | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,15 @@ | ||
| // The syntax for these functions is valid but there are some errors, find them and fix them | ||
|
|
||
|
Contributor
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. Nice work on all of these 👍 |
||
| 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; | ||
| } | ||
|
|
||
| /* | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,22 @@ | ||
| // Add comments to explain what this function does. You're meant to use Google! | ||
|
|
||
| /* Math.random() returns a random number between 0 (inclusive), and 1 (exclusive). this code generate random number between 0 and 1 then multiply 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 is used to merge two or more arrays. This method does not change the existing arrays, but instead returns a new array. */ | ||
|
|
||
| function combine2Words(word1, word2) { | ||
| return word1.concat(word2); | ||
| } | ||
|
|
||
| function concatenate(firstWord, secondWord, thirdWord) { | ||
| return firstWord.concat(" ", secondWord, " ", thirdWord); | ||
|
Contributor
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. This looks good.
Author
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. thanks for your feed back @moneyinthesky . i will look at this |
||
|
|
||
| // 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,9 @@ | |
| Sales tax is 20% of the price of the product. | ||
| */ | ||
|
|
||
| function calculateSalesTax() {} | ||
| function calculateSalesTax(price) { | ||
| return price + (price / 100) * 20; | ||
|
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. Hi Saqib , i'm doing a code review as part of homework .
Author
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. @Bedi06 thanks for your feedback. |
||
| } | ||
|
|
||
| /* | ||
| 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(price) { | ||
| let Price = calculateSalesTax(price); | ||
|
Contributor
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. This looks good, but you might think about the name of this variable
Author
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. thanks thats evdn confusing for me too
Author
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. i tired to give another name before, it wasn’t working then after few tries i put price to make it working |
||
| return "£" + Price.toFixed(2); | ||
| } | ||
|
|
||
| /* | ||
| =================================================== | ||
|
|
||
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.
Nice work 👍