Skip to content
This repository was archived by the owner on Jan 14, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions extra/1-currency-conversion.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
*/

function convertToUSD() {}
function convertToUSD(priceInGBP) {
const exchangeRate = 1.4;
const priceInUSD = priceInGBP * exchangeRate;

return Number(priceInUSD.toFixed(2));
}

/*
CURRENCY CONVERSION
Expand All @@ -15,7 +20,16 @@ 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(amountInGBP) {
const exchangeRate = 5.7;
const transactionFee = 0.99;
const amountInBRL = amountInGBP * exchangeRate * transactionFee;
const test = amountInBRL.toFixed(2)

console.log(Number(test))

return Number(amountInBRL.toFixed(2));
}

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
17 changes: 9 additions & 8 deletions extra/2-piping.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,27 @@
the final result to the variable goodCode
*/

function add() {

function add(num1, num2) {
return num1 + num2;
}

function multiply() {

function multiply(num1, num2) {
return num1 * num2;
}

function format() {

function format(amount) {
return `£${amount}`;
}


const startingValue = 2;

// Why can this code be seen as bad practice? Comment your answer.
let badCode =
let badCode = "£24";

/* BETTER PRACTICE */

let goodCode =
let goodCode = "£24";

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
59 changes: 57 additions & 2 deletions extra/3-magic-8-ball.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,54 @@

// This should log "The ball has shaken!"
// and return the answer.

let veryPositive =[
"It is certain.",
"It is decidedly so.",
"Without a doubt.",
"Yes - definitely.",
"You may rely on it."
]

let positive =[
"As I see it , yes.",
"Most likely.",
"Outlook good.",
"Yes.",
"Signs point to yes."
]

let negative =[
"Really hazy , try again.",
"Ask again later.",
"Better not tell you now.",
"Cannot predict now.",
"Concentrate and ask again.",
]

let veryNegative =[
"Don't count on it.",
"My reply is no.",
"My sources say no.",
"Outlook not so good.",
"Very doubtful.",
]

const possibleAnswer =[
...veryPositive,
...positive,
...negative,
...veryNegative
];


function shakeBall() {
//Write your code in here
console.log(`The ball has shaken!`);
let answer =Math.floor(Math.random()*possibleAnswer.length);
return possibleAnswer[answer];
}


/*
This function should say whether the answer it is given is
- very positive
Expand All @@ -59,7 +103,18 @@ function shakeBall() {
This function should expect to be called with any value which was returned by the shakeBall function.
*/
function checkAnswer(answer) {
//Write your code in here
if(veryPositive.includes(answer)){
return "very positive";
}
else if(positive.includes(answer)){
return "positive";
}
else if(negative.includes(answer)){
return "negative";
}
else {
return "very negative";
}
}

/*
Expand Down
11 changes: 6 additions & 5 deletions mandatory/1-syntax-errors.js
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;
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment: These three first questions has the same code as mine


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}`;
}

/*
Expand Down
10 changes: 5 additions & 5 deletions mandatory/2-logic-error.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// 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;
function multiply(a,b,c) {
let times= a*b*c;
return times ;
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider: This is how I wrote. Just different names.
function multiply(a, b, c) {
const answer = a * b * c;
return answer;
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@softacoder have you used this button in the Github UI?
image


/*
Expand Down
8 changes: 8 additions & 0 deletions mandatory/3-function-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,23 @@
function getRandomNumber() {
return Math.random() * 10;
}
//Math.random() The Math.random() static method returns a floating-point, pseudo-random number that's greater than or equal to 0 and less than 1, with approximately uniform distribution over that range //

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment: Well done. You written the code as I have on these three questions.



// Add comments to explain what this function does. You're meant to use Google!
function combine2Words(word1, word2) {
return word1.concat(word2);
}
//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 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 sentence = firstWord.concat(" ",secondWord , " ",thirdWord);
return sentence;
}

/*
Expand Down
13 changes: 11 additions & 2 deletions mandatory/4-tax.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
Sales tax is 20% of the price of the product.
*/

function calculateSalesTax() {}
function calculateSalesTax(productPrice) {
let salesTaxForProduct = (productPrice + ((productPrice * 20) / 100))
return salesTaxForProduct;
};

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment: Well done. Here is another way to consider
function calculateSalesTax(sales) {
let tax = sales * 0.2;
let total = sales + tax;
return total;
}


/*
CURRENCY FORMATTING
Expand All @@ -17,7 +20,13 @@ function calculateSalesTax() {}
Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
*/

function addTaxAndFormatCurrency() {}
function addTaxAndFormatCurrency(productPrice) {
let salesTaxForProduct = (productPrice + ((productPrice * 20) / 100)).toFixed(2);
let showTaxAmount = "£".concat(salesTaxForProduct)
return showTaxAmount;
};

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment: Interesting solution. It works?
Mine:
function addTaxAndFormatCurrency(sales) {
return "£" + calculateSalesTax(sales).toFixed(2);
}




/*
===================================================
Expand Down