From 74813fa245c87dcca293cb41a0a3e06d30da4cb7 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:45:37 +0100 Subject: [PATCH 01/22] complete task B --- exercises/B-hello-world/exercise.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..b82d6bd0a 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,3 @@ console.log("Hello world"); +console.log('Hi Ahmed '+'Mohmed'); +console.log(' A B C ') \ No newline at end of file From 449d1aa420602ffcf44cbb3e4f4952860406f280 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:50:33 +0100 Subject: [PATCH 02/22] complete task C --- exercises/C-variables/exercise.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..32093e01b 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 Wolrd Welcom Ahmed"; console.log(greeting); From 311cdf2f635cb5aad6adbb318e2b74edb9bce9b6 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 09:53:37 +0100 Subject: [PATCH 03/22] complete task D --- exercises/D-strings/exercise.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..d92607aa8 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,4 @@ // Start by creating a variable `message` +let message="string "; -console.log(message); +console.log(message+typeof(message)); From 63b2556c470294456d19e048544c7042ed5baa60 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:06:37 +0100 Subject: [PATCH 04/22] complete task E --- exercises/E-strings-concatenation/exercise.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..83d66493a 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` - +let fristName="Ahmed "; +let lastName=" Mohamed"; +message=fristName+lastName; console.log(message); From bc6e0fc5d8b134cf44188df1baceebd2a6c9467d Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:17:58 +0100 Subject: [PATCH 05/22] complete task F --- exercises/F-strings-methods/exercise.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..85b2d74a6 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` +let message =`My name is Ahmed and my cheregter numer is `; +let name2="Ahmed"; +let numberCherctor=name2.length; +console.log(message+numberCherctor); -console.log(message); From c29a8753cb9b5a08c621c2fb9cab44d3ad59bd14 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:34:30 +0100 Subject: [PATCH 06/22] complete task G --- exercises/G-numbers/exercise.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..623f86863 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,5 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +let numberOfStudents=30; +let numberOfMentors=15; +let totalNumberofcyf=numberOfStudents+numberOfMentors; +console.log("the number of student is "+numberOfStudents+" and the number of montor is "+numberOfMentors+" totel of montor and studant is "+totalNumberofcyf); From 3cb82857b7bcc526779d8127985467398db1b068 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:59:31 +0100 Subject: [PATCH 07/22] complete task F 2 --- exercises/F-strings-methods/exercise2.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..f35cbf23c 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ -const name = " Daniel "; +const dname = " Daniel "; +let nameof=dname.trim(); +console.log(nameof); +console.log(nameof.length); -console.log(message); From a3c2308d7829cd645e2950067eed1cf0e5048a07 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 11:36:55 +0100 Subject: [PATCH 08/22] compete task I --- exercises/I-floats/exercise.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..227cb4000 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,6 @@ var numberOfStudents = 15; var numberOfMentors = 8; +let studentPerc = Math.round(numberOfMentors / numberOfStudents*100); +let mentorPerc = Math.abs(studentPerc-100); +console.log("Percent of student :"+" "+studentPerc+"%"); +console.log("Percent of mentor :" + " " + mentorPerc + "%"); \ No newline at end of file From e008e11d8acd11cc306e6cce43040a6a81c5b304 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 11:37:20 +0100 Subject: [PATCH 09/22] Update exercise.js --- exercises/I-floats/exercise.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index 227cb4000..653e6797c 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -3,4 +3,4 @@ var numberOfMentors = 8; let studentPerc = Math.round(numberOfMentors / numberOfStudents*100); let mentorPerc = Math.abs(studentPerc-100); console.log("Percent of student :"+" "+studentPerc+"%"); -console.log("Percent of mentor :" + " " + mentorPerc + "%"); \ No newline at end of file +console.log("Percent of mentor :" + " " + mentorPerc + "%"); From 96f9797718135cad173e12837b3b8f972113d632 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 11:40:39 +0100 Subject: [PATCH 10/22] complete task J --- exercises/J-functions/exercise.js | 1 + exercises/J-functions/exercise2.js | 1 + 2 files changed, 2 insertions(+) diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..e9ba2f0ef 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..6d216ffc6 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,5 +1,6 @@ function triple(number) { // complete function here + return number*3; } var result = triple(12); From f10f75dd0ea8c1fd5dd2d1cf9149c3b0ca15c806 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 11:59:11 +0100 Subject: [PATCH 11/22] complete task K --- exercises/K-functions-parameters/exercise.js | 3 ++- exercises/K-functions-parameters/exercise2.js | 4 +++- exercises/K-functions-parameters/exercise3.js | 5 ++++- exercises/K-functions-parameters/exercise4.js | 5 ++++- exercises/K-functions-parameters/exercise5.js | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..50b7e50ca 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,5 +1,6 @@ // Complete the function so that it takes input parameters -function multiply() { +function multiply(a,b) { + return a*b; // Calculate the result of the function and return it } diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js index db7a8904b..e366146b2 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..994e80e9b 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,8 @@ // Write your function here - +function createGreeting(a) +{ + return "Hello, my name is "+a; +} 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..1ed807457 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,8 @@ // Declare your function first // Call the function and assign to a variable `sum` - +function addnumber(a,b){ + return a+b; +} +let sum=addnumber(13,124) console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..c35eee5d8 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,8 @@ // Declare your function here - +function createLongGreeting(name,age){ + // console.log(`Hello, my $[name] is and I'm $[age] years old`); + return "Hello, my name is " + name+" i'm "+age+"years old"; +} const greeting = createLongGreeting("Daniel", 30); console.log(greeting); From a0586e499e5c9ff03e8213e35c89f013d8a12f26 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 12:05:41 +0100 Subject: [PATCH 12/22] complete task L --- exercises/L-functions-nested/exercise.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..5884683a7 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,11 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; +function hello(a){ + return "Hello "+a; +} +console.log(hello(mentor1)); +console.log(hello(mentor2)); +console.log(hello(mentor3)); +console.log(hello(mentor4)); +console.log(hello(mentor5)); From 7fb99e1db207b410373368179008669993fa0b87 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 14:51:21 +0100 Subject: [PATCH 13/22] Complete task 1-syntax --- mandatory/1-syntax-errors.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..cc8af6435 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) { - return 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 "The total is total"; +{ + return "Hello, my name is " + name + "and I am " + age + "years old"; } +function getTotal(a,b) { + let total = a + b; + return "The total is "+ total; +} /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From 20ae565ef87aaaba024f0c4b3750507eb0be56f0 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 15:06:51 +0100 Subject: [PATCH 14/22] complete task 2-logic --- mandatory/2-logic-error.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..d0ae092dd 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,19 @@ // 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(); -} +function getStringLength (word) { + + return word.length; +} +console.log(getStringLength("hi ahmed")); function multiply(a, b, c) { - a * b * c; - return; + + return a * b * c; } /* From 2845da53ec32117407caa9f34231b66baf688cc3 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 15:14:44 +0100 Subject: [PATCH 15/22] complete task 2-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 5a953ba60..4e47258a4 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,18 +1,23 @@ // Add comments to explain what this function does. You're meant to use Google! + function getRandomNumber() { + // we use Random method to get a random number after that multplie this number 10 return Math.random() * 10; } // Add comments to explain what this function does. You're meant to use Google! + function combine2Words(word1, word2) { + //The concat() method joins two or more strings. return word1.concat(word2); } function concatenate(firstWord, secondWord, thirdWord) { + return 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. } - +console.log(concatenate("ahmed","mohamed",5)); /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From 97dc3c59b92d1ff32fe5209be62f2b0c3ba36984 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 15:43:39 +0100 Subject: [PATCH 16/22] complete task 4-tax --- mandatory/4-tax.js | 48 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..d8ac00e4a 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(price) { + let salesTax=(price*20)/100; +return price+salesTax; +} /* CURRENCY FORMATTING @@ -17,8 +20,11 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} - +function addTaxAndFormatCurrency(tax) { + return "£"+calculateSalesTax(tax).toFixed(2); +} +console.log(calculateSalesTax(17.5)); +console.log(addTaxAndFormatCurrency(15)); // expect to £18 /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== @@ -30,26 +36,26 @@ To run the tests for just this one file, type `npm test -- --testPathPattern 4-t =================================================== */ -test("calculateSalesTax for £15", () => { - expect(calculateSalesTax(15)).toEqual(18); -}); +// test("calculateSalesTax for £15", () => { +// expect(calculateSalesTax(15)).toEqual(18); +// }); -test("calculateSalesTax for £17.50", () => { - expect(calculateSalesTax(17.5)).toEqual(21); -}); +// test("calculateSalesTax for £17.50", () => { +// expect(calculateSalesTax(17.5)).toEqual(21); +// }); -test("calculateSalesTax for £34", () => { - expect(calculateSalesTax(34)).toEqual(40.8); -}); +// test("calculateSalesTax for £34", () => { +// expect(calculateSalesTax(34)).toEqual(40.8); +// }); -test("addTaxAndFormatCurrency for £15", () => { - expect(addTaxAndFormatCurrency(15)).toEqual("£18.00"); -}); +// test("addTaxAndFormatCurrency for £15", () => { +// expect(addTaxAndFormatCurrency(15)).toEqual("£18.00"); +// }); -test("addTaxAndFormatCurrency for £17.50", () => { - expect(addTaxAndFormatCurrency(17.5)).toEqual("£21.00"); -}); +// test("addTaxAndFormatCurrency for £17.50", () => { +// expect(addTaxAndFormatCurrency(17.5)).toEqual("£21.00"); +// }); -test("addTaxAndFormatCurrency for £34", () => { - expect(addTaxAndFormatCurrency(34)).toEqual("£40.80"); -}); +// test("addTaxAndFormatCurrency for £34", () => { +// expect(addTaxAndFormatCurrency(34)).toEqual("£40.80"); +// }); From 265a694d30476b335adba3813115781ac59ed337 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Tue, 23 Aug 2022 17:13:34 +0100 Subject: [PATCH 17/22] Update 4-tax.js --- mandatory/4-tax.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index d8ac00e4a..5d1770e59 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -36,26 +36,26 @@ To run the tests for just this one file, type `npm test -- --testPathPattern 4-t =================================================== */ -// test("calculateSalesTax for £15", () => { -// expect(calculateSalesTax(15)).toEqual(18); -// }); +test("calculateSalesTax for £15", () => { + expect(calculateSalesTax(15)).toEqual(18); +}); -// test("calculateSalesTax for £17.50", () => { -// expect(calculateSalesTax(17.5)).toEqual(21); -// }); +test("calculateSalesTax for £17.50", () => { + expect(calculateSalesTax(17.5)).toEqual(21); +}); -// test("calculateSalesTax for £34", () => { -// expect(calculateSalesTax(34)).toEqual(40.8); -// }); +test("calculateSalesTax for £34", () => { + expect(calculateSalesTax(34)).toEqual(40.8); +}); -// test("addTaxAndFormatCurrency for £15", () => { -// expect(addTaxAndFormatCurrency(15)).toEqual("£18.00"); -// }); +test("addTaxAndFormatCurrency for £15", () => { + expect(addTaxAndFormatCurrency(15)).toEqual("£18.00"); +}); -// test("addTaxAndFormatCurrency for £17.50", () => { -// expect(addTaxAndFormatCurrency(17.5)).toEqual("£21.00"); -// }); +test("addTaxAndFormatCurrency for £17.50", () => { + expect(addTaxAndFormatCurrency(17.5)).toEqual("£21.00"); +}); -// test("addTaxAndFormatCurrency for £34", () => { -// expect(addTaxAndFormatCurrency(34)).toEqual("£40.80"); -// }); +test("addTaxAndFormatCurrency for £34", () => { + expect(addTaxAndFormatCurrency(34)).toEqual("£40.80"); +}); From 750e7f4eadaba94323a9844138d1b7232010811c Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Wed, 24 Aug 2022 08:27:19 +0100 Subject: [PATCH 18/22] check file --- exercises/F-strings-methods/exercise.js | 7 +++++-- exercises/F-strings-methods/exercise2.js | 5 ++--- mandatory/2-logic-error.js | 2 +- mandatory/3-function-output.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 85b2d74a6..d5aff32c0 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,6 +1,9 @@ // Start by creating a variable `message` -let message =`My name is Ahmed and my cheregter numer is `; -let name2="Ahmed"; +let name2="Daniel"; +let message = ` My name is ${name2} and my cheregter numer is `; + let numberCherctor=name2.length; console.log(message+numberCherctor); + +///My name is Daniel and my name is 6 characters long diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index f35cbf23c..ff8fa15f7 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,5 +1,4 @@ const dname = " Daniel "; let nameof=dname.trim(); -console.log(nameof); -console.log(nameof.length); - +let countCheregter=nameof.length; +console.log("My name is "+dname+" and my name is "+countCheregter+" characters log"); diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index d0ae092dd..94e84d68a 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -10,7 +10,7 @@ function getStringLength (word) { return word.length; } -console.log(getStringLength("hi ahmed")); + function multiply(a, b, c) { return a * b * c; diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 4e47258a4..970b54a5c 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -17,7 +17,7 @@ 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. } -console.log(concatenate("ahmed","mohamed",5)); + /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From cd3cacc8573dd658079edb80a25acbf5c2c598c3 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Wed, 24 Aug 2022 08:39:34 +0100 Subject: [PATCH 19/22] check --- exercises/B-hello-world/exercise.js | 2 -- exercises/C-variables/exercise.js | 4 +++- exercises/D-strings/exercise.js | 6 ++++-- mandatory/2-logic-error.js | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b82d6bd0a..b179ee953 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1,3 +1 @@ console.log("Hello world"); -console.log('Hi Ahmed '+'Mohmed'); -console.log(' A B C ') \ No newline at end of file diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index 32093e01b..707d2308a 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `greeting` -let greeting="Hello Wolrd Welcom Ahmed"; +let 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 d92607aa8..3772ea23d 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,4 +1,6 @@ // Start by creating a variable `message` -let message="string "; +var message = "This is a string"; +var messageType = typeof message; -console.log(message+typeof(message)); +console.log(message); +console.log(messageType); diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 94e84d68a..0ed4c2254 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -4,13 +4,13 @@ function trimWord(word) { return word.trim(); } - +word = " CodeYourFuture "; +word = " CodeYourFuture teaches coding "; function getStringLength (word) { - - return word.length; } - +word = getStringLength("A wild sentence appeared!"); +word = getStringLength("Turtle"); ; function multiply(a, b, c) { return a * b * c; From 9dfe041bd4a598352bb9a83bcff5cfe5586911ea Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:02:25 +0100 Subject: [PATCH 20/22] add spec --- mandatory/1-syntax-errors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index cc8af6435..369dce746 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -6,7 +6,7 @@ function addNumbers(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) { let total = a + b; From f17663678fca62510e918c52f8878a00d5cfeaf2 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:10:22 +0100 Subject: [PATCH 21/22] add spec --- mandatory/1-syntax-errors.js | 2 +- mandatory/4-tax.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 369dce746..dda674659 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -11,7 +11,7 @@ function introduceMe(name, age) function getTotal(a,b) { let total = a + b; - return "The total is "+ total; + return "The total is"+" "+ total; } /* =================================================== diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index 5d1770e59..c86f7c19a 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -23,8 +23,7 @@ return price+salesTax; function addTaxAndFormatCurrency(tax) { return "£"+calculateSalesTax(tax).toFixed(2); } -console.log(calculateSalesTax(17.5)); -console.log(addTaxAndFormatCurrency(15)); // expect to £18 + /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From e2648f5cda8bdaaaef1d9837a47f927fc4ba4050 Mon Sep 17 00:00:00 2001 From: Ahmed Mohamed <105979851+AhmedMohamed809@users.noreply.github.com> Date: Wed, 24 Aug 2022 19:02:20 +0100 Subject: [PATCH 22/22] add spec --- mandatory/1-syntax-errors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index dda674659..58784066f 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -6,7 +6,7 @@ function addNumbers(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) { let total = a + b;