Document

From 321224d353284eb8941297f241ec947404f11a49 Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Fri, 2 Sep 2022 21:39:26 +0100 Subject: [PATCH 1/6] fix errors --- mandatory/1-syntax-errors.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..8efa9f669 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"; - +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"; } From 57ad4bdc4559a46e6d256dcd0ca072b1dc26da37 Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Fri, 2 Sep 2022 21:44:29 +0100 Subject: [PATCH 2/6] fix errors --- mandatory/2-logic-error.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..fba446374 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 trimWord(); } function getStringLength(word) { - return "word".length(); + return word.length(); } function multiply(a, b, c) { - a * b * c; - return; + return a * b * c; } /* From b65cff550585b8493d521c29b0f9792d7897f652 Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Fri, 2 Sep 2022 22:10:52 +0100 Subject: [PATCH 3/6] fix errors --- mandatory/3-function-output.js | 12 +++++++++++- mandatory/index.html | 12 ++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 mandatory/index.html diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..4368a67a5 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -3,16 +3,25 @@ function getRandomNumber() { return Math.random() * 10; } +//This fuction gets one random integer number by using Math library. And then multiply this number by 10 + // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { return word1.concat(word2); } +// This funtion combines the text word1 and word2 + function concatenate(firstWord, secondWord, thirdWord) { + return firstWord.concat(secondWord.concat(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. } +// These function combines the firstWord, secondWord and thirdWord +// Combining integers are also possible +let x = concatenate("s", "a", "e"); +console.log(x); /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== @@ -23,7 +32,7 @@ To run the tests for just this one file, type `npm test -- --testPathPattern 3-f (Reminder: You must have run `npm install` one time before this will work!) ================================== */ - +/* test("concatenate example #1", () => { expect(concatenate("code", "your", "future")).toEqual("code your future"); }); @@ -35,3 +44,4 @@ test("concatenate example #2", () => { test("concatenate doesn't only accept strings", () => { expect(concatenate("I", "am", 13)).toEqual("I am 13"); }); +*/ \ No newline at end of file diff --git a/mandatory/index.html b/mandatory/index.html new file mode 100644 index 000000000..38f601429 --- /dev/null +++ b/mandatory/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + \ No newline at end of file From 251315614d4c5a6f503a3c15d89e352603f7304b Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Fri, 2 Sep 2022 22:15:40 +0100 Subject: [PATCH 4/6] fix errors --- mandatory/3-function-output.js | 3 +-- mandatory/index.html | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 4368a67a5..92c75fa62 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -32,7 +32,7 @@ To run the tests for just this one file, type `npm test -- --testPathPattern 3-f (Reminder: You must have run `npm install` one time before this will work!) ================================== */ -/* + test("concatenate example #1", () => { expect(concatenate("code", "your", "future")).toEqual("code your future"); }); @@ -44,4 +44,3 @@ test("concatenate example #2", () => { test("concatenate doesn't only accept strings", () => { expect(concatenate("I", "am", 13)).toEqual("I am 13"); }); -*/ \ No newline at end of file diff --git a/mandatory/index.html b/mandatory/index.html index 38f601429..def0952f9 100644 --- a/mandatory/index.html +++ b/mandatory/index.html @@ -8,5 +8,7 @@ + + \ No newline at end of file From 5709b7ef8cf78a24b45bce946f6b863116de6873 Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Fri, 2 Sep 2022 22:33:40 +0100 Subject: [PATCH 5/6] add currency formatting --- mandatory/4-tax.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..53ef30a63 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*(20/100); +} /* CURRENCY FORMATTING @@ -17,8 +19,10 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} - +function addTaxAndFormatCurrency(price) { + return (price+(price*20/100)).toFixed(2); +} +console.log(addTaxAndFormatCurrency(50) + " £"); /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== From 8eafe20ab9c5bca65b0c4647cc6fe76888eb29f4 Mon Sep 17 00:00:00 2001 From: fatih-celebi Date: Tue, 13 Sep 2022 16:40:26 +0100 Subject: [PATCH 6/6] do exercise --- mandatory/1-syntax-errors.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 8efa9f669..fc84837e4 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,40 +1,31 @@ // 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 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; - - return "The total is total"; + return "The total is " + total; } - /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== - There are some Tests in this file that will help you work out if your code is working. - To run the tests for just this one file, type `npm test -- --testPathPattern 1-syntax-errors` into your terminal (Reminder: You must have run `npm install` one time before this will work!) - =================================================== */ - test("addNumbers adds numbers correctly", () => { expect(addNumbers(3, 4, 6)).toEqual(13); }); - test("introduceMe function returns the correct string", () => { expect(introduceMe("Sonjide", 27)).toEqual( "Hello, my name is Sonjide and I am 27 years old" ); }); - test("getTotal returns a string describing the total", () => { expect(getTotal(23, 5)).toEqual("The total is 28"); }); +