CodeYourFuture · bireworld · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020
diff --git a/week-1/1-exercises/B-hello-world/exercise.js b/week-1/1-exercises/B-hello-world/exercise.js
@@ -1 +1,2 @@
-console.log("Hello world");
+console.log("Hello world. I just started learning javascript");
+console.log(2020);
diff --git a/week-1/1-exercises/C-variables/exercise.js b/week-1/1-exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hello World!";
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
diff --git a/week-1/1-exercises/D-strings/exercise.js b/week-1/1-exercises/D-strings/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+var message = "This is a string";
+var messageType = typeof message;
 
+console.log(messageType); // logs 'string'
 console.log(message);
diff --git a/week-1/1-exercises/E-strings-concatenation/exercise.js b/week-1/1-exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+var greetingStart = "Hello, my name is ";
+var name = "Berhane";
 
-console.log(message);
+var greeting = greetingStart + name;
+
+console.log(greeting); // Logs "Hello, my name is Daniel"
diff --git a/week-1/1-exercises/F-strings-methods/exercise.js b/week-1/1-exercises/F-strings-methods/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
-
+var name = "Berhane";
+var nameLength = name.length;
+var message = "My name is " + name +" and my name is " + nameLength + " characters long"
+console.log(nameLength); // Logs 6
 console.log(message);
diff --git a/week-1/1-exercises/F-strings-methods/exercise2.js b/week-1/1-exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,3 @@
-const name = " Daniel  ";
-
-console.log(message);
+const name = " My name is Berhane  and my name is 7 characters long  ";
+name.trim();
+console.log(name);
diff --git a/week-1/1-exercises/G-numbers/exercise.js b/week-1/1-exercises/G-numbers/exercise.js
@@ -1 +1,5 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+var sum = numberOfStudents + numberOfMentors;
+console.log("Total numnber of students and mentors:" + sum);
diff --git a/week-1/1-exercises/I-floats/exercise.js b/week-1/1-exercises/I-floats/exercise.js
@@ -1,2 +1,9 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var stuPercentile = numberOfStudents/23*100;
+var mentorpercentile = numberOfMentors/23*100;
+stuPercentile = Math.round(stuPercentile);
+mentorpercentile = Math.round(mentorpercentile);
+console.log("Percentage Students:" +stuPercentile + "%" );
+console.log("Percentage Mentors:" + mentorpercentile + "%");
+
diff --git a/week-1/1-exercises/J-functions/exercise.js b/week-1/1-exercises/J-functions/exercise.js
@@ -1,7 +1,11 @@
 function halve(number) {
   // complete the function here
+  return number/2;
 }
 
 var result = halve(12);
-
+var result2 = halve(32);
+var result3 = halve(3);
 console.log(result);
+console.log(result2);
+console.log(result3);
diff --git a/week-1/1-exercises/J-functions/exercise2.js b/week-1/1-exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  return number * 3;
 }
 
 var result = triple(12);

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

diff --git a/week-1/1-exercises/K-functions-parameters/exercise2.js b/week-1/1-exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,10 @@
 // Declare your function first
+function divide(num1, num2) {
+    // Calculate the result of the function and return it
+    return num1 / num2;
+}
 
+// Assign the result of calling the function the variable `result`
 var result = divide(3, 4);
 
 console.log(result);
diff --git a/week-1/1-exercises/K-functions-parameters/exercise3.js b/week-1/1-exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(name){
+    return "Hello, my name is " + name;
+}
 
 var greeting = createGreeting("Daniel");
 

diff --git a/week-1/1-exercises/K-functions-parameters/exercise4.js b/week-1/1-exercises/K-functions-parameters/exercise4.js
@@ -1,4 +1,9 @@
 // Declare your function first
+function addition(num1, num2) {
+  return num1 + num2;
+}
+
+sum = addition(13, 124);
 
 // Call the function and assign to a variable `sum`
 

diff --git a/week-1/1-exercises/K-functions-parameters/exercise5.js b/week-1/1-exercises/K-functions-parameters/exercise5.js
@@ -1,4 +1,8 @@
 // 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/week-1/2-mandatory/1-syntax-errors.js b/week-1/2-mandatory/1-syntax-errors.js
@@ -2,18 +2,19 @@
 
 // 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 getAddition(a, b) {
-    total = a ++ b
+function getRemainder(a, b) {
+
 
     // Use string interpolation here
-    return "The total is %{total}"
+    return `The remainder is ${a%b}`;
 }
 
 /* ======= TESTS - DO NOT MODIFY ===== */
@@ -23,12 +24,12 @@ function getAddition(a, b) {
 function test(test_name, expr) {
     let status;
     if (expr) {
-        status = "PASSED"
+        status = "PASSED" ;
     } else {
-        status = "FAILED"
+        status = "FAILED" ;
     }
 
-    console.log(`${test_name}: ${status}`)
+    console.log(`${test_name}: ${status}`) ;
 }
 
 test("fixed addNumbers function - case 1", addNumbers(3,4,6) === 13)

diff --git a/week-1/2-mandatory/2-logic-error.js b/week-1/2-mandatory/2-logic-error.js
@@ -1,16 +1,16 @@
 // 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 getWordLength(word) {
-  return "word".length()
+  return word.length;
 }
 
 function multiply(a, b, c) {
-  a * b * c;
-  return;
+
+  return a * b * c;
 }
 
 /* ======= TESTS - DO NOT MODIFY ===== 

diff --git a/week-1/2-mandatory/3-function-output.js b/week-1/2-mandatory/3-function-output.js
@@ -1,16 +1,18 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getNumber() {
-  return Math.random() * 10;
+  return Math.random() * 10; // returns a random integer from 0 to 9
+
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
 function s(w1, w2) {
-  return w1.concat(w2);
+  return w1.concat(w2); // concatenates w1(string 1) with w2(string 2)
 }
 
 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 to expect in return
+  return firstWord +" " + secondWord +" "+ thirdWord;
 }
 
 /* ======= TESTS - DO NOT MODIFY ===== 

diff --git a/week-1/2-mandatory/4-tax.js b/week-1/2-mandatory/4-tax.js
@@ -5,7 +5,12 @@
   Sales tax is 20% of the price of the product
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice) {
+
+  var salesTax = 0.2 * productPrice;
+  return productPrice+salesTax;
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +22,11 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function formatCurrency() {}
+function formatCurrency(price) {
+  var totPrice = calculateSalesTax(price);
+  totPrice = totPrice.toFixed(2);
+  return "£"+totPrice;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.