From 7445dcc35a6f4919fc012fe0f6cebdb3b9c6b7fc Mon Sep 17 00:00:00 2001 From: mimi Date: Thu, 23 Sep 2021 18:28:08 +0100 Subject: [PATCH] complited exercice and madetory --- exercises/C-variables/exercise.js | 2 +- exercises/D-strings/exercise.js | 4 +++- exercises/E-strings-concatenation/exercise.js | 6 ++++-- exercises/F-strings-methods/exercise.js | 5 +++-- exercises/F-strings-methods/exercise2.js | 5 +++-- exercises/G-numbers/exercise.js | 4 ++++ exercises/I-floats/exercise.js | 6 ++++++ exercises/J-functions/exercise.js | 2 +- exercises/J-functions/exercise2.js | 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 | 8 +++++--- exercises/K-functions-parameters/exercise5.js | 6 ++++-- exercises/L-functions-nested/exercise.js | 20 +++++++++++++++++++ mandatory/1-syntax-errors.js | 6 +++--- mandatory/2-logic-error.js | 8 ++++---- mandatory/3-function-output.js | 7 +++---- mandatory/4-tax.js | 16 ++++++++++++--- 19 files changed, 86 insertions(+), 33 deletions(-) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..be528d2d0 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,3 @@ // Start by creating a variable `greeting` - +let greeting = "Hello world"; console.log(greeting); diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..e15be9a71 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` - +let message = false; +let dataType =typeof message; console.log(message); +console.log(dataType); \ No newline at end of file diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..046e02db9 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` - -console.log(message); +let message ="Hello my name is "; +let myName = "mimi"; +let join = message+myName; +console.log(join); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..75c77d03f 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` - -console.log(message); +let myName ="mimi"; +let myNameLength =myName.length; +console.log(myNameLength); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..340a8db16 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,4 @@ -const name = " Daniel "; +const myName = " Daniel "; +const nameTrim = myName.trim(); -console.log(message); +console.log(nameTrim); diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..e5e5a61d5 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,5 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +const numberOfStudents = 8; +const numberOfMentors = 5; +const total = numberOfStudents+numberOfMentors; +console.log(total); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..a081bbd73 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,8 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var total = numberOfStudents+numberOfMentors; +console.log(total); + +var mentorPercent = numberOfMentors/total*100; +var mentorRounded = Math.round(mentorPercent); +console.log(mentorRounded); \ No newline at end of file diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..44d77b1fb 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,5 @@ function halve(number) { - // complete the function here + return number/2; // complete the function here } var result = halve(12); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..1ad5e2b92 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; // complete function here } var result = triple(12); diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..e206a1ab5 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..5698fec7d 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..a80f58265 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 "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..f083c9fa3 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,7 @@ -// Declare your function first +function sum(num1,num2){ + return num1+num2; +} -// Call the function and assign to a variable `sum` +let addition = sum(5,8); -console.log(sum); +console.log(addition); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..4966c0895 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,7 @@ -// Declare your function here +function createLongGreeting(name,age){ +return "hello my name is " + name + " and i am " + age + " years old "; +} -const greeting = createLongGreeting("Daniel", 30); +const greeting = createLongGreeting("mimi", 27); console.log(greeting); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..a7a53a9f6 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,23 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + + + + + +function loudGreeting(mentor){ + return "HELLO " + mentor.toUpperCase(); + + +} +console.log(loudGreeting(mentor1)); +console.log(loudGreeting(mentor2)); +console.log(loudGreeting(mentor3)); +console.log(loudGreeting(mentor4)); +console.log(loudGreeting(mentor5)); + + +// - In `exercise.js` you have been provided with the names of some mentors. Write a program that logs a shouty greeting to each one. +// - Your program should include a function that spells their name in uppercase, and a function that creates a shouty greeting. +// - Log each greeting to the console. diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..beeb2936a 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,14 +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"; + 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"; } diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..78785cb5a 100644 --- a/mandatory/2-logic-error.js +++ b/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.wordtrim(); } 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..9ea2016fb 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,16 +1,15 @@ // Add comments to explain what this function does. You're meant to use Google! function getRandomNumber() { return Math.random() * 10; -} +}//function getRandomNumber uses the method Math.random to get a random number and then *10 // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { return word1.concat(word2); -} +}// function combine2Word uses the .concat method 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; } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..26daf4dbe 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,8 +5,10 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} - +function calculateSalesTax(price) { + return price + (price*0.2); +} +//return price + (price*0.2)inside the round bracket we are calculating 20% of the price and we have add it to the original price /* CURRENCY FORMATTING =================== @@ -17,7 +19,15 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(price) { +const taxInclude = calculateSalesTax(price); +const decimalPlaces = taxInclude.toFixed(2); +const format = "£" + decimalPlaces; +return format; +} + + + /* ===================================================