From 90f2438969890623012f0892c28a7f819d070b2c Mon Sep 17 00:00:00 2001 From: SomayehKarimi <72705126+DibaKarimi@users.noreply.github.com> Date: Fri, 22 Jan 2021 12:39:33 +0000 Subject: [PATCH] Done all assignment --- exercises/B-hello-world/exercise.js | 5 ++++ exercises/C-variables/exercise.js | 5 ++-- exercises/D-strings/exercise.js | 5 ++-- exercises/E-strings-concatenation/exercise.js | 7 +++--- exercises/F-strings-methods/exercise.js | 5 ++-- exercises/F-strings-methods/exercise2.js | 6 +++-- exercises/G-numbers/README.md | 2 +- exercises/G-numbers/exercise.js | 10 +++++++- exercises/I-floats/exercise.js | 10 ++++++++ exercises/J-functions/exercise.js | 9 ++++--- exercises/J-functions/exercise2.js | 5 ++-- exercises/K-functions-parameters/exercise.js | 6 ++--- exercises/K-functions-parameters/exercise2.js | 5 +++- exercises/K-functions-parameters/exercise3.js | 5 +++- exercises/K-functions-parameters/exercise4.js | 7 ++++-- exercises/K-functions-parameters/exercise5.js | 7 ++++-- exercises/L-functions-nested/exercise.js | 24 +++++++++++++++---- exercises/L-functions-nested/exercise2.js | 23 ++++++++++++++++++ extra/1-currency-conversion.js | 8 +++++-- extra/2-piping.js | 19 ++++++++------- mandatory/1-syntax-errors.js | 11 +++++---- mandatory/2-logic-error.js | 7 +++--- mandatory/3-function-output.js | 7 +++--- mandatory/4-tax.js | 11 ++++++--- 24 files changed, 149 insertions(+), 60 deletions(-) create mode 100644 exercises/L-functions-nested/exercise2.js diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..d57c01219 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,6 @@ console.log("Hello world"); +console.log("Hello world , I am learning javaScript"); +console.log("12"); +console.log(12); +console.log(12 + 45); +console.log("12" + "434"); diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..98599ea9a 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,4 @@ -// 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..0bebf015e 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,4 @@ -// Start by creating a variable `message` - +var message = "This is a string"; +var messageType = typeof message; console.log(message); +console.log(messageType); \ No newline at end of file diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..b30797957 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,4 @@ -// Start by creating a variable `message` - -console.log(message); +var greetingStart = "Hello, my name is "; +var name = "Somayeh" +var message = greetingStart + name; +console.log(message); // Log "Hello, my name is Somayeh" diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..e1a49c8ac 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` - +var name = "Somayeh"; +var nameLength = name.length; +var message =`My name is ${name} and my name is ${nameLength} characters long`; console.log(message); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..33df9b99e 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ -const name = " Daniel "; - +let name = " Somayeh "; +name = name.trim(); +const nameLength = name.length; +var message =`My name is ${name} and my name is ${nameLength} characters long`; console.log(message); diff --git a/exercises/G-numbers/README.md b/exercises/G-numbers/README.md index 4c6f45a41..0612963fb 100644 --- a/exercises/G-numbers/README.md +++ b/exercises/G-numbers/README.md @@ -25,5 +25,5 @@ var difference = 10 - 2; // 8 ``` Number of students: 15 Number of mentors: 8 -Total numnber of students and mentors: 23 +Total number of students and mentors: 23 ``` diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..69e630ad5 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; +var numberOfMentors = 8; +var totalNumbers = numberOfStudents + numberOfMentors; +var message = "Number of students: " + numberOfStudents; +console.log(message); +message = "Number of mentors: " + numberOfMentors; +console.log(message); +message = "Total number of students and mentors: " + totalNumbers; +console.log(message); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..b748f14ea 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,12 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var percentageOfStudent = Math.round( + (numberOfStudents / (numberOfStudents + numberOfMentors)) * 100 +); +var percentageOfMentors = Math.round( + (numberOfMentors / (numberOfStudents + numberOfMentors)) * 100 +); +var message = "Percentage students: " + percentageOfStudent + "%"; +console.log(message); +message = "Percentage mentors: " + percentageOfMentors + "%"; +console.log(message); diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..ce576c2a4 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,10 @@ +// Halves the number function halve(number) { - // complete the function here + return number / 2; } - var result = halve(12); - +console.log(result); +result = halve(900); +console.log(result); +result = halve(322); console.log(result); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..20ff4ed1b 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,7 +1,6 @@ +// Triples the number function triple(number) { - // complete function here + return number * 3; } - var result = triple(12); - console.log(result); diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..095441428 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 +// Multiplies two numbers together +function multiply(num1, num2) { + return num1 * num2; } // 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..24c14f6ab 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,4 +1,7 @@ -// Declare your function first +// Divides two numbers +function divide(num1, num2) { + return num1 / num2; +} var result = divide(3, 4); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..7bd9c9459 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,4 +1,7 @@ -// Write your function here +// creating a greeting by the name +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..d121d8077 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,8 @@ -// Declare your function first +// adds two numbers +function add(num1, num2) { + return num1 + num2; +} -// Call the function and assign to a variable `sum` +var 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..1bd7a38c5 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,8 @@ -// Declare your function here - +// Create a greeting message by name and age +function createLongGreeting(name, age) { + var message = `Hello, my name is ${name} and I'm ${age} years old`; + return message; +} 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..404105eb1 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,5 +1,19 @@ -var mentor1 = "Daniel"; -var mentor2 = "Irina"; -var mentor3 = "Mimi"; -var mentor4 = "Rob"; -var mentor5 = "Yohannes"; +var numberOfStudents = 15; +var numberOfMentors = 8; +// Calculates the percentage +function getPercentage(numberOfPerson, totalNumbers) { + var percentage = Math.round((numberOfPerson / totalNumbers) * 100); + return percentage; +} +// Create the message +function createMessage(person, numberOfPerson, totalNumbers) { + var percentage = getPercentage(numberOfPerson, totalNumbers); + var message = `Percentage ${person}: ${percentage} %`; + return message; +} + +var totalNumbers = numberOfStudents + numberOfMentors; +var result = createMessage("students", numberOfStudents, totalNumbers); +console.log(result); +result = createMessage("mentors", numberOfMentors, totalNumbers); +console.log(result); diff --git a/exercises/L-functions-nested/exercise2.js b/exercises/L-functions-nested/exercise2.js new file mode 100644 index 000000000..0cb695d05 --- /dev/null +++ b/exercises/L-functions-nested/exercise2.js @@ -0,0 +1,23 @@ +var mentor1 = "Daniel"; +var mentor2 = "Irina"; +var mentor3 = "Mimi"; +var mentor4 = "Rob"; +var mentor5 = "Yohannes"; +function upperCase(name) { + return name.toUpperCase(); +} +function createGreeting(name) { + var upName = upperCase(name); + var message = "HELLO " + upName; + return message; +} +var message = createGreeting(mentor1); +console.log(message); +message = createGreeting(mentor2); + console.log(message); +message = createGreeting(mentor3); + console.log(message); +message = createGreeting(mentor4); + console.log(message); +message = createGreeting(mentor5); +console.log(message); diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index 70a2fe863..7442ee792 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,7 +5,9 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(price) { + return price * 1.4; +} /* CURRENCY FORMATTING @@ -15,7 +17,9 @@ 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) { + return price * 0.99 * 5.7; +} /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. diff --git a/extra/2-piping.js b/extra/2-piping.js index 067dd0f5b..6956f1464 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,26 +16,27 @@ the final result to the variable goodCode */ -function add() { - +function add(num1,num2) { + return num1 + num2; } -function multiply() { - +function multiply(num1,num2) { + return num1 * num2; } -function format() { - +function format(price) { + return "£" + price; } const startingValue = 2 // Why can this code be seen as bad practice? Comment your answer. -let badCode = +let badCode = format(multiply(add(startingValue, 10), 2)); /* BETTER PRACTICE */ - -let goodCode = +let sum = add(startingValue, 10); +let multiplies = multiply(sum, 2); +let goodCode = format(multiplies); /* ======= TESTS - DO NOT MODIFY ===== There are some Tests in this file that will help you work out if your code is working. diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 0a21afd1b..2fd0bce92 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 } /* diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 3c578ad87..1f1245b39 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; } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index c9221a200..2d4deab5d 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! +// returns a random number between 0 , and 10 : function getNumber() { return Math.random() * 10; } -// Add comments to explain what this function does. You're meant to use Google! +// joins two strings function s(w1, w2) { return w1.concat(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; } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index c9e41c691..fa726654d 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 @@ -17,8 +19,11 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} - +function addTaxAndFormatCurrency(price) { + var totalPrice = calculateSalesTax(price); + var result="£" + totalPrice.toFixed(2); + return result; +} /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====