From eba925b728d33f3b359b8cb27b13031e61ce2606 Mon Sep 17 00:00:00 2001 From: SaharNaderi <108987674+SaharNaderi@users.noreply.github.com> Date: Wed, 23 Nov 2022 20:16:42 +0000 Subject: [PATCH 1/2] final week 1 --- exercises/B-hello-world/exercise.js | 18 ++++++++++++++++++ exercises/C-variables/exercise.js | 10 ++++++++++ exercises/D-strings/exercise.js | 6 ++++++ exercises/E-strings-concatenation/exercise.js | 7 ++++++- exercises/F-strings-methods/exercise.js | 9 ++++++++- exercises/F-strings-methods/exercise2.js | 11 +++++++++-- exercises/G-numbers/exercise.js | 8 ++++++++ exercises/I-floats/exercise.js | 8 ++++++++ exercises/J-functions/exercise.js | 3 ++- 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 | 5 ++++- exercises/K-functions-parameters/exercise4.js | 8 ++++++-- exercises/K-functions-parameters/exercise5.js | 5 +++-- exercises/L-functions-nested/exercise.js | 17 +++++++++++++++++ mandatory/1-syntax-errors.js | 12 ++++++------ mandatory/2-logic-error.js | 8 ++++---- mandatory/3-function-output.js | 3 ++- mandatory/4-tax.js | 7 +++++++ 20 files changed, 130 insertions(+), 25 deletions(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..228dba338 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,19 @@ console.log("Hello world"); +console.log("Hello world"); +console.log("Sahar") +console.log("12") +console.log(sahar); +console.log("sahar"); +console.log("nad"); +console.log("Hello world"); +console.log("1111111"); +var greeting = "Hello world"; +console.log(greeting); +var greeting = "Hello world"; + +console.log(greeting); + +var greeting = "Hello world"; + +console.log(greeting); + diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..780641783 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,13 @@ // Start by creating a variable `greeting` +var greeting = "Hello world"; console.log(greeting); +var greeting = "Hello world"; + +console.log(greeting); +var greeting = "Hello world"; + +console.log(greeting); + + + diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..93538ac0c 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,9 @@ // Start by creating a variable `message` +var message = "This is a string"; console.log(message); +var messageType = typeof message; + +console.log(messageType); + + diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..5301791b5 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,8 @@ // Start by creating a variable `message` -console.log(message); +var greetingStar = "Hello my name is "; +var name = "Sahar"; + +var greeting = greetingStar+ name ; +console.log(greeting); + diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..31f014ba0 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,10 @@ // Start by creating a variable `message` -console.log(message); +var phraseStart = "My name is Sahar and my name is "; +var name = "Sahar"; +var phraseLenght = name.length; +var restPhrase = " characters long" +var phrase = phraseStart + phraseLenght + restPhrase ; +console.log(phrase); + + diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..3802f789b 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,10 @@ -const name = " Daniel "; +var phraseStart = " My name is Sahar and my name is "; +var name = "Sahar"; +var phraseLenght = name.length; +var restPhrase = " "+"characters long. " +var phrase = " "+ phraseLenght + restPhrase ; +var result = phraseStart.trim() + phrase; + +console.log(result); + -console.log(message); diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..4f5a66cf2 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,9 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +var numberOfStudents = 15; +console.log(numberOfStudents); + +var numberOfMentors = 8 ; +console.log(numberOfMentors); + +var sum = numberOfStudents + numberOfMentors ; +console.log(sum); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..76ff7537c 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,10 @@ var numberOfStudents = 15; var numberOfMentors = 8; + +var total = numberOfMentors + numberOfStudents; + +var percentageOfStudents = (numberOfStudents*100)/total; +var percentageOfMentors =(numberOfMentors*100)/total; + +console.log(`Precentage students : ${Math.round(percentageOfStudents)}%`); +console.log(`Precentage mentors : ${Math.round(percentageOfMentors)}%`); diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..4aa320dfa 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..07143e65f 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/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..c83a8d23e 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 ; } // 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..c645b34e4 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 (a,b){ +return a / b ; +} var result = divide(3, 4); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..b8e28e72c 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/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/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..ff55d2d58 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,9 @@ -// Declare your function first +function add (a,b) { + return a+b ; -// Call the function and assign to a variable `sum` + +} + +var sum = add(124,13); console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..68d5b42fb 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,6 @@ -// Declare your function here - +function createLongGreeting (a,b){ + return "Hello,my name is "+ a + "and I am "+ b + " 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..e01454a4e 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,20 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function convertToUpperCase (name){ + return name.toUpperCase() +} +function shoutyGreeting (mentor){ + let upperCase=convertToUpperCase(mentor); + let greeting="Hello "+upperCase + return greeting; + } + + +console.log(shoutyGreeting(mentor1)); +console.log(shoutyGreeting(mentor2)); +console.log(shoutyGreeting(mentor3)); +console.log(shoutyGreeting(mentor4)); +console.log(shoutyGreeting(mentor5)); + diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..ad768e9bb 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,18 +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 introduceMe(name, age){ + return "Hello, my name is "+ name +" and I am "+age +" years old"; +} function getTotal(a, b) { - total = a ++ b; + let total = a + b; - return "The total is total"; + return "The total is " +total; } - /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..c52f95244 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.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..76a629d05 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -5,12 +5,13 @@ function getRandomNumber() { // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { - return word1.concat(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) } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..95be37b5c 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -7,6 +7,9 @@ function calculateSalesTax() {} +function calculateSalesTax(productPrice) { +return productPrice + (0.2 * productPrice) +} /* CURRENCY FORMATTING =================== @@ -18,6 +21,10 @@ function calculateSalesTax() {} */ function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(productPrice) { + + return "£"+(calculateSalesTax(productPrice)).toFixed(2) +} /* =================================================== From 6e99c2eb05a0fda027afb3d56ed9e059d435c5bf Mon Sep 17 00:00:00 2001 From: SaharNaderi <108987674+SaharNaderi@users.noreply.github.com> Date: Wed, 23 Nov 2022 21:09:52 +0000 Subject: [PATCH 2/2] fived test manndatory --- mandatory/2-logic-error.js | 2 +- mandatory/3-function-output.js | 2 +- mandatory/4-tax.js | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index c52f95244..7832bfdf7 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -5,7 +5,7 @@ function trimWord(word) { } function getStringLength(word) { - return "word".length; + return word.length; } function multiply(a, b, c) { diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 76a629d05..62e090bf3 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -11,7 +11,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) + return firstWord.concat(" ",secondWord," ",thirdWord) } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 95be37b5c..f5972c519 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,8 +5,6 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} - function calculateSalesTax(productPrice) { return productPrice + (0.2 * productPrice) } @@ -20,7 +18,6 @@ return productPrice + (0.2 * productPrice) Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} function addTaxAndFormatCurrency(productPrice) { return "£"+(calculateSalesTax(productPrice)).toFixed(2)