From ff35a4c9a8028f86bbb63b526110b754361f8a61 Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Mon, 17 Apr 2017 16:13:49 -0400
Subject: [PATCH] Committing to get to master.

---
 src/database/DeviceQueries.java | 6 +++---
 src/entities/Device.java        | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/database/DeviceQueries.java b/src/database/DeviceQueries.java
index 248a400..3529742 100644
--- a/src/database/DeviceQueries.java
+++ b/src/database/DeviceQueries.java
@@ -27,7 +27,7 @@ public static Device[] getUserDevices(String userID) throws SQLException, ClassN
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}		
 		stmt.close();
@@ -53,7 +53,7 @@ public static Device[] getAllDevices() throws SQLException, ClassNotFoundExcepti
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}
 		stmt.close();
@@ -79,7 +79,7 @@ public static Device[] getAvailableDevices() throws SQLException, ClassNotFoundE
 		
 		//iterate result set
 		while(resultSet.next()){
-			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"));
+			devices[counter] = new Device(resultSet.getString("Device_Name"),resultSet.getInt("Device_ID"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"), resultSet.getString("Model"), resultSet.getString("Manufacturer"), resultSet.getString("Status"), resultSet.getString("MAC_Address"), resultSet.getString("Serial_Num"), resultSet.getString("NFC_ID"), resultSet.getString("Locker_Position"), resultSet.getString("Operating_System"), resultSet.getString("Admin_Comments"));
 			counter++;
 		}
 		stmt.close();
diff --git a/src/entities/Device.java b/src/entities/Device.java
index 5e3f871..593fead 100644
--- a/src/entities/Device.java
+++ b/src/entities/Device.java
@@ -16,8 +16,11 @@ public class Device {
 	private String MAC;
 	private String Serial;
 	private String NFC;
+	private String locker_position;
+	private String OS;
+	private String Admin_Comments;
 	
-	public Device(String name, int id, String desc, String hardware, String model, String manufacturer, String available, String mac, String serial, String nfc) {
+	public Device(String name, int id, String desc, String hardware, String model, String manufacturer, String available, String mac, String serial, String nfc, String locker, String os, String comments) {
 		Device_Name = name;
 		Device_ID = id;
 		Device_Description = desc;
@@ -28,6 +31,9 @@ public Device(String name, int id, String desc, String hardware, String model, S
 		MAC = mac;
 		Serial = serial;
 		NFC = nfc;
+		locker_position = locker;
+		OS = os;
+		Admin_Comments = comments;
 	}
 /**
  * Formatting the device to fit a JSON object.