From 1f166de28d4de3f4aae5386bce4ca5fa3877248a Mon Sep 17 00:00:00 2001
From: Lamir Middleton <lamir.middleton@gmail.com>
Date: Thu, 30 Aug 2018 13:41:03 -0400
Subject: [PATCH 1/4] Details

Because my professor told me to
---
 git/introductions/Middleton.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 git/introductions/Middleton.md

diff --git a/git/introductions/Middleton.md b/git/introductions/Middleton.md
new file mode 100644
index 0000000..e69de29

From 5d6ae9ad18d2354854228c1208b37095fc12f725 Mon Sep 17 00:00:00 2001
From: Lamir Middleton <lamir.middleton@gmail.com>
Date: Tue, 16 Oct 2018 20:52:04 -0400
Subject: [PATCH 2/4] Javascript code

---
 assignment_1/table_manager.html     | 81 ++++++++++++++++++++++++-----
 git/introductions/your_last_name.md |  0
 2 files changed, 67 insertions(+), 14 deletions(-)
 delete mode 100644 git/introductions/your_last_name.md

diff --git a/assignment_1/table_manager.html b/assignment_1/table_manager.html
index 5eb0bdc..3c1c0af 100644
--- a/assignment_1/table_manager.html
+++ b/assignment_1/table_manager.html
@@ -10,7 +10,7 @@
 <!-- Data -->
 <script>
 
-// Don't copy this to any other places in this file. You can just use the "organizations" variable to do your assignment. 
+// Don't copy this to any other places in this file. You can just use the "organizations" variable to do your assignment.
 var organizations = [
 	 {
         "Region": "East Asia & Pacific",
@@ -19,7 +19,7 @@
         "Organization Name": "200 Square",
         "Organization Type": "For-profit",
         "Sectors": "Housing, construction & real estate",
-        "Description": "200 Square is an online real estate agent in New Zealand.",        
+        "Description": "200 Square is an online real estate agent in New Zealand.",
         "City": "Wellington",
         "State/Region": "Wellington",
         "Founding Year": 2010,
@@ -34,7 +34,7 @@
         "Organization Name": "21c Consultancy",
         "Organization Type": "For-profit",
         "Sectors": "IT and geospatial",
-        "Description": "21c is ICT innovation consultancy which advises international actors, institutions and governments around the world on technological trends which can affect the way they deliver services.",        
+        "Description": "21c is ICT innovation consultancy which advises international actors, institutions and governments around the world on technological trends which can affect the way they deliver services.",
         "City": "London",
         "State/Region": "",
         "Founding Year": 2015,
@@ -49,7 +49,7 @@
         "Organization Name": "2GIS",
         "Organization Type": "For-profit",
         "Sectors": "IT and geospatial",
-        "Description": "2GIS is a city information service combined with a map. ",        
+        "Description": "2GIS is a city information service combined with a map. ",
         "City": "Novosibirsk",
         "State/Region": "Novosibirsk Oblast",
         "Founding Year": 1999,
@@ -64,7 +64,7 @@
         "Organization Name": "2nd City Zoning",
         "Organization Type": "Nonprofit",
         "Sectors": "Housing, construction & real estate",
-        "Description": "An Open City App, 2nd City Zoning is an interactive map that lets you find out how your building is zoned, learn where to locate your business and explore zoning patterns throughout the city.",        
+        "Description": "An Open City App, 2nd City Zoning is an interactive map that lets you find out how your building is zoned, learn where to locate your business and explore zoning patterns throughout the city.",
         "City": "Chicago",
         "State/Region": "Illinois",
         "Founding Year": 2013,
@@ -94,7 +94,7 @@
         "Organization Name": "360 Yield Center",
         "Organization Type": "For-profit",
         "Sectors": "Agriculture",
-        "Description": "Taking a 360-degree view of key yield-limiting variables, 360 Yield Center develops strategies for better-performing crops and better on-farm profits.",        
+        "Description": "Taking a 360-degree view of key yield-limiting variables, 360 Yield Center develops strategies for better-performing crops and better on-farm profits.",
         "City": "Morton",
         "State/Region": "Illinois",
         "Founding Year": 2014,
@@ -124,7 +124,7 @@
         "Organization Name": "3Tier (Europe) ",
         "Organization Type": "For-profit",
         "Sectors": "Energy and climate",
-        "Description": "3TIER is a global environmental and industrial measurement company providing weather-driven renewable energy risk assessment and forecasting for wind, solar, and hydro power projects.",        
+        "Description": "3TIER is a global environmental and industrial measurement company providing weather-driven renewable energy risk assessment and forecasting for wind, solar, and hydro power projects.",
         "City": "Helsinki",
         "State/Region": "Uusimaa",
         "Founding Year": 2012,
@@ -139,7 +139,7 @@
         "Organization Name": "5PSolutions",
         "Organization Type": "For-profit",
         "Sectors": "IT and geospatial",
-        "Description": "5PSolutions are artisans of mobile platforms.",       
+        "Description": "5PSolutions are artisans of mobile platforms.",
         "City": "Fairfax",
         "State/Region": "Virginia",
         "Founding Year": 2007,
@@ -154,7 +154,7 @@
         "Organization Name": "AAA National",
         "Organization Type": "Other",
         "Sectors": "Transportation and logistics",
-        "Description": "AAA provides services such as travel, automotive, insurance, financial, and discounts.",        
+        "Description": "AAA provides services such as travel, automotive, insurance, financial, and discounts.",
         "City": "Irving",
         "State/Region": "Texas",
         "Founding Year": 1902,
@@ -184,7 +184,7 @@
         "Organization Name": "ABRELATAM",
         "Organization Type": "Nonprofit",
         "Sectors": "Governance",
-        "Description": "ABRELATAM is an conference that seeks to accelerate the process of opening information through Open Data transparency and promote the Latin America.",        
+        "Description": "ABRELATAM is an conference that seeks to accelerate the process of opening information through Open Data transparency and promote the Latin America.",
         "City": "Santiago",
         "State/Region": "",
         "Founding Year": 2015,
@@ -192,7 +192,7 @@
         "Type of Data Used": "",
         "profileID": "1687"
     }
-	
+
 ];
 </script>
 
