CodeYourFuture · PatouMabando · Jul 9, 2022
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,3 @@
-console.log("Hello world");
+let  message = ' I just started learning JavaScript!'
+
+console.log("Hello world" + message);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
+var greeting = "Hello world";
 
 console.log(greeting);
+console.log(greeting);
+console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var message = "This is a string";
+var messageType = typeof message;
 console.log(message);
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+var greetingStart = "Hello, my name is ";
+var name = "Patou";
 
-console.log(message);
+var greeting = greetingStart + name;
+
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+var name = "Patou";
 
-console.log(message);
+var nameLength = name.length;
+
+console.log("My name is " + name + " and my name is " + nameLength + " characters long ");
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
-const name = " Daniel  ";
+var name = "Patou";
 
-console.log(message);
+var nameLength = name.length;
+
+console.log("My name is " + name + " and my name is " + nameLength + " " + " characters long ".trim());
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,7 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+
+console.log( "Number of students: " + numberOfStudents +  "\n" + 
+"Number of mentors: " + numberOfMentors + "\n" +
+"Total numnber of students and mentors: " + (numberOfStudents + numberOfMentors) );
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,17 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+console.log("Percentage students: " + Math.round((numberOfStudents/(numberOfStudents+numberOfMentors))*100) + "%" + "\n" + "Percentage mentors: " + Math.round((numberOfMentors/(numberOfStudents+numberOfMentors))*100) + "%");
+
+// var numberOfStudents ;
+// var numberOfMentors ;
+
+// var totalPercStud;
+// var totalPercMent;
+
+// numberOfStudents = 15;
+// numberOfMentors = 8;
+
+// totalPercStud = (numberOfStudents / (numberOfMentors + numberOfStudents))*100 
+// totalPercMent = (numberOfMentors/ (numberOfMentors + numberOfStudents))*100
+console.log("Percentage students: " + Math.round(totalPercStud) + "%" + "\n" + "Percentage mentors: " + Math.round(totalPercMent) + "%")
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,7 @@
 function halve(number) {
-  // complete the function here
+  return number * 2;
 }
 
 var result = halve(12);
 
-console.log(result);
+console.log(result);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,5 +1,5 @@
 function triple(number) {
-  // complete function here
+return number * 3;
 }
 
 var result = triple(12);

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,6 +1,6 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+function multiply(num1, num2) {
+  return num1 * num2;
 }
 
 // Assign the result of calling the function the variable `result`

diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,6 @@
-// Declare your function first
-
+function divide(num1, num2){
+ return num1 / num2;
+}
 var result = divide(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,7 @@
 // Write your function here
-
+function createGreeting(name){
+ return name;
+}
 var greeting = createGreeting("Daniel");
 
-console.log(greeting);
+console.log("Hello, My name is " + greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
-// Declare your function first
+function add(num1, num2){
+ return num1 + num2;
+}
 
 // Call the function and assign to a variable `sum`
-
+var sum = add(13, 124)
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
@@ -1,4 +1,6 @@
-// Declare your function here
+function createLongGreeting(name, age) {
+ return "Hello, my name is " + name + " and I'm " + age + " years old";
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,27 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function shoutyGreeting(name) {
+  var greeting = "Hello " + name;
+  return greeting.toUpperCase();
+}
+
+for (x = 1; x < 6; x++) {
+  if (x == 1) {
+    var greeting = shoutyGreeting(mentor1);
+    console.log(greeting);
+  } else if (x == 2) {
+    var greeting = shoutyGreeting(mentor2);
+    console.log(greeting);
+  } else if (x == 3) {
+    var greeting = shoutyGreeting(mentor3);
+    console.log(greeting);
+  } else if (x == 4) {
+    var greeting = shoutyGreeting(mentor4);
+    console.log(greeting);
+  } else if (x == 5) {
+    var greeting = shoutyGreeting(mentor5);
+    console.log(greeting);
+  }
+}
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,27 +1,23 @@
-// 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 " + name "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
 }
 
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====
-
 There are some Tests in this file that will help you work out if your code is working.
-
 To run the tests for just this one file, type `npm test -- --testPathPattern 1-syntax-errors` into your terminal
 (Reminder: You must have run `npm install` one time before this will work!)
-
 ===================================================
 */
 
@@ -37,4 +33,4 @@ test("introduceMe function returns the correct string", () => {
 
 test("getTotal returns a string describing the total", () => {
   expect(getTotal(23, 5)).toEqual("The total is 28");
-});
+});
diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
@@ -1,16 +1,15 @@
 // The syntax for this function is valid but it has an error, find it and fix it.
 
 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) { 
+  return a * b * c;
 }
 
 /* 

diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
@@ -1,16 +1,20 @@
 // Add comments to explain what this function does. You're meant to use Google!
+// This function is return random between zero and nine. 
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+// This function "combine2Words" combine or join two words together.
 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);
 }
 
 /* 
@@ -34,4 +38,4 @@ test("concatenate example #2", () => {
 
 test("concatenate doesn't only accept strings", () => {
   expect(concatenate("I", "am", 13)).toEqual("I am 13");
-});
+});
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(price) {
+ return priceOfTax = (price * 20) / 100 + price;
+}
 
 /*
   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){
+  taxAmount = calculateSalesTax(price);
+  return "£"+ ((taxAmount).toFixed(2));
+}
 
 /* 
 ===================================================

diff --git a/package.json b/package.json
@@ -14,15 +14,21 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"],
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ],
     "projects": [
       {
         "displayName": "mandatory",
-        "testMatch": ["<rootDir>/mandatory/*.js"]
+        "testMatch": [
+          "<rootDir>/mandatory/*.js"
+        ]
       },
       {
         "displayName": "extra",
-        "testMatch": ["<rootDir>/extra/*.js"]
+        "testMatch": [
+          "<rootDir>/extra/*.js"
+        ]
       }
     ]
   },