From fa31a9a092d727cbb2452e9502c506fe6a6a3249 Mon Sep 17 00:00:00 2001
From: "Mr.Demir" <mehmetomer806@gmail.com>
Date: Fri, 7 Apr 2023 23:05:50 +0100
Subject: [PATCH] last version

---
 .DS_Store                      | Bin 0 -> 6148 bytes
 mandatory/1-syntax-errors.js   |  14 ++++++++------
 mandatory/2-logic-error.js     |   7 +++----
 mandatory/3-function-output.js |   7 +++----
 mandatory/4-tax.js             |  10 ++++++++--
 5 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..44fd6cf12bb8cfe584215bb407d7c2bbc85c4f75
GIT binary patch
literal 6148
zcmeHKU2oGc6usU$mTm<V1kzrRBJsMG!lnttOIKRK1Ov1b_5dg}O|_L}an+<0R8{IT
z{0II5uly4J3r}#aW27|A#2c!RuVkO=kK@=UH+D=!qA~LC5S59@LSigzAj>gs=d@re
zy5=%as4+SRf$VyL^cMP>3ZsBgVEGi_Z+DG)^pRp3Qu_PlEny$2`b(Lb`UX9sBh)tO
zfS$px(mDC5Z=N~dGMsDln4Z%yRj3WDfYpLmL2Zkk(u=$?#Fxw%<;)lky`%;mVixUO
z{?82misrj&4lbDcSjUrG?#&Fhh&6U7Bp-Q95-NR~U-8Px-x=OG8t8rTyEh2>QCzG2
z5G$*NwM*;Py0vM&bx!5ji97KqYIKILxzv_2@c#H6?^VAycFWfv$}sNq!`@I4`hE{x
z-W>NsUyd7c6#9|kI!S|7w2E$dYckp0t8Lpm_iEE^dvgCS{N0_s>9lCwxOMx%k$V=L
zhw?L40TbBCm2qUGjo(R*79X5p7|4({U}gzQNodt07rL=Gq5!36UNaS0UsI8Fl?Kqa
zOJ~SW(7ytfROKqYrwD$S8G++0Jwhon!Ua6R?>EgWA`)6ErVoKR5v`&z%_t!Tup-Q9
z1h1?7JRV13nup?2nSRsO=2FedOvWf+6j%lYcz>{w80#8m3979FnYsc13#e8GpML_F
zV{5EyoF#}Bm`JF=gevqELnL(6+qz#}<1E31PC{QkgnqKnHx!|sj`3~PokTrBlN$w$
z0`m&2CdD$J|E-Jf|MMhMG71<4{woDUq3JXmSdu<l7Z%57t&Q{!iH-Zs5>ymq`Z!h&
fAH`cp%Ft%B1FUPDC5RfB`4Lbun9L~fPZjtL#dqwD

literal 0
HcmV?d00001

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index d9e004465..0ee75bb43 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +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 "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 9eb8c8cd7..ff5b064e1 100644
--- a/mandatory/2-logic-error.js
+++ b/mandatory/2-logic-error.js
@@ -1,16 +1,15 @@
 // The syntax for these functions is valid but there are some errors, find them and fix them
 
 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..77006fd1d 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!
+// The Math.round() method rounds a number to the nearest integer. This function also multiply youranswer by 10.
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
-// Add comments to explain what this function does. You're meant to use Google!
+// The concat() method returns the new string after merging the existing string with other strings without affecting the existing string.
 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 + " " + secondWord + " " + thirdWord
 }
 
 /* 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..9d43a29b5 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(taxPrice) {
+  return taxPrice * 1.20
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +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(taxPrice) {
+  let salesWithTax=calculateSalesTax(taxPrice)
+  return "£" + salesWithTax.toFixed(2)
+
+}
 
 /* 
 ===================================================