@@ -200,16 +200,69 @@
 
 <body>
 <!-- Feel free to add empty tags. Data shouldn't be here. -->
-	<div id="org_table"></div>
+<h1>Table Representation of Questions</h1>
+<table style = "width:100%">
+	<tr>
+		<th>Nonprofit Orgs</th>
+		<th>Orgs less than 10 yrs old</th>
+		<th>Orgs in North America</th>
+		<th>Orgs using Transportation data type</th>
+		<th>Orgs with high income</th>
+	</tr>
+	<tr>
+		<th><div id = "question1"></div></th>
+		<th><div id = "question2"></div></th>
+		<th><div id = "question3"></div></th>
+		<th><div id = "question4"></div></th>
+		<th><div id = "question5"></div></th>
+	</tr>
+</table>
+
+
+
 
 <script>
 // outputs the first item of the organizations array. Just for testing.
-console.log(organizations[0]); 
+console.log(organizations[0].Region);
 
 // Your JavaScript code goes here
 
 
+	var count = 0;
+	var count2 = 0;
+	var count3 = 0;
+	var count4 = 0;
+	var count5 = 0;
+
+	for(var i = 0; i < organizations.length; i++){
+		if((organizations[i]["Organization Type"])==="Nonprofit"){
+			count++;
+		}
+
+		if(2018 - organizations[i]["Founding Year"] < 10){
+			count2++;
+		}
+		if((organizations[i].Region)==="North America"){
+			count3++;
+		}
+		if((organizations[i]["Type of Data Used"])==="Transportation"){
+			count4++;
+		}else if((organizations[i]["Type of Data Used"])==="Transportation, Geospatial, Business"){
+			count4++;
+		}
+		if((organizations[i]["Country Income Level"])==="High income"){
+			count5++;
+		}
+
+	}
+	//return count;
+document.getElementById("question1").innerHTML = count
+document.getElementById("question2").innerHTML = count2
+document.getElementById("question3").innerHTML = count3
+document.getElementById("question4").innerHTML = count4
+document.getElementById("question5").innerHTML = count5
+
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/git/introductions/your_last_name.md b/git/introductions/your_last_name.md
deleted file mode 100644
index e69de29..0000000

From 0f6a9b719f8e8e5a41990d8adb0090d936c1e8e3 Mon Sep 17 00:00:00 2001
From: LamirM <lamir.middleton@gmail.com>
Date: Tue, 16 Oct 2018 21:02:54 -0400
Subject: [PATCH 3/4] Update table_manager.html

---
 assignment_1/table_manager.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assignment_1/table_manager.html b/assignment_1/table_manager.html
index 6b7c537..001092a 100644
--- a/assignment_1/table_manager.html
+++ b/assignment_1/table_manager.html
@@ -223,12 +223,12 @@ <h1>Table Representation of Questions</h1>
 
 <script>
 // outputs the first item of the organizations array. Just for testing.
-<<<<<<< HEAD
+
 console.log(organizations[0].Region);
 =======
 // console.log(organizations[0]);
-console.log("test");
->>>>>>> 87cd47e687e8f048b227bb893c1b51f389a01229
+
+
 
 // Your JavaScript code goes here
 

From 9f224d1fa026692b899fcb61995709adcd5aba98 Mon Sep 17 00:00:00 2001
From: LamirM <lamir.middleton@gmail.com>
Date: Tue, 16 Oct 2018 21:05:11 -0400
Subject: [PATCH 4/4] Update table_manager.html

---
 assignment_1/table_manager.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assignment_1/table_manager.html b/assignment_1/table_manager.html
index 001092a..2005b78 100644
--- a/assignment_1/table_manager.html
+++ b/assignment_1/table_manager.html
@@ -225,7 +225,7 @@ <h1>Table Representation of Questions</h1>
 // outputs the first item of the organizations array. Just for testing.
 
 console.log(organizations[0].Region);
-=======
+
 // console.log(organizations[0]);
 
 
@@ -260,7 +260,7 @@ <h1>Table Representation of Questions</h1>
 		}
 
 	}
-	//return count;
+	
 document.getElementById("question1").innerHTML = count
 document.getElementById("question2").innerHTML = count2
 document.getElementById("question3").innerHTML = count3