diff --git a/Sprint-1/destructuring/exercise-1/exercise.js b/Sprint-1/destructuring/exercise-1/exercise.js index 1ff2ac5c..90eb4795 100644 --- a/Sprint-1/destructuring/exercise-1/exercise.js +++ b/Sprint-1/destructuring/exercise-1/exercise.js @@ -6,7 +6,7 @@ const personOne = { // Update the parameter to this function to make it work. // Don't change anything else. -function introduceYourself(___________________________) { +function introduceYourself({name, age, favouriteFood}) { console.log( `Hello, my name is ${name}. I am ${age} years old and my favourite food is ${favouriteFood}.` ); diff --git a/Sprint-1/destructuring/exercise-2/exercise.js b/Sprint-1/destructuring/exercise-2/exercise.js index e11b75eb..1367e3e9 100644 --- a/Sprint-1/destructuring/exercise-2/exercise.js +++ b/Sprint-1/destructuring/exercise-2/exercise.js @@ -70,3 +70,24 @@ let hogwarts = [ occupation: "Teacher", }, ]; + +//Task 1 +//added "hogwarts" as parameter following cjyuan's feedback +function revelioGryffindor(hogwarts) { + for (const { firstName, lastName, house } of hogwarts) { + if (house === "Gryffindor") { + console.log(`${firstName} ${lastName} is a Gryffindor`); + } + } +} +revelioGryffindor(hogwarts) + +//Task 2 +function accioPets(){ + for (const { firstName, lastName, pet, occupation } of hogwarts) { + if (occupation === "Teacher" && pet !== null) { + console.log(`${firstName} ${lastName} is a teacher who has a pet ${pet}`); + } + } +} +accioPets(hogwarts) \ No newline at end of file diff --git a/Sprint-1/destructuring/exercise-3/exercise.js b/Sprint-1/destructuring/exercise-3/exercise.js index b3a36f4e..426af4d3 100644 --- a/Sprint-1/destructuring/exercise-3/exercise.js +++ b/Sprint-1/destructuring/exercise-3/exercise.js @@ -6,3 +6,23 @@ let order = [ { itemName: "Hot Coffee", quantity: 2, unitPricePence: 100 }, { itemName: "Hash Brown", quantity: 4, unitPricePence: 40 }, ]; + +function receipt() { + console.log(`QTY ITEM TOTAL`); + let total = 0; + + for (const { itemName, quantity, unitPricePence } of order) { + const unitPricePounds = unitPricePence / 100; + const totalOneItem = quantity * unitPricePounds; + total += totalOneItem; + + const itemNameFormatted = itemName.padEnd(20); + const totalFormatted = totalOneItem.toFixed(2).padStart(6); + + console.log(`${quantity} ${itemNameFormatted}${totalFormatted}`); + } + + console.log(`\nTotal: ${total.toFixed(2)}`); +} + +receipt(order); \ No newline at end of file