Temp updates

pid1 · May 1, 2015 · 8b8505d · 8b8505d
1 parent aa72125
commit 8b8505d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
@@ -68,5 +68,9 @@ public void datastructureLogEvent(String query) {
 		// don't use this here
 	}
 
+	public void printDataBase(){
+		this.printStruct();
+	}
+
 }
 
diff --git a/src/InputOutput/Thermocontroller.java b/src/InputOutput/Thermocontroller.java
@@ -29,7 +29,7 @@ public class Thermocontroller implements Initializable{
 	server _server;
 	Timer _timer;
 	String _serial;
-	UserLogin _userLogin = new UserLogin();
+	CurrentUser _user = CurrentUser.getInstance();
 
 	@FXML
 	private Slider slider;
@@ -48,8 +48,7 @@ public class Thermocontroller implements Initializable{
 	@Override
 	public void initialize(URL arg0, ResourceBundle arg1) {
 		_server = server.getInstance();
-		_serial = _server.getDevicesFromEmail(_userLogin.getEmail());
-		System.out.println(_serial);
+		_serial = _server.getDevicesFromEmail(_user.getEmail());
 		this.slider.valueProperty().addListener(new ChangeListener<Number>() {
 			@Override
 			//Slider action, changes text color and message, displays disired temp
@@ -75,8 +74,9 @@ public void run() {
 				SwingUtilities.invokeLater(new Runnable() {
 					@Override
 					public void run(){
-					_server.getCurrentTempFromSerialNumber(_serial);
-					System.out.println("temp changed");
+					currentTemp.setText(
+							_server.getCurrentTempFromSerialNumber(_serial));
+					System.out.println("temp changed " + _server.getCurrentTempFromSerialNumber(_serial));
 				}
 
 			});

diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java
@@ -29,6 +29,7 @@ public class UserLogin implements Initializable {
 	private String _password;
 	private boolean _loggedin = false;
 	server _server;
+	CurrentUser _user = CurrentUser.getInstance();
 	@FXML
 	private Button loginButton;
 
@@ -72,7 +73,7 @@ public void handle(ActionEvent e) {
 				} else {
 				if (enteredEmail.equals(queriedEmail) && enteredPassword.equals(queriedPassword)){
         				_loggedin = true;
-        				_email = queriedEmail;
+        				_user.setEmail(queriedEmail);
         				try{//opens new window when login true
         					Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/Thermocontroller.fxml"));
         					Stage stage = new Stage();

diff --git a/src/server/server.java b/src/server/server.java
@@ -82,7 +82,7 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem
 	}
 
 	public String getDevicesFromEmail(String email) {
-		return null;
+		return this.dataStorage.getDevicesFromEmail(email);
 	}
 
 	  // Sends the desired temperature on port sendDesiredTempPORT
@@ -208,6 +208,8 @@ private void creatTestDevice(){
 
 	public void datastructureLogEvent(String query) {
 	}
-
+	public void printDataBase(){
+		this.dataStorage.printDataBase();
+	}
 
 }