From b43e5f6498d04ecdba383ea098415e6c49abeadf Mon Sep 17 00:00:00 2001
From: toneiojimz <ajimeneza77@gmail.com>
Date: Mon, 14 Oct 2019 17:20:55 -0700
Subject: [PATCH] updated

---
 .vscode/settings.json              |  3 ++
 assignments/arrays.js              | 52 ++++++++++++++++++++++++-----
 assignments/function-conversion.js |  4 +++
 assignments/objects.js             | 53 ++++++++++++++++++++++++++++--
 4 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..6f3a2913e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/assignments/arrays.js b/assignments/arrays.js
index 1dbf8bd35..077315813 100644
--- a/assignments/arrays.js
+++ b/assignments/arrays.js
@@ -75,30 +75,66 @@ let inventory = [
 
 // ==== Challenge 1 ====
 // The dealer can't recall the information for a car with an id of 33 on his lot. Help the dealer find out which car has an id of 33 by logging the car's year, make, and model in the console log provided to you below:
-console.log(`Car 33 is a *car year goes here* *car make goes here* *car model goes here*`);
+// console.log(`Car 33 is a *car year goes here* *car make goes here* *car model goes here*`);
+// console.log(`Car 33 is a 2011, Jeep, Wrangler');
+console.log(`Car 33 is ${inventory[32].car_year}, ${inventory[32].car_make}, ${inventory[32].car_model}`)
 
 // ==== Challenge 2 ====
 // The dealer needs the information on the last car in their inventory.  What is the make and model of the last car in the inventory?  Log the make and model into the console.
-let lastCar = 0;
-console.log();
+let lastCar = inventory[inventory.length-1];
+
+console.log(lastCar);
 
 // ==== Challenge 3 ====
 // The marketing team wants the car models listed alphabetically on the website. Sort all the car model names into alphabetical order and log the results in the console
 let carModels = [];
-let carModelsSorted = [];
-console.log();
+let carModelsSorted= [];
+
+for (let i=0; i<inventory.length; i++){
+
+  carModels = inventory[i].car_model;
+  
+  carModelsSorted.push(carModels);
+  carModelsSorted.sort();
+}
+
+console.log(carModelsSorted);
 
 // ==== Challenge 4 ====
 // The accounting team needs all the years from every car on the lot. Create a new array from the dealer data containing only the car years and log the result in the console.
 let carYears = [];
-console.log();
+for(i=0; i<inventory.length; i++){
+  
+  let years = inventory[i].car_year;
+  carYears.push(years);
+}
+
+console.log(carYears);
 
 // ==== Challenge 5 ====
 // The car lot manager needs to find out how many cars are older than the year 2000. Using the carYears array you just created, find out how many cars were made before the year 2000 by populating the array oldCars and logging it's length.
 let oldCars = [];
-console.log();
+
+for(i=0; i<carYears.length; i++)
+{
+  if(carYears[i]< 2000){
+    oldCars.push(carYears[i]);
+   
+  }
+  
+}
+
+console.log(oldCars.length);
 
 // ==== Challenge 6 ====
 // A buyer is interested in seeing only BMW and Audi cars within the inventory. Return an array that only contains BMW and Audi cars.  Once you have populated the BMWAndAudi array, use JSON.stringify() to show the results of the array in the console.
 let BMWAndAudi = [];
-console.log();
+
+for(i=0; i<inventory.length; i++){
+  
+  if(inventory[i].car_make === 'BMW' || inventory[i].car_make === 'Audi'){
+    BMWAndAudi.push(inventory[i]);
+  }
+}
+
+console.log(BMWAndAudi);
diff --git a/assignments/function-conversion.js b/assignments/function-conversion.js
index 55f57ef62..ec05e4384 100644
--- a/assignments/function-conversion.js
+++ b/assignments/function-conversion.js
@@ -4,21 +4,25 @@
 // console.log("Function was invoked!");
 // };
 // myFunction();
+const myFunction = ()=>{ return "Function was invoked";}
 
 // let anotherFunction = function (param) {
 //   return param;
 // };
 // anotherFunction("Example");
+const anotherFunction= (param) =>{return param;}
 
 // let add = function (param1, param2) {
 //   return param1 + param2;
 // };
 // add(1,2);
+const add = (param1, param2) =>{return param1 + param2;}
 
 // let subtract = function (param1, param2) {
 //   return param1 - param2;
 // };
 // subtract(1,2);
+const subatract = (param1, param2) => {return param1 - param2;}
 
 
 // Stretch
diff --git a/assignments/objects.js b/assignments/objects.js
index 798d5e0cf..30ede14fc 100644
--- a/assignments/objects.js
+++ b/assignments/objects.js
@@ -18,27 +18,76 @@ const example = {
 }
 
 // Write your intern objects here:
+const intern1 = {
+  id: 1,
+  name: "Mitzi",
+  email: "mmelloy0@psu.edu",
+  gender: "F",
+}
+
+const intern2 = {
+  id: 2,
+  name: "Kennan",
+  email: "kdiben1@tinypic.com",
+  gender: "M",
+  speak: function(){
+    return "Hello, my name is Kennan!";
+  }
+
+  
+
+};
+
+const intern3 = {
+  id: 3,
+  name: "Keven",
+  email: "kmummery2@wikimedia.org",
+  gender: "M",
+}
+
+const intern4 = {
+  id: 4,
+  name: "Gannie",
+  email: "gmartinson3@illinois.edu",
+  gender: "M",
+}
+
+const intern5 = {
+  id: 5,
+  name: "Antonietta",
+  email: "adaine5@samsung.com",
+  gender: "F",
+
+  multiplyNums: function (n1, n2){
+    return n1 * n2;
+  }
 
+};
 
 // ==== Challenge 2: Reading Object Data ==== 
 // Once your objects are created, log out the following requests from HR into the console:
 
 // Mitzi's name
+console.log(intern1.name);
 
 // Kennan's ID
+console.log(intern2.id);
 
 // Keven's email
+console.log(intern3.email);
 
 // Gannie's name
+console.log(intern4.name);
 
 // Antonietta's Gender
+console.log(intern5.gender);
 
 // ==== Challenge 3: Object Methods ==== 
 // Give Kennan the ability to say "Hello, my name is Kennan!" Use the console.log provided as a hint.
-// console.log(kennan.speak());
+console.log(intern2.speak());
 
 // Antonietta loves math, give her the ability to multiply two numbers together and return the product. Use the console.log provided as a hint.
-//console.log(antonietta.multiplyNums(3,4));
+console.log(intern5.multiplyNums(3,4));
 
 // === Great work! === Head over to the the arrays.js. You may come back and attempt the Stretch Challenge once you have completed the challenges in arrays.js and function-conversion.js.