CodeYourFuture · ManSangSin · Feb 19, 2023 · Feb 19, 2023 · Feb 19, 2023 · Feb 19, 2023
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,7 +5,9 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(amountGBP) {
+  return amountGBP * 1.4;
+}
 
 /*
   CURRENCY CONVERSION
@@ -15,7 +17,11 @@ 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(amountGBP) {
+  convertedAmount = amountGBP * 0.99 * 5.7;
+  convertedAmount =  (Math.round(convertedAmount * 100)/100);
+  return convertedAmount;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.

diff --git a/extra/2-piping.js b/extra/2-piping.js
@@ -16,26 +16,31 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(value1, value2) {
+  return value1 + value2;
 }
 
-function multiply() {
-
+function multiply(value3, value4) {
+  return value3 * value4;
 }
 
-function format() {
-
+function format(value5) {
+  return `£${value5}`;
 }
 
 const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+let badCode = format(multiply(add(startingValue, 10)));
 
 /* BETTER PRACTICE */
 
-let goodCode =
+let valueAddTen = add(startingValue, 10);
+let valueMultiplyByTwo = multiply(valueAddTen, 2);
+let goodCode = format(valueMultiplyByTwo);
+
+
+
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.

diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
@@ -43,12 +43,26 @@
     Very doubtful.
 */
 
+
 // This should log "The ball has shaken!"
 // and return the answer.
+
+const veryPositive = ["It is certain.", "It is decidedly so.", "Without a doubt.", "Yes - definitely.", "You may rely on it."];
+const positive = ["As I see it, yes.", "Most likely.", "Outlook good.", "Yes.", "Signs point to yes."];  
+const negative = ["Reply hazy, try again.", "Ask again later.", "Better not tell you now.", "Cannot predict now.", "Concentrate and ask again."];
+const veryNegative = ["Don't count on it.", "My reply is no.", "My sources say no.", "Outlook not so good.", "Very doubtful."];
+
 function shakeBall() {
   //Write your code in here
+  let answers = veryPositive.concat(positive, negative, veryNegative);
+  let numberOfAnswers = answers.length;
+  let randomInteger = Math.floor(Math.random() * numberOfAnswers);
+  let randomAnswer = answers[randomInteger];
+  console.log("The ball has shaken!");
+  return randomAnswer;
 }
 
+
 /* 
   This function should say whether the answer it is given is
     - very positive
@@ -58,10 +72,25 @@ function shakeBall() {
 
   This function should expect to be called with any value which was returned by the shakeBall function.
 */
+
+let answer = shakeBall();
 function checkAnswer(answer) {
   //Write your code in here
+  if (veryPositive.includes(answer)) {
+    return "very positive";
+  }
+  if (positive.includes(answer)) {
+    return "positive";
+  }
+  if (negative.includes(answer)) {
+    return "negative";
+  }
+  if (veryNegative.includes(answer)) {
+    return "very negative";
+  }
 }
 
+
 /* 
 ==================================
 ======= TESTS - DO NOT MODIFY =====

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -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`;
+}
 
 function getTotal(a, b) {
-  total = a ++ b;
+  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
@@ -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
@@ -3,12 +3,17 @@ function getRandomNumber() {
   return Math.random() * 10;
 }
 
+// Picks a random number between 0 (inclusive) and 1 (non-inclusive) and multiplies it by 10.
+
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+// Joins the variable string of word1 to word2 exactly as shown.
+
 function concatenate(firstWord, secondWord, thirdWord) {
+  return firstWord.concat(" ", 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.
 }

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,9 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(amount) {
+  return amount = (amount * 1.2);
+}
 
 /*
   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(amount) {
+  tax = calculateSalesTax(amount);
+  return `£${tax.toFixed(2)}`;
+}
 
 /* 
 ===================================================