From 8dc67a898933a3e57900b240d514bfb21dc525bb Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Mon, 14 Dec 2020 16:47:05 +0000 Subject: [PATCH 01/38] B done when you get rid of the quote marks you get some kinf of error and when you console log a number without quotes the number still appears --- exercises/B-hello-world/exercise.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..6a949aa04 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,2 @@ -console.log("Hello world"); +console.log("Hello World"); +console.log(5); \ No newline at end of file From fe52111b752de201b4d75e8e46c8dfc894cf2791 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Mon, 14 Dec 2020 16:56:54 +0000 Subject: [PATCH 02/38] C greeting --- exercises/C-variables/exercise.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..36b8eca74 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,11 @@ -// Start by creating a variable `greeting` +var approach = "greeting";// Start by creating a variable `greeting` -console.log(greeting); +console.log(approach); + +var approach = "greeting";// Start by creating a variable `greeting` + +console.log(approach); + +var approach = "greeting";// Start by creating a variable `greeting` + +console.log(approach); From fbd526d163b2ccb60c4c638fc49cd9cd8bec1f1c Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Mon, 14 Dec 2020 17:28:46 +0000 Subject: [PATCH 03/38] exercide d d strings --- exercises/D-strings/exercise.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..fee4053c9 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,6 @@ -// Start by creating a variable `message` +const message = "This is a String"; +const messageType = typeof message; + console.log(message); +console.log(messageType); From 7b792b01d77b776d58d6a5c542d667bb098bea98 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Mon, 14 Dec 2020 18:24:02 +0000 Subject: [PATCH 04/38] e exercise strings concatenation --- exercises/E-strings-concatenation/exercise.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..b1b770490 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,5 @@ -// Start by creating a variable `message` +const introduction = "Hello my name is"; +const name = " Abdulqadir"; -console.log(message); +console.log(introduction); +console.log(name); From ea1271eaedcacc8027c5fcd602da42c41b2615ab Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 02:04:12 +0000 Subject: [PATCH 05/38] answers f to k --- exercises/F-strings-methods/exercise.js | 5 +++-- exercises/F-strings-methods/exercise2.js | 6 ++++-- exercises/G-numbers/exercise.js | 7 +++++++ exercises/I-floats/exercise.js | 13 +++++++++++++ exercises/J-functions/exercise.js | 8 +++++++- exercises/J-functions/exercise2.js | 2 +- exercises/K-functions-parameters/README.md | 2 +- exercises/K-functions-parameters/exercise.js | 4 ++-- exercises/K-functions-parameters/exercise2.js | 4 +++- exercises/K-functions-parameters/exercise3.js | 4 +++- exercises/K-functions-parameters/exercise4.js | 6 ++++-- exercises/K-functions-parameters/exercise5.js | 4 +++- 12 files changed, 51 insertions(+), 14 deletions(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..d3252c0ea 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,4 @@ -// Start by creating a variable `message` +let name = "Abdulqadir"; +let nameLength = name.length; -console.log(message); +console.log(`My name is ${name} and my name is ${name.length} characters long`); \ No newline at end of file diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..0fdb111c7 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ -const name = " Daniel "; +let name = "Abdulqadir"; +let addTrim = name.trim(); +let newNameLength = addTrim.length; -console.log(message); +console.log(`my name is ${addTrim} and my name is ${newNameLength} characters long`); \ No newline at end of file diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..301fd7815 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,8 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +let numberOfStudents = 15; +let numberOfMentors = 3; +let total = numberOfStudents + numberOfMentors; + +console.log(`number of students: ${numberOfStudents}`); +console.log(`number of mentors: ${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..759b77c6e 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,15 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var total = numberOfStudents + numberOfMentors; + +var convertStudent = numberOfStudents/total*100; +var convertMentors = numberOfMentors/total*100; + +var percentageOfStudents = Math.round(convertStudent); +var percentageOfMentors = Math.round(convertMentors); + +console.log(`Student percentage: ${percentageOfStudents}%`); +console.log(`Student percentage: ${percentageOfMentors}%`); + + + diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..a239e7a4d 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,13 @@ function halve(number) { - // complete the function here + return number/2; } var result = halve(12); +var result1 = halve(20); +var result2 = halve(30); +var result3 = halve(100); console.log(result); +console.log(result1); +console.log(result2); +console.log(result3); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..9b1665f53 100644 --- 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/README.md b/exercises/K-functions-parameters/README.md index 02ab2a844..c961dd87c 100644 --- a/exercises/K-functions-parameters/README.md +++ b/exercises/K-functions-parameters/README.md @@ -42,7 +42,7 @@ function add(num1, num2) { * Write a function that takes a name (a string) and returns a greeting -## Expected result +## Expected result ``` Hello, my name is Daniel diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..9e8ac798a 100644 --- 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; // Calculate the result of the function and return it } // 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 index db7a8904b..921ca0c52 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,4 +1,6 @@ -// Declare your function first +function divide(num1, num2){ + return num1/num2; +}// Declare your function first var result = divide(3, 4); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..00c010f17 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,4 +1,6 @@ -// Write your function here +function createGreeting(name){ + return `Hello, my name is ${name}`; +}// Write your function here var greeting = createGreeting("Daniel"); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..c2e5cff05 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(num1, num2) { + return num1+num2; +}// Declare your function first -// Call the function and assign to a variable `sum` +var sum = add(13,124);// Call the function and assign to a variable `sum` console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..e43963566 100644 --- 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` +}// Declare your function here const greeting = createLongGreeting("Daniel", 30); From 1da95c79ef31b5747aec791f2d7af58f8a5fd921 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 03:35:02 +0000 Subject: [PATCH 06/38] Update exercise.js --- exercises/L-functions-nested/exercise.js | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..0dba27846 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,5 +1,49 @@ +function percentage(num,total) { + return (num/total*100); +} + +var numberOfStudents = 15; +var numberOfMentors = 8; +var total = numberOfStudents + numberOfMentors; +var totalPercentage = percentage(numberOfStudents,numberOfMentors,total); + +function initialMessage(numberOfStudents, numberOfMentors){ + message = `totalPercentage: ${numberOfStudents} ${numberOfMentors} ${Math.round(percentage)}%`; + return message; +} + +console.log(totalPercentage); + + + + + + + + + + + + var mentor1 = "Daniel"; var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function shoutyGreeting(name){ + var greeting = name.toUpperCase(); + return greeting = `HELLO ${greeting}`; +} + +var greeting1 = shoutyGreeting(mentor1); +var greeting2 = shoutyGreeting(mentor2); +var greeting3 = shoutyGreeting(mentor3); +var greeting4 = shoutyGreeting(mentor4); +var greeting5 = shoutyGreeting(mentor5); + +console.log(greeting1); +console.log(greeting2); +console.log(greeting3); +console.log(greeting4); +console.log(greeting5); \ No newline at end of file From 11dd1d9bcae12740113ca969d2418f4c05019c13 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 04:02:32 +0000 Subject: [PATCH 07/38] Update 1-syntax-errors.js syntax error completed 1 --- mandatory/1-syntax-errors.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 0a21afd1b..95f131831 100644 --- 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 " + 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; } /* From 1ba5862c45060c753f51e006150484f975dd906b Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 04:05:33 +0000 Subject: [PATCH 08/38] Update 2-logic-error.js logic errors done --- mandatory/2-logic-error.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 3c578ad87..f2076f517 100644 --- 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 getWordLength(word) { - return "word".length(); + return word.length; } function multiply(a, b, c) { - a * b * c; - return; + return a*b*c; } /* From e2962b67b99a2e95a5691465997443f0e94eba56 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 04:32:01 +0000 Subject: [PATCH 09/38] Update 3-function-output.js completed --- mandatory/3-function-output.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index c9221a200..d5f48804b 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,18 +1,21 @@ // Add comments to explain what this function does. You're meant to use Google! function getNumber() { return Math.random() * 10; -} +} // 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 — which you can then scale to your desired range. so the getnumber function multiplies the psuedo random number between 0 and 10 however not 10. // Add comments to explain what this function does. You're meant to use Google! function s(w1, w2) { return w1.concat(w2); } +//I think this function allows 2 strings to be added together and create or in this case return a new string 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} ${secondWord} ${thirdWord}`; } + /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From 78a1327e041ceb5ebeb2afef5aad841def6b41d9 Mon Sep 17 00:00:00 2001 From: abdiqaadir3110 Date: Tue, 15 Dec 2020 16:51:39 +0000 Subject: [PATCH 10/38] Update 4-tax.js --- mandatory/4-tax.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index c9e41c691..19345f0fc 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(price) { + return price + (price*0.2); +} /* CURRENCY FORMATTING From ef5eef6065f06bd7e601ac55c9849e9eee432741 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sat, 16 Jan 2021 18:26:24 +0200 Subject: [PATCH 11/38] Update 1-syntax-errors.js Mt first try. --- mandatory/1-syntax-errors.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 95f131831..6bc206d08 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,6 +1,6 @@ // 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; } @@ -9,11 +9,13 @@ function introduceMe(name, age) { } function getTotal(a, b) { - total = a + b; + let total = a + b; return "The total is " + total; } +console.log(getTotal); + /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From d705ed09552653eadeda01a3fa72fcf50a935665 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sat, 16 Jan 2021 19:19:28 +0200 Subject: [PATCH 12/38] Add comments after google search --- mandatory/3-function-output.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index d5f48804b..c642f0959 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,9 +1,15 @@ // Add comments to explain what this function does. You're meant to use Google! + +// Math.random() returns a random number between 0 (inclusive), and 1 (exclusive): +// For example: 0.40020936983011146 +// Math.random() always returns a number lower than 1. function getNumber() { return Math.random() * 10; } // 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 — which you can then scale to your desired range. so the getnumber function multiplies the psuedo random number between 0 and 10 however not 10. // Add comments to explain what this function does. You're meant to use Google! +// The concat() method is used to join two or more arrays. +This method does not change the existing arrays, but returns a new array, containing the values of the joined arrays. function s(w1, w2) { return w1.concat(w2); } @@ -12,7 +18,7 @@ function s(w1, w2) { 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} ${secondWord} ${thirdWord}`; + return `${firstWord} ${secondWord} ${thirdWord}`; } From 6abe75e612471df4d70f4ee82a81c9093d3f4fca Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sat, 16 Jan 2021 19:53:54 +0200 Subject: [PATCH 13/38] Add comments to changes --- exercises/B-hello-world/exercise.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index 6a949aa04..ef14d9328 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1,2 +1,12 @@ console.log("Hello World"); -console.log(5); \ No newline at end of file +console.log(5); + +// When I console.log several things at once, I get a list of answers. + +// When I get rid of quotes,I get a syntax error. +console.log(Hello World.I just started learning JavaScript!); + +console.log("Hello World. I just started learning JavaScript!"); + +// A number without quotes. +console.log(205); \ No newline at end of file From c249f4dd29dd3d4c978882d8e85aaf13e1a66bf7 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 08:41:04 +0200 Subject: [PATCH 14/38] C-variables --- exercises/C-variables/exercise.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index 36b8eca74..c8382f8d2 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,11 +1,12 @@ var approach = "greeting";// Start by creating a variable `greeting` -console.log(approach); +let greeting = "Hello World" +console.log(greeting); var approach = "greeting";// Start by creating a variable `greeting` -console.log(approach); +console.log(greeting); var approach = "greeting";// Start by creating a variable `greeting` -console.log(approach); +console.log(greeting); From d32cd9e9224be71629929c72a40e93e86ca5e295 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 09:03:22 +0200 Subject: [PATCH 15/38] Exercise-D --- exercises/D-strings/exercise.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index fee4053c9..9f9b5484f 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -4,3 +4,10 @@ const messageType = typeof message; console.log(message); console.log(messageType); + +// My copy +const myText = "This is a String of Douglas"; +const usingTypeof = typeof myText; + +console.log(myText); +console.log(usingTypeof); \ No newline at end of file From 536905cefe6dc2542c464dd506a17f8b529b911c Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 09:22:07 +0200 Subject: [PATCH 16/38] E-Strings-Concatenation --- exercises/E-strings-concatenation/exercise.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index b1b770490..fd8cae8ac 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,5 +1,13 @@ -const introduction = "Hello my name is"; -const name = " Abdulqadir"; +// const introduction = "Hello my name is"; +// const name = " Abdulqadir"; -console.log(introduction); -console.log(name); +// console.log(introduction); +// console.log(name); + +// My copy +let standardIntro = "Hello, my first name is"; +let yourName = " Douglas."; + +let greeting = standardIntro + yourName; + +console.log(greeting); \ No newline at end of file From 88f948444e3a59efc89cee9ac80fb4912d521f6a Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 10:34:32 +0200 Subject: [PATCH 17/38] F-strings-methods concatenation with interpolation. --- exercises/F-strings-methods/exercise.js | 13 ++++++++++--- exercises/F-strings-methods/exercise2.js | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index d3252c0ea..c91e33d42 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,4 +1,11 @@ -let name = "Abdulqadir"; -let nameLength = name.length; +// let name = "Abdulqadir"; +// let nameLength = name.length; -console.log(`My name is ${name} and my name is ${name.length} characters long`); \ No newline at end of file +// console.log(`My name is ${name} and my name is ${name.length} characters long`); + + +let myName = "Douglas Trainee"; +let myNameLength = myName.length; + +// With interpolation, I don't need to create another variable for the greeting text. +console.log(`My name is ${myName} and my name is ${myNameLength} characters long`); \ No newline at end of file diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index 0fdb111c7..d83866254 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -2,4 +2,4 @@ let name = "Abdulqadir"; let addTrim = name.trim(); let newNameLength = addTrim.length; -console.log(`my name is ${addTrim} and my name is ${newNameLength} characters long`); \ No newline at end of file +console.log(`my name is ${addTrim} and my name is ${newNameLength} characters long`); From 566951e6adef8f8b0f8ba81468c5df72db26886b Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 11:11:49 +0200 Subject: [PATCH 18/38] F-strings-methods-exercise2 --- exercises/F-strings-methods/exercise2.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index d83866254..635ede2ff 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -3,3 +3,15 @@ let addTrim = name.trim(); let newNameLength = addTrim.length; console.log(`my name is ${addTrim} and my name is ${newNameLength} characters long`); + +let myName = " Douglas Trainee "; +let myNameLength = myName.length; + +let myNameTrim = myName.trim(); +let myNewNameLength = myNameTrim.length; + +// 19 characters for myName +console.log(`My name is ${myName} and my name is ${myNameLength} characters long`); + +// The whitespaces are removed: 15 characters for myName +console.log(`My name is ${myNameTrim} and my name is ${myNewNameLength} characters long`); \ No newline at end of file From 40591b2428c6e1d78c9f4db5592fb7580549641c Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 11:40:40 +0200 Subject: [PATCH 19/38] G-numbers --- exercises/G-numbers/exercise.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 301fd7815..b91af39eb 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1,8 +1,17 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` -let numberOfStudents = 15; -let numberOfMentors = 3; +// let numberOfStudents = 15; +// let numberOfMentors = 3; +// let total = numberOfStudents + numberOfMentors; + +// console.log(`number of students: ${numberOfStudents}`); +// console.log(`number of mentors: ${numberOfMentors}` ); +// console.log(`total number of students and mentors: ${total}`); + +// My copy. +let numberOfStudents = 30; +let numberOfMentors = 10; let total = numberOfStudents + numberOfMentors; -console.log(`number of students: ${numberOfStudents}`); -console.log(`number of mentors: ${numberOfMentors}` ); -console.log(`total number of students and mentors: ${total}`); +console.log(`Number of students: ${numberOfStudents}`); +console.log(`Number of mentors: ${numberOfMentors}`); +console.log(`Total number of students and mentors: ${total}`); \ No newline at end of file From 3a15ad7c553e7e1d280a7433a65258ec343eefb8 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 11:57:57 +0200 Subject: [PATCH 20/38] I-floats-exercise --- exercises/I-floats/exercise.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index 759b77c6e..d95575386 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,15 +1,23 @@ -var numberOfStudents = 15; -var numberOfMentors = 8; -var total = numberOfStudents + numberOfMentors; +// var numberOfStudents = 15; +// var numberOfMentors = 8; +// var total = numberOfStudents + numberOfMentors; + +// var convertStudent = numberOfStudents/total*100; +// var convertMentors = numberOfMentors/total*100; -var convertStudent = numberOfStudents/total*100; -var convertMentors = numberOfMentors/total*100; +// var percentageOfStudents = Math.round(convertStudent); +// var percentageOfMentors = Math.round(convertMentors); -var percentageOfStudents = Math.round(convertStudent); -var percentageOfMentors = Math.round(convertMentors); +// console.log(`Student percentage: ${percentageOfStudents}%`); +// console.log(`Student percentage: ${percentageOfMentors}%`); -console.log(`Student percentage: ${percentageOfStudents}%`); -console.log(`Student percentage: ${percentageOfMentors}%`); +var numberOfStudents = 30; +var numberOfMentors = 10; +var total = numberOfStudents + numberOfMentors; +var convertStudents = numberOfStudents / total * 100; +var convertMentors = numberOfMentors / total * 100; +console.log(`Student percentage: ${convertStudents}%`); +console.log(`Mentor percentage: ${convertMentors}%`); From 19b9c4035a8126c31a96fe30776f0b0a34987da8 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 12:50:18 +0200 Subject: [PATCH 21/38] J-functions-exercise.js --- exercises/J-functions/exercise.js | 32 +++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index a239e7a4d..37d0820c9 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,13 +1,25 @@ -function halve(number) { - return number/2; +// function halve(number) { +// return number/2; +// } + +// var result = halve(12); +// var result1 = halve(20); +// var result2 = halve(30); +// var result3 = halve(100); + +// console.log(result); +// console.log(result1); +// console.log(result2); +// console.log(result3); + +function divide(number) { + return number / 2; } -var result = halve(12); -var result1 = halve(20); -var result2 = halve(30); -var result3 = halve(100); +var answer1 = divide(5); +var answer2 = divide(10); +var answer3 = divide(15); -console.log(result); -console.log(result1); -console.log(result2); -console.log(result3); +console.log(answer1); +console.log(answer2); +console.log(answer3); \ No newline at end of file From 87245d1f505bc2a43570449577be4d29b1ac2a4e Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:01:30 +0200 Subject: [PATCH 22/38] J-functions-exercise2 --- exercises/J-functions/exercise2.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 9b1665f53..dd5b1b514 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,7 +1,16 @@ -function triple(number) { - return number*3 +// function triple(number) { +// return number*3 +// } + +// var result = triple(12); + +// console.log(result); + +// My copy. +function threeTimes(number) { + return (number * 3)*3; } -var result = triple(12); +var answer = threeTimes(3); -console.log(result); +console.log(`The answer is ${answer}`) \ No newline at end of file From 5d4201467bffbdb1858fc41f327a90b27c2d6c8c Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:20:37 +0200 Subject: [PATCH 23/38] K-functions-parameters-exercise1 --- exercises/K-functions-parameters/exercise.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 9e8ac798a..c4d6cd86d 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,9 +1,19 @@ // Complete the function so that it takes input parameters +// function multiply(num1, num2) { +// return num1*num2; // Calculate the result of the function and return it +// } + +// // Assign the result of calling the function the variable `result` +// var result = multiply(3, 4); + +// console.log(result); + +// My copy. function multiply(num1, num2) { - return 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 = multiply(3, 4); +let answer = multiply(5, 10); + +console.log(answer); -console.log(result); From b9bfb6e5244e6aa14f959799229fa84e97d66d61 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:34:54 +0200 Subject: [PATCH 24/38] K-functions-parameters-exercise2 --- exercises/K-functions-parameters/exercise2.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js index 921ca0c52..e629bf1c4 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,7 +1,16 @@ -function divide(num1, num2){ - return num1/num2; -}// Declare your function first +// function divide(num1, num2){ +// return num1/num2; +// }// Declare your function first -var result = divide(3, 4); +// var result = divide(3, 4); -console.log(result); +// console.log(result); + +// My copy. +function divide(num1, num2) { + return num1 / num2; +} + +let answer = divide(5, 10); + +console.log(Math.round(answer)); \ No newline at end of file From 75d4e88e65e874af15a210decf9b400d71b69f03 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:44:08 +0200 Subject: [PATCH 25/38] K-functions-parameters-exercise3 --- exercises/K-functions-parameters/exercise3.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 00c010f17..dbd54634d 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,7 +1,15 @@ -function createGreeting(name){ - return `Hello, my name is ${name}`; -}// Write your function here +// function createGreeting(name){ +// return `Hello, my name is ${name}`; +// }// Write your function here -var greeting = createGreeting("Daniel"); +// var greeting = createGreeting("Daniel"); -console.log(greeting); +// console.log(greeting); + +function standardGreeting(firstName) { + return `Hello my firstname is ${firstName}` +} + +let greeting = standardGreeting("Douglas"); + +console.log(greeting); \ No newline at end of file From e6de8c0b4708f6502b90e0f60d9244f8a7c83b53 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:49:44 +0200 Subject: [PATCH 26/38] K-functions-parameters-exercise4 --- exercises/K-functions-parameters/exercise4.js | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index c2e5cff05..d848e3ab8 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,7 +1,17 @@ -function add(num1, num2) { - return num1+num2; -}// Declare your function first +// function add(num1, num2) { +// return num1+num2; +// }// Declare your function first -var sum = add(13,124);// Call the function and assign to a variable `sum` +// var sum = add(13,124);// Call the function and assign to a variable `sum` -console.log(sum); +// console.log(sum); + +// My Copy. + +function adding(num1, num2) { + return num1 + num2; +} + +let sum = adding(5, 10); + +console.log(sum); \ No newline at end of file From 85c3407b7b36b13431bd80366450e09fa87efb3c Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 13:59:31 +0200 Subject: [PATCH 27/38] K-functions-parameters-exercise5 --- exercises/K-functions-parameters/exercise5.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index e43963566..ff2f20f82 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,7 +1,16 @@ -function createLongGreeting(name,age){ - return`Hello, my name is ${name} and I'm ${age} years old` -}// Declare your function here +// function createLongGreeting(name,age){ +// return`Hello, my name is ${name} and I'm ${age} years old` +// }// Declare your function here -const greeting = createLongGreeting("Daniel", 30); +// const greeting = createLongGreeting("Daniel", 30); -console.log(greeting); +// console.log(greeting); + +// My copy. +function nameAgeGreeting(yourName, yourAge) { + return `My name is ${yourName} and I'm ${yourAge} years old.`; +} + +let greeting = nameAgeGreeting("Douglas", 47); + +console.log(greeting); \ No newline at end of file From b895d6e179fb58d513340686d07e52cd21a3fc90 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 16:12:08 +0200 Subject: [PATCH 28/38] L-functions-nested-exercise1 --- exercises/L-functions-nested/exercise.js | 81 +++++++++++++++--------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index 0dba27846..27bef3f74 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,21 +1,39 @@ -function percentage(num,total) { - return (num/total*100); -} +// function percentage(num,total) { +// return (num/total*100); +// } + +// var numberOfStudents = 15; +// var numberOfMentors = 8; +// var total = numberOfStudents + numberOfMentors; +// var totalPercentage = percentage(numberOfStudents,numberOfMentors,total); + +// function initialMessage(numberOfStudents, numberOfMentors){ +// message = `totalPercentage: ${numberOfStudents} ${numberOfMentors} ${Math.round(percentage)}%`; +// return message; +// } -var numberOfStudents = 15; -var numberOfMentors = 8; -var total = numberOfStudents + numberOfMentors; -var totalPercentage = percentage(numberOfStudents,numberOfMentors,total); +// console.log(totalPercentage); -function initialMessage(numberOfStudents, numberOfMentors){ - message = `totalPercentage: ${numberOfStudents} ${numberOfMentors} ${Math.round(percentage)}%`; - return message; +function percentage(num, total) { + return Math.round((num / total) * 100); } -console.log(totalPercentage); +var numberOfStudents = 33; +var numberOfMentors = 13; +let total = numberOfStudents + numberOfMentors; +let totalPercentageStudents = percentage(numberOfStudents, total); +let totalPercentageMentors = percentage(numberOfMentors, total); +// function percentageType(catagory, percent) { +// // let message1 = `Percentage Students: ${totalPercentageStudents}`; +// // let message2 = `Percentage Mentors: ${totalPercentageMentors}`; +// return notemessage1, message2; +// } +console.log(`Percentage Students: ${totalPercentageStudents}`); +console.log(`Pencentage Mentors: ${totalPercentageMentors}`); + @@ -25,25 +43,26 @@ console.log(totalPercentage); -var mentor1 = "Daniel"; -var mentor2 = "Irina"; -var mentor3 = "Mimi"; -var mentor4 = "Rob"; -var mentor5 = "Yohannes"; -function shoutyGreeting(name){ - var greeting = name.toUpperCase(); - return greeting = `HELLO ${greeting}`; -} +// var mentor1 = "Daniel"; +// var mentor2 = "Irina"; +// var mentor3 = "Mimi"; +// var mentor4 = "Rob"; +// var mentor5 = "Yohannes"; + +// function shoutyGreeting(name){ +// var greeting = name.toUpperCase(); +// return greeting = `HELLO ${greeting}`; +// } + +// var greeting1 = shoutyGreeting(mentor1); +// var greeting2 = shoutyGreeting(mentor2); +// var greeting3 = shoutyGreeting(mentor3); +// var greeting4 = shoutyGreeting(mentor4); +// var greeting5 = shoutyGreeting(mentor5); -var greeting1 = shoutyGreeting(mentor1); -var greeting2 = shoutyGreeting(mentor2); -var greeting3 = shoutyGreeting(mentor3); -var greeting4 = shoutyGreeting(mentor4); -var greeting5 = shoutyGreeting(mentor5); - -console.log(greeting1); -console.log(greeting2); -console.log(greeting3); -console.log(greeting4); -console.log(greeting5); \ No newline at end of file +// console.log(greeting1); +// console.log(greeting2); +// console.log(greeting3); +// console.log(greeting4); +// console.log(greeting5); \ No newline at end of file From 38b2718403dee2a16d9fb94b87c9e8f8813654c6 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Sun, 17 Jan 2021 22:49:54 +0200 Subject: [PATCH 29/38] L-functions-nested-exercise1-add % --- exercises/L-functions-nested/exercise.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index 27bef3f74..e3f959d5d 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -31,8 +31,8 @@ let totalPercentageMentors = percentage(numberOfMentors, total); // return notemessage1, message2; // } -console.log(`Percentage Students: ${totalPercentageStudents}`); -console.log(`Pencentage Mentors: ${totalPercentageMentors}`); +console.log(`Percentage Students: ${totalPercentageStudents}%`); +console.log(`Pencentage Mentors: ${totalPercentageMentors}%`); From 73400017e8714c9002b06d1e2c2c852605468230 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 12:28:42 +0200 Subject: [PATCH 30/38] L-functions-nested-exercise1-add function for message Added function for message. --- exercises/L-functions-nested/exercise.js | 32 ++++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index e3f959d5d..7d0fe77ba 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -14,26 +14,36 @@ // console.log(totalPercentage); +// Function for calculating percentages. function percentage(num, total) { return Math.round((num / total) * 100); } +// Variables used for calculating the percentages. var numberOfStudents = 33; var numberOfMentors = 13; - let total = numberOfStudents + numberOfMentors; -let totalPercentageStudents = percentage(numberOfStudents, total); -let totalPercentageMentors = percentage(numberOfMentors, total); +let percentageStudents = percentage(numberOfStudents, total); +let percentageMentors = percentage(numberOfMentors, total); -// function percentageType(catagory, percent) { -// // let message1 = `Percentage Students: ${totalPercentageStudents}`; -// // let message2 = `Percentage Mentors: ${totalPercentageMentors}`; -// return notemessage1, message2; -// } +// Function for creating the message. +function percentageType(groupName, percentageOfGroupName) { + return groupName + percentageOfGroupName; +} + +// Variables for creating the output message. +let students = percentageType("Percentage Students: ", percentageStudents); +let mentors = percentageType("Percentage Mentors: ", percentageMentors); + +// This one is using the variables above to output the message. +console.log(students+"%"); +console.log(mentors+"%"); +// I need help with getting % added. + +// This one is interpolation to create the message. +console.log(`Percentage Students: ${percentageStudents}%`); +console.log(`Pencentage Mentors: ${percentageMentors}%`); -console.log(`Percentage Students: ${totalPercentageStudents}%`); -console.log(`Pencentage Mentors: ${totalPercentageMentors}%`); - From cdb6a421176307faa081196a4dcfd3e620e26f62 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 14:04:47 +0200 Subject: [PATCH 31/38] L-functions-nested-exercise2 --- exercises/L-functions-nested/exercise.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index 7d0fe77ba..d46a2c981 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -71,6 +71,28 @@ console.log(`Pencentage Mentors: ${percentageMentors}%`); // var greeting4 = shoutyGreeting(mentor4); // var greeting5 = shoutyGreeting(mentor5); +let mentorA = "daniel"; +let mentorB = "irina"; +let mentorC = "mimi"; +let mentorD = "rob"; +let mentorE = "yohannes"; + +function shoutyGreeting(mentorName) { + return "Hello " + mentorName + "."; +} + +let greet1 = shoutyGreeting(mentorA.toUpperCase()) +let greet2 = shoutyGreeting(mentorB.toUpperCase()) +let greet3 = shoutyGreeting(mentorC.toUpperCase()) +let greet4 = shoutyGreeting(mentorD.toUpperCase()) +let greet5 = shoutyGreeting(mentorE.toUpperCase()) + +console.log(greet1); +console.log(greet2); +console.log(greet3); +console.log(greet4); +console.log(greet5); + // console.log(greeting1); // console.log(greeting2); // console.log(greeting3); From 84755e7341a513cf93984390ef2a532effc32036 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 14:17:19 +0200 Subject: [PATCH 32/38] mandatory-3-function-output --- mandatory/3-function-output.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index c642f0959..2dbcc49d2 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -9,7 +9,7 @@ function getNumber() { // Add comments to explain what this function does. You're meant to use Google! // The concat() method is used to join two or more arrays. -This method does not change the existing arrays, but returns a new array, containing the values of the joined arrays. +// This method does not change the existing arrays, but returns a new array, containing the values of the joined arrays. function s(w1, w2) { return w1.concat(w2); } @@ -21,6 +21,11 @@ function concatenate(firstWord, secondWord, thirdWord) { return `${firstWord} ${secondWord} ${thirdWord}`; } +//Here, I called the last function. +let threeWords = concatenate("I", "don't know", "what to do here!"); + +// Here, I'm checking my output. +console.log(threeWords); /* =================================================== From d0a18425b9733db65c68caf91602fd2b18b46af3 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 22:24:04 +0200 Subject: [PATCH 33/38] Mandatory-4-tax-meet Denver and Andile google meets --- mandatory/4-tax.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 19345f0fc..59ea8779d 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -19,7 +19,35 @@ function calculateSalesTax(price) { Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(numberToBeTaxed) { + const taxedValue = calculateSalesTax(numberToBeTaxed); //return taxed value. + const formatValue = `£${taxedValue.toFixed(2)}`; //formatted tax value. + return formatValue; + // return `£${calculateSalesTax(numberToBeTaxed).toFixed(2)}`; + + // // let formatNumber = numberToBeTaxed.toFixed(2); + // // let finalNumber = `£ ${formatNumber}`; + // // return finalNumber; + // return `£${numberToBeTaxed.toFixed(2)}` +} + +// let price1 = calculateSalesTax(15); +// let price2 = calculateSalesTax(17.5); +// let price3 = calculateSalesTax(34); + +// let numberToBeTaxed = price1; + +// let case1 = numberToBeTaxed(price1); +// let case2 = numberToBeTaxed(price1); +// let case3 = numberToBeTaxed(price1); + +// console.log(case1); +// console.log(case2); +// console.log(case3); + +// The toFixed() method converts a number into a string, rounding to a specified number of decimals. +// var num = 5.56789; +// var n = num.toFixed(2); /* =================================================== From 2b626686ad32bee3518f2b71cfd1df01c012f420 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 22:25:15 +0200 Subject: [PATCH 34/38] L-functions-exercise-meet Denver and Andile --- exercises/L-functions-nested/exercise.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index d46a2c981..c9026feb9 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -15,14 +15,15 @@ // console.log(totalPercentage); // Function for calculating percentages. + function percentage(num, total) { return Math.round((num / total) * 100); } // Variables used for calculating the percentages. -var numberOfStudents = 33; -var numberOfMentors = 13; -let total = numberOfStudents + numberOfMentors; +const numberOfStudents = 33; +const numberOfMentors = 13; +const total = numberOfStudents + numberOfMentors; let percentageStudents = percentage(numberOfStudents, total); let percentageMentors = percentage(numberOfMentors, total); @@ -40,7 +41,8 @@ console.log(students+"%"); console.log(mentors+"%"); // I need help with getting % added. -// This one is interpolation to create the message. +This one is interpolation to create the message. + console.log(`Percentage Students: ${percentageStudents}%`); console.log(`Pencentage Mentors: ${percentageMentors}%`); From 0573375834909b18f7fb110e3b5e7e5e1cf61b13 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 22:46:32 +0200 Subject: [PATCH 35/38] 1-currency-conversion --- extra/1-currency-conversion.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index 70a2fe863..c9ecaf8b7 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,7 +5,10 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(price) { + let converting = price * 1.4; + return converting; +} /* CURRENCY FORMATTING @@ -15,7 +18,10 @@ 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(price) { + let conversion = price * (5.7 * 0.99); + return conversion +} /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. From b04fffd2ba4d803097ecfef3a359947e0f604124 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Mon, 18 Jan 2021 22:59:02 +0200 Subject: [PATCH 36/38] extra-2-piping --- extra/2-piping.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/2-piping.js b/extra/2-piping.js index 067dd0f5b..fb677f1bf 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,16 +16,16 @@ the final result to the variable goodCode */ -function add() { - +function add(number1, number2) { + return number1 + number2; } -function multiply() { - +function multiply(number1, number2) { + return number1 * number2; } -function format() { - +function format(numbers) { + let formatNumber = `"£"${number}`; } const startingValue = 2 From e363d534b9e9a718520de1e8feef41401fe761e3 Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Tue, 19 Jan 2021 21:48:13 +0200 Subject: [PATCH 37/38] mandatory-4-tax-cleanup --- mandatory/4-tax.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 59ea8779d..852da204c 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -23,32 +23,7 @@ function addTaxAndFormatCurrency(numberToBeTaxed) { const taxedValue = calculateSalesTax(numberToBeTaxed); //return taxed value. const formatValue = `£${taxedValue.toFixed(2)}`; //formatted tax value. return formatValue; - // return `£${calculateSalesTax(numberToBeTaxed).toFixed(2)}`; - - // // let formatNumber = numberToBeTaxed.toFixed(2); - // // let finalNumber = `£ ${formatNumber}`; - // // return finalNumber; - // return `£${numberToBeTaxed.toFixed(2)}` } - -// let price1 = calculateSalesTax(15); -// let price2 = calculateSalesTax(17.5); -// let price3 = calculateSalesTax(34); - -// let numberToBeTaxed = price1; - -// let case1 = numberToBeTaxed(price1); -// let case2 = numberToBeTaxed(price1); -// let case3 = numberToBeTaxed(price1); - -// console.log(case1); -// console.log(case2); -// console.log(case3); - -// The toFixed() method converts a number into a string, rounding to a specified number of decimals. -// var num = 5.56789; -// var n = num.toFixed(2); - /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From 8e4933178eb53d0be86f29f37cce361b7827c8af Mon Sep 17 00:00:00 2001 From: DouglasVDM <74470226+DouglasVDM@users.noreply.github.com> Date: Tue, 19 Jan 2021 22:36:45 +0200 Subject: [PATCH 38/38] extra-2-piping --- extra/2-piping.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/extra/2-piping.js b/extra/2-piping.js index fb677f1bf..08dec3dc2 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -26,16 +26,21 @@ function multiply(number1, number2) { function format(numbers) { let formatNumber = `"£"${number}`; + return formatNumber; } -const startingValue = 2 +const startingValue = format(multiply((add(startingValue, 10), 2))); // Why can this code be seen as bad practice? Comment your answer. -let badCode = +let badCode = startingValue; //When my code breaks, it will be difficult to see where I went wrong. Other coders will find my code difficult to read. /* BETTER PRACTICE */ -let goodCode = +let adding = add(startingValue, 10); //used add function. +let multiplying = multiply(`${adding}`, 2); //used multiply function. +let formatting = format(`${multiplying}`); //used formatting function. + +let goodCode = formatting; //Myself and Other coders can see clearly how I get to my result. /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working.