Committing to get to master.

arc12012 · Apr 17, 2017 · ff35a4c · ff35a4c
1 parent d2f31f3
commit ff35a4c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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.