From f93bf2cac2c93fd8449526fdefe942af5530da55 Mon Sep 17 00:00:00 2001 From: Mohammadrezanafar Date: Thu, 25 Aug 2022 04:03:45 +0100 Subject: [PATCH 1/4] Change and solve mandatory tasks. --- mandatory/1-syntax-errors.js | 11 +++++++---- mandatory/2-logic-error.js | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..ca00ee722 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,15 +1,18 @@ // 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 getTotal(a, b) { - total = a ++ b; + return `Hello, my name is ${name} and I am ${age} + years old`; +function getTotal(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..2963cf816 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,7 +1,7 @@ // The syntax for this function is valid but it has an error, find it and fix it. function trimWord(word) { - return wordtrim(); + return wordtrim(trimWord); } function getStringLength(word) { @@ -10,7 +10,7 @@ function getStringLength(word) { function multiply(a, b, c) { a * b * c; - return; + return;a ,b ,c } /* From ca11816c3b3c896ff5e24bc46ee8c8215a0b4fa4 Mon Sep 17 00:00:00 2001 From: Mohammadrezanafar Date: Fri, 26 Aug 2022 12:10:15 +0100 Subject: [PATCH 2/4] manatory task Signed-off-by: Mohammadrezanafar --- mandatory/1-syntax-errors.js | 18 ++++++++---------- mandatory/2-logic-error.js | 6 +++--- mandatory/3-function-output.js | 10 ++++++++-- mandatory/4-tax.js | 9 +++++++-- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index ca00ee722..79ee603f6 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,19 +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; - - return "The total is total"; + total = a + b; + + return "The total is" + total; } /* @@ -30,7 +28,7 @@ To run the tests for just this one file, type `npm test -- --testPathPattern 1-s test("addNumbers adds numbers correctly", () => { expect(addNumbers(3, 4, 6)).toEqual(13); -}); +}); test("introduceMe function returns the correct string", () => { expect(introduceMe("Sonjide", 27)).toEqual( diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 2963cf816..4d6389e6a 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,7 +1,7 @@ // The syntax for this function is valid but it has an error, find it and fix it. function trimWord(word) { - return wordtrim(trimWord); + return word.Trim(); } function getStringLength(word) { @@ -9,8 +9,8 @@ function getStringLength(word) { } function multiply(a, b, c) { - a * b * c; - return;a ,b ,c + + return a *b *c; } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..717998f45 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,18 +1,24 @@ // Add comments to explain what this function does. You're meant to use Google! +//When you want to round numbers in javascript to its nearest integer, you need to use the Math.round () function. Here’s the syntax of the function: Math.round (value) Parameters: the number to be rounded to its nearest integer. Returns: Result after rounding the number passed as a parameter to the function passed as parameter. function getRandomNumber() { return Math.random() * 10; } // Add comments to explain what this function does. You're meant to use Google! +//Twice join of two strings in JavaScript Javascript Web Development Front End Technology Object Oriented Programming We are required to write a JavaScript function that takes in two strings; creates and returns a new string with first 2 words of first string, next two words of second string, then first, then second and so on. 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); } - + // Look at the test case below to understand what this function is expected to return. + +const firstWord ="I"; +const secondWord ="like"; +const thirdWord ="pizza"; /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..bee69f4f3 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,10 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} +function calculateSalesTax(productPrice) { + let productTax= (productPrice*20) /100 + productPrice; + return productTax; +} /* CURRENCY FORMATTING @@ -17,7 +20,9 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(productPrice) { + return price="£"+calculateSalesTax(productPrice).toFixed(2); +} /* =================================================== From 5116e5a49829b8265288b1625013cfb9c53c0c48 Mon Sep 17 00:00:00 2001 From: Mohammadrezanafar Date: Fri, 26 Aug 2022 15:12:37 +0100 Subject: [PATCH 3/4] exercise solved Signed-off-by: Mohammadrezanafar --- exercises/C-variables/exercise.js | 4 ++++ exercises/D-strings/exercise.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..c6e6c5833 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,7 @@ // 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 index 2cffa6a81..aa3de6048 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` +var message ="this is string"; -console.log(message); +var messageType = typeof message; +console.log (message); +console.log (messageType); From 77862d96dcc4e876b71843815729c3bf9c5479d5 Mon Sep 17 00:00:00 2001 From: Mohammadrezanafar Date: Sat, 27 Aug 2022 00:59:18 +0100 Subject: [PATCH 4/4] complete exercise Signed-off-by: Mohammadrezanafar --- exercises/E-strings-concatenation/exercise.js | 4 +++- exercises/F-strings-methods/exercise.js | 5 +++-- exercises/F-strings-methods/exercise2.js | 6 +++--- exercises/G-numbers/exercise.js | 4 ++++ exercises/I-floats/exercise.js | 7 +++++++ 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 | 6 ++++-- exercises/K-functions-parameters/exercise5.js | 4 +++- exercises/L-functions-nested/exercise.js | 20 +++++++++++++++++++ 13 files changed, 58 insertions(+), 14 deletions(-) diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..95efa8ea2 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` - +var messageStart = "Hello my name is "; +var name ="Mamad"; +var message = messageStart + name ; console.log(message); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..03f827c15 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); +var name ="Mohammadreza"; +var nameLength = name.length; +console.log(nameLength); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..5341ba82d 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,3 @@ -const name = " Daniel "; - -console.log(message); +const name = " Mohammadreza "; +var nameLowerCase = name.toLowerCase(); +console.log(nameLowerCase); diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..aff8994d5 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,5 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` + var NumberofStudents = 15; + var NumberOfMentors = 8; + totalNumberOfStudentsAndMentors= ( NumberofStudents + NumberOfMentors); + console.log ( totalNumberOfStudentsAndMentors); \ No newline at end of file diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..5dad33e4d 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,9 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var wholeNumber = numberOfStudents + numberOfMentors; + +var studentPercentage = Math.round(numberOfStudents*100/wholeNumber); +console.log("Percentage students: " + studentPercentage + "%"); + +var mentorsPercentage = Math.round(numberOfMentors*100/wholeNumber); +console.log("Percentage mentors: " + mentorsPercentage + "%"); \ No newline at end of file diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..cc1b9a091 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,7 @@ 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..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..30680250f 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(a,b) { + return a * b;// 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..58ac28afa 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,5 +1,7 @@ // Declare your function first - +function divide(a,b){ + return a / b; +} var result = divide(3, 4); console.log(result); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..3c4fb21e4 100644 --- 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 " Hello, My name is " + (name); +} var greeting = createGreeting("Daniel"); console.log(greeting); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..a5696c75e 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(a , b){ + return a + b; +} // Call the function and assign to a variable `sum` - +var sum = 13+124; console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..24d4a4e6f 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); console.log(greeting); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..406a0351a 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 upperCaseName (mentor){ +return mentor.toUpperCase() +} + +function greeting(Hello ,name){ +const mentor = upperCaseName(name) +return Hello.concat( mentor) +} + +const Name1 = greeting("Hello " ,mentor1); +const Name2 = greeting("Hello " ,mentor2); +const Name3 = greeting("Hello " ,mentor3); +const Name4 = greeting("Hello " ,mentor4); +const Name5 = greeting("Hello " ,mentor5); + +console.log (Name1); +console.log (Name2); +console.log (Name3); +console.log (Name4); +console.log (Name5); \ No newline at end of file