From 9db6efc22e092d40e4356dc94df41eb7ca43cd2e Mon Sep 17 00:00:00 2001 From: Diego Harera <104278852+diegoharera@users.noreply.github.com> Date: Mon, 4 Jul 2022 23:11:37 +0200 Subject: [PATCH 1/4] compled exercices A to D --- exercises/B-hello-world/exercise.js | 6 +++++- exercises/C-variables/exercise.js | 5 ++++- exercises/D-strings/exercise.js | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..ee1c5b554 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,5 @@ -console.log("Hello world"); +// console.log("Hello world"); +//console.log("save the world"); +// console.log("create the world","happy","code your"); +// console.log(save the world); +console.log(39); \ No newline at end of file diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..4be9ec829 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `greeting` - +let greeting = "hello Africa"; +console.log(greeting); +console.log(greeting); +console.log(greeting); console.log(greeting); diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..735143c29 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,4 @@ // Start by creating a variable `message` - +let message = "my name is Harera"; console.log(message); +console.log(typeof message); \ No newline at end of file From 483ad454ac6375a11f5214169dfb45755ef57a9f Mon Sep 17 00:00:00 2001 From: Diego Harera <104278852+diegoharera@users.noreply.github.com> Date: Mon, 4 Jul 2022 23:24:25 +0200 Subject: [PATCH 2/4] i compled E --- exercises/E-strings-concatenation/exercise.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..2ccfd1977 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` +let greetingStart = "hello,my name is "; +let name = "DIego"; -console.log(message); +let greeting = greetingStart + name; +console.log(greeting); From 1492cde1d459544a329d5064201410208614ca57 Mon Sep 17 00:00:00 2001 From: Diego Harera <104278852+diegoharera@users.noreply.github.com> Date: Mon, 4 Jul 2022 23:57:56 +0200 Subject: [PATCH 3/4] i completed exercice f --- exercises/F-strings-methods/exercise.js | 4 +++- exercises/F-strings-methods/exercise2.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..5807ed59c 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` - +let name = "Diego"; +let amount = name.length; +let message = "hello,my name is " + name + " and my name is " + amount + " characters long"; console.log(message); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..b532a3106 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,3 @@ const name = " Daniel "; - +const message = name.trim(); console.log(message); From b49b69b314a822096772f996108aaa6b9d25c5dd Mon Sep 17 00:00:00 2001 From: Diego Harera <104278852+diegoharera@users.noreply.github.com> Date: Wed, 6 Jul 2022 23:19:18 +0200 Subject: [PATCH 4/4] i completed G/l/k-/l and mandatory --- exercises/G-numbers/exercise.js | 6 ++++++ exercises/I-floats/exercise.js | 7 +++++++ exercises/J-functions/exercise.js | 1 + exercises/J-functions/exercise2.js | 2 ++ exercises/K-functions-parameters/exercise.js | 5 ++--- exercises/K-functions-parameters/exercise2.js | 7 ++++--- exercises/K-functions-parameters/exercise3.js | 7 ++++--- exercises/K-functions-parameters/exercise4.js | 6 ++++-- exercises/K-functions-parameters/exercise5.js | 8 ++++---- exercises/L-functions-nested/exercise.js | 9 +++++++++ mandatory/1-syntax-errors.js | 14 ++++++-------- mandatory/2-logic-error.js | 9 +++------ mandatory/3-function-output.js | 3 +++ mandatory/4-tax.js | 10 ++++++---- 14 files changed, 61 insertions(+), 33 deletions(-) diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..d89f5108b 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,7 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +let numberOfStudents = 15; +let numberOfMentors = 8; +let total = numberOfStudents + numberOfMentors; +console.log("NumberOfStudents:", numberOfStudents); +console.log("let numberOfMentors:", numberOfMentors); +console.log("Total number of students and mentors:", total); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..25506e449 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,9 @@ var numberOfStudents = 15; var numberOfMentors = 8; + +let studentPercentage = (numberOfStudents / 23) * 100; +let mentorsPercentage = (numberOfMentors / 23) * 100; +let studentsResult = Math.round(studentPercentage); +let mentorsResult = Math.round(mentorsPercentage); +console.log("Percentage students:", studentsResult + "%"); +console.log("Percentage students:", mentorsResult + "%"); diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..138e3180a 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,6 @@ function halve(number) { // complete the function here + return number / 2 } var result = halve(12); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..1949bb03f 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,5 +1,7 @@ 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 index 8d5db5e69..386ea242f 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,9 +1,8 @@ // Complete the function so that it takes input parameters -function multiply() { +function multiply(a, b) { // Calculate the result of the function and return it + return a * b; } - // Assign the result of calling the function the variable `result` var result = multiply(3, 4); - console.log(result); diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js index db7a8904b..38f5a7143 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,5 +1,6 @@ // Declare your function first - -var result = divide(3, 4); - +function divide(a, b) { + return a / b; +} +var result = divide(1.5, 2); console.log(result); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..7499f5ead 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,6 @@ // Write your function here - -var greeting = createGreeting("Daniel"); - +function createGreeting(name) { + return "Hello my name is " + name; +} +var greeting = createGreeting("Diego"); console.log(greeting); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..6d6bfb1c4 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,7 @@ // Declare your function first - +function add(a, b) { + return a + b; +} // Call the function and assign to a variable `sum` - +let sum = add(13, 124); console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..c1e7e1bc0 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,5 @@ -// Declare your function here - -const greeting = createLongGreeting("Daniel", 30); - +function createLongGreeting(name, age) { + return "Hello my name is " + name + " and I'm " + age + " years old"; +} +const greeting = createLongGreeting("Diego", 30); console.log(greeting); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..066c24750 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,12 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; +function greet(name) { + let greeting = "Hello " + name; + return greeting.toLocaleUpperCase(); +} +console.log(greet(mentor1)); +console.log(greet(mentor2)); +console.log(greet(mentor3)); +console.log(greet(mentor4)); +console.log(greet(mentor5)); diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..864e73226 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +1,14 @@ // 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; - - return "The total is total"; + let total = a + b; + return "The total is " + total; } /* diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..f51687d6c 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,13 @@ // 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; + return a * b * c; } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..7008849d0 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,9 +1,11 @@ // Add comments to explain what this function does. You're meant to use Google! +// The Math. random() function returns a floating-point, pseudo-random number in the range 0 to less than 1 (inclusive of 0, but not 1) with approximately uniform distribution over that range function getRandomNumber() { return Math.random() * 10; } // Add comments to explain what this function does. You're meant to use Google! +// 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 combine2Words(word1, word2) { return word1.concat(word2); } @@ -11,6 +13,7 @@ function combine2Words(word1, 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); } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..b71534e7b 100644 --- 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(productPrice) { + return productPrice + productPrice * 0.2; +} /* CURRENCY FORMATTING @@ -16,9 +18,9 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ - -function addTaxAndFormatCurrency() {} - +function addTaxAndFormatCurrency(number) { + return "£" + calculateSalesTax(number).toFixed(2); +} /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====