CodeYourFuture · malkitbenning · Mar 18, 2023 · Mar 19, 2023 · Mar 19, 2023 · Mar 19, 2023
diff --git a/1-exercises/A-accessing-values/exercise1.js b/1-exercises/A-accessing-values/exercise1.js
@@ -5,19 +5,19 @@
 */
 
 let dog = {
-  breed: "Dalmatian",
-  name: "Spot",
-  isHungry: true,
-  happiness: 6
+  breed: "Dalmatian", //string
+  name: "Spot", //string
+  isHungry: true, //boolean
+  happiness: 6, //number
 };
 
 /*
   You can access the values of each property using dot notation.
   Log the name and breed of this dog using dot notation.
 */
 
-let dogName; // complete the code
-let dogBreed; // complete the code
+let dogName = dog.name; // complete the code
+let dogBreed = dog.breed; // complete the code
 
 console.log(`${dogName} is a ${dogBreed}`);
 

diff --git a/1-exercises/A-accessing-values/exercise2.js b/1-exercises/A-accessing-values/exercise2.js
@@ -17,8 +17,7 @@ let capitalCities = {
 */
 
 let myCountry = "UnitedKingdom";
-let myCapitalCity; // complete the code
-
+let myCapitalCity = capitalCities[myCountry]; 
 console.log(myCapitalCity);
 
 /* EXPECTED RESULT

diff --git a/1-exercises/A-accessing-values/exercise3.js b/1-exercises/A-accessing-values/exercise3.js
@@ -21,7 +21,8 @@ let basketballTeam = {
 */
 
 // write code here
-
+let topPlayers = basketballTeam.topPlayers.sort();
+topPlayers.forEach((player) => console.log(player));
 
 /* EXPECTED RESULT
 

diff --git a/1-exercises/B-setting-values/exercise1.js b/1-exercises/B-setting-values/exercise1.js
@@ -22,7 +22,12 @@ let capitalCities = {
     - Add a population of 9750000 to Peru's capital city.
 */
 
-// write code here
+capitalCities.UnitedKingdom.population = 8980000;
+capitalCities.China.population = 21500000;
+capitalCities["Peru"] = {};
+capitalCities.Peru.name = "Lima";
+capitalCities.Peru.population = 9750000;
+
 
 console.log(capitalCities);
 

diff --git a/1-exercises/B-setting-values/exercise2.js b/1-exercises/B-setting-values/exercise2.js
@@ -14,8 +14,7 @@ let student = {
     - Add a property to the student object for attendance
     - Set the value of attendance to 90
 */
-
-// write code here
+student["attendance"] = 90;
 
 /*
   - Write an "if" statement that changes the value of hasPassed to true
@@ -25,7 +24,9 @@ let student = {
   - Use bracket notation to change the value of hasPassed
 */
 
-// write code here
+if (student.attendance >= 90 && student.examScore > 60) {
+  student["hasPassed"] = true;
+}
 
 console.log(student);
 

diff --git a/1-exercises/C-undefined-properties/exercise.js b/1-exercises/C-undefined-properties/exercise.js
@@ -15,24 +15,27 @@ let car = {
 };
 
 console.log(car["colour"]);
+//there is no property called "colour" in car object
 
 // Example 2
 function sayHelloToUser(user) {
   console.log(`Hello ${user.firstName}`);
 }
 
 let user = {
-  name: "Mira"
+  name: "Mira",
 };
 
 sayHelloToUser(user);
+//you are calling a function that does not 'return' a value
 
 // Example 3
 let myPet = {
   animal: "Cat",
-  getName: function() {
+  getName: function () {
     "My pet's name is Fluffy";
   },
 };
 
 console.log(myPet.getName());
+// the getName function does not 'return' a value
diff --git a/1-exercises/D-object-methods/exercise.js b/1-exercises/D-object-methods/exercise.js
@@ -8,8 +8,10 @@
 */
 
 let student = {
-  // write code here
-}
+  getName: function (name) {
+    console.log(`Student name : ${name}`);
+  },
+};
 
 student.getName("Daniel");
 

diff --git a/2-mandatory/1-recipes.js b/2-mandatory/1-recipes.js
@@ -22,4 +22,24 @@
   You should write and log at least 5 recipes
 */
 
-// write code here
+let favouriteRecipes = [
+  { name: "Mole", serves: 2, ingredients: ["cinnamon", "cumin", "cocoa"] },
+  { name: "Cake", serves: 5, ingredients: ["flour", "eggs", "sugar"] },
+  { name: "French Toast", serves: 1, ingredients: ["bread", "eggs", "milk"] },
+  { name: "Pakora", serves: 3, ingredients: ["flour", "ginger", "potato"] },
+  {
+    name: "Baked Potato",
+    serves: 2,
+    ingredients: ["tuna", "cheese", "potato"],
+  },
+];
+
+console.log(favouriteRecipes);
+favouriteRecipes.forEach((element) => {
+  console.log(element.name);
+  console.log(`Serves: ${element.serves}`);
+  console.log("Ingredients:");
+  element.ingredients.forEach((ingredient) => {
+    console.log(ingredient);
+  });
+});
diff --git a/2-mandatory/2-currency-code-lookup.js b/2-mandatory/2-currency-code-lookup.js
@@ -18,7 +18,11 @@ const COUNTRY_CURRENCY_CODES = [
 ];
 
 function createLookup(countryCurrencyCodes) {
-  // write code here
+  currencyObj = {};
+  countryCurrencyCodes.forEach((element) => {
+    currencyObj[element[0]] = element[1];
+  });
+  return currencyObj;
 }
 
 /* ======= TESTS - DO NOT MODIFY =====

diff --git a/2-mandatory/3-shopping-list.js b/2-mandatory/3-shopping-list.js
@@ -10,7 +10,7 @@
 
   The createShoppingList function should return an object with two properties:
     - "name" of the recipe, which is a string,
-    - "items", which is an arry of the missing ingredients that need to be on the shopping list
+    - "items", which is an array of the missing ingredients that need to be on the shopping list
 */
 
 let pantry = {
@@ -19,7 +19,25 @@ let pantry = {
 };
 
 function createShoppingList(recipe) {
-  // write code here
+  let shoppingList = {};
+  let recipeName = recipe.name;
+  let missingIngredients = [];
+  console.log("recipe name ", recipeName);
+  let recipeIngredients = recipe.ingredients;
+  recipeIngredients.forEach((ingredient) => {
+    if (
+      pantry.cupboardContents.includes(ingredient) ||
+      pantry.fridgeContents.includes(ingredient)
+    ) {
+    } else {
+      missingIngredients.push(ingredient);
+    }
+    if (missingIngredients.length > 0) {
+      shoppingList.items = missingIngredients;
+      shoppingList.name = recipeName;
+    }
+  });
+  return shoppingList;
 }
 
 /* ======= TESTS - DO NOT MODIFY =====

diff --git a/2-mandatory/4-restaurant.js b/2-mandatory/4-restaurant.js
@@ -20,8 +20,17 @@ const MENU = {
 };
 
 let cashRegister = {
-  // write code here
-}
+  orderBurger: function (balance) {
+    let newBalance = balance - MENU.burger;
+    if (newBalance >= 0) balance = newBalance;
+    return balance;
+  },
+  orderFalafel: function (balance) {
+    let newBalance = balance - MENU.falafel;
+    if (newBalance >= 0) balance = newBalance;
+    return balance;
+  },
+};
 
 /* ======= TESTS - DO NOT MODIFY =====
 - To run the tests for this exercise, run `npm test -- --testPathPattern 4-restaurant.js`

diff --git a/2-mandatory/5-writing-tests.js b/2-mandatory/5-writing-tests.js
@@ -30,46 +30,30 @@ function convertScoreToGrade(score) {
 - (Reminder: You must have run `npm install` one time before this will work!)
 */
 
-/*
-  The first test has been written for you. You need to fix the test so that it
-  passes.
-*/
 test("a score of 83 is grade A", () => {
-  expect(convertScoreToGrade(83), "Z");
+  expect(convertScoreToGrade(83)).toEqual("A");
 });
 
-/*
-  The rest of the tests have comments describing what to test and you need to
-  write a matching test
-*/
-
-test.skip("a score of 71 is grade B", () => {
-  /* Remove the .skip above, then write the test body. */
+test("a score of 71 is grade B", () => {
+  expect(convertScoreToGrade(71)).toEqual("B");
 });
-/*
-  Write a test that checks a score of 68 is grade C
-*/
-
-/*
-  Write a test that checks a score of 55 is grade D
-*/
 
-/*
-  Write a test that checks a score of 68 is grade C
-*/
+test("a score of 68 is grade C", () => {
+  expect(convertScoreToGrade(68)).toEqual("C");
+});
 
-/*
-  Write a test that checks a score of 55 is grade D
-*/
+test("a score of 55 is grade D", () => {
+  expect(convertScoreToGrade(55)).toEqual("D");
+});
 
-/*
-  Write a test that checks a score of 49 is grade E
-*/
+test("a score of 49 is grade E", () => {
+  expect(convertScoreToGrade(49)).toEqual("E");
+});
 
-/*
-  Write a test that checks a score of 30 is grade E
-*/
+test("a score of 30 is grade E", () => {
+  expect(convertScoreToGrade(30)).toEqual("E");
+});
 
-/*
-  Write a test that checks a score of 70 is grade B
-*/
+test("a score of 70 is grade B", () => {
+  expect(convertScoreToGrade(70)).toEqual("B");
+});
diff --git a/2-mandatory/6-writing-tests-advanced.js b/2-mandatory/6-writing-tests-advanced.js
@@ -10,7 +10,7 @@
   trainee has completed.
 */
 
-function convertScoreToGrade() {
+function convertScoreToGrade(score) {
   let grade = null;
 
   if (score >= 80) {
@@ -49,43 +49,91 @@ function formatCourseworkResult(trainee) {
 */
 
 /*
-  Write a test that checks the output of formatCourseworkResult when passed the following trainee:
+  Checks the output of formatCourseworkResult when passed the following trainee:
   {
     name: "Xin",
     score: 63
   }
 */
 
+test("Xin score of 63 is grade C", () => {
+  let trainee = {
+    name: "Xin",
+    score: 63,
+  };
+
+  expect(formatCourseworkResult(trainee)).toEqual(
+    "Xin's coursework was marked as grade C."
+  );
+});
+
 /*
-  Write a test that checks the output of formatCourseworkResult when passed the following trainee:
+  Checks the output of formatCourseworkResult when passed the following trainee:
   {
     name: "Mona",
     score: 78
   }
 */
+test("Mona score of 78 is grade B", () => {
+  let trainee = {
+    name: "Mona",
+    score: 78,
+  };
 
+  expect(formatCourseworkResult(trainee)).toEqual(
+    "Mona's coursework was marked as grade B."
+  );
+});
 /*
-  Write a test that checks the output of formatCourseworkResult when passed the following trainee:
+  Checks the output of formatCourseworkResult when passed the following trainee:
   {
     name: "Ali",
     score: 49,
     age: 33,
     subjects: ["JavaScript", "React", "CSS"]
   }
 */
+test("Ali score of 49 is grade E", () => {
+  let trainee = {
+    name: "Ali",
+    score: 49,
+    age: 33,
+    subjects: ["JavaScript", "React", "CSS"],
+  };
 
+  expect(formatCourseworkResult(trainee)).toEqual(
+    "Ali's coursework was marked as grade E."
+  );
+});
 /*
-  Write a test that checks the output of formatCourseworkResult when passed the following trainee:
+  Checks the output of formatCourseworkResult when passed the following trainee:
   {
     score: 90,
     age: 29
   }
 */
+test("No trainee name supplied", () => {
+  let trainee = {
+    score: 90,
+    age: 29,
+  };
 
+  expect(formatCourseworkResult(trainee)).toEqual("Error: No trainee name!");
+});
 /*
-  Write a test that checks the output of formatCourseworkResult when passed the following trainee:
+  Checks the output of formatCourseworkResult when passed the following trainee:
   {
     name: "Aman",
     subjects: ["HTML", "CSS", "Databases"]
   }
 */
+test("No trainee score supplied", () => {
+  let trainee = {
+    name: "Aman",
+    subjects: ["HTML", "CSS", "Databases"],
+  };
+
+  expect(formatCourseworkResult(trainee)).toEqual(
+    "Error: Coursework percent is not a number!"
+  );
+});