-
-
Notifications
You must be signed in to change notification settings - Fork 477
Glasgow Class 6 Melese Berehannu js-1 week1 #518
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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| console.log("Hello World") | ||
| let greeting = "Helen"; | ||
| console.log(greeting) | ||
| console.log(greeting) | ||
| console.log(greeting) | ||
| let colors = "blue,yellow"; | ||
| typeof(colors) | ||
| typeof(2) | ||
| let dear="How are you doing "; | ||
| let myName="Melese"; | ||
| let Greeting= dear + myName; | ||
| let numberOfTraineers = 30; | ||
| let numberOfMentors = 40; | ||
| let total_number_of_trainees = numberOfTraineers + numberOfMentors; | ||
| console.log(total_number_of_trainees) | ||
|
|
||
| let numberofTraineersinpercent = Math.round((numberOfTraineers/total_number_of_trainees)*100) + "%"; | ||
| let numberofMentorsinpercent = Math.round(( numberOfMentors/total_number_of_trainees)*100) + "%"; | ||
| console.log(numberofTraineersinpercent) | ||
| console.log(numberofMentorsinpercent) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
| // There are syntax errors in this code - can you fix it to pass the tests? | ||
|
|
||
| function addNumbers(a b c) { | ||
| return 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); | ||
| } | ||
| addNumbers(3,4,6); | ||
|
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 don't need to add your own tests as the Jest will run it's own tests. |
||
| introduceMe('Sonjide',27); | ||
| getTotal(23,5); | ||
|
|
||
|
|
||
| /* | ||
| =================================================== | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,23 @@ | ||
| // 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()); | ||
|
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. No need for the extra brackets here, is enough. |
||
| } | ||
|
|
||
| function getStringLength(word) { | ||
| return "word".length(); | ||
| return (word.length); | ||
|
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. Same here, |
||
| } | ||
|
|
||
| function multiply(a, b, c) { | ||
| a * b * c; | ||
| return; | ||
| return (a * b * c); | ||
|
|
||
| } | ||
|
|
||
| trimWord(" CodeYourFuture "); | ||
| trimWord(" CodeYourFuture teaches coding "); | ||
| getStringLength("Turtles"); | ||
| getStringLength("A wild sentence appeared!"); | ||
| multiply(2, 3, 6); | ||
| multiply(2, 3, 4); | ||
|
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. No need to add your own tests - the system will do it's own tests. |
||
| /* | ||
| =================================================== | ||
| ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,23 @@ | ||
| // Add comments to explain what this function does. You're meant to use Google! | ||
| //This getRandomNumber function let you to get a random number greater than 0 and less than 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. Well done on adding a comment here - many students missed this. |
||
| function getRandomNumber() { | ||
| return Math.random() * 10; | ||
| } | ||
|
|
||
| // Add comments to explain what this function does. You're meant to use Google! | ||
| // The concat function merge two strings into one. | ||
| 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.concat(secondWord, 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. excellent! |
||
| } | ||
|
|
||
| concatenate("code ", "your ", "future"); | ||
| concatenate("I ", "like ", "pizza"); | ||
| concatenate("I ", "am ", 13); | ||
| /* | ||
| =================================================== | ||
| ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== | ||
|
|
||
| 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(product) { | ||
|
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. Did this work? It looks like you are adding the tax to the original amount, but this should only be working out the tax. You should be adding the tax to the original amount later in the code. 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. Apologies Melese - you were right in the first place! You are supposed to calculate the full amount here - rather than just tax. I misunderstood the requirement. |
||
| return (product + (product*20)/100) | ||
| } | ||
|
|
||
| /* | ||
| CURRENCY FORMATTING | ||
|
|
@@ -17,7 +19,16 @@ function calculateSalesTax() {} | |
| Remember that the prices must include the sales tax (hint: you already wrote a function for this!) | ||
| */ | ||
|
|
||
| function addTaxAndFormatCurrency() {} | ||
| function addTaxAndFormatCurrency(product) { | ||
| return "£"+(Math.round(calculateSalesTax(product)).toFixed(2)) | ||
|
|
||
| } | ||
| calculateSalesTax(15); | ||
|
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. no need to include your own tests - the system generates its own tests. |
||
| calculateSalesTax(17.5); | ||
| calculateSalesTax(34); | ||
| addTaxAndFormatCurrency(15); | ||
| addTaxAndFormatCurrency(17.5); | ||
| addTaxAndFormatCurrency(34); | ||
|
|
||
| /* | ||
| =================================================== | ||
|
|
||
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.
Your changes will work, but another way would have been to include the total inside the string -
return (
The total is ${total});Uh oh!
There was an error while loading. Please reload this page.
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.
Don't forget the backticks though.