feat: Make player status a observable field in UserSession

danieskj · May 25, 2026 · 20a8e50 · 20a8e50
1 parent e2a5eb2
commit 20a8e50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt/session/UserSession.java b/src/main/java/edu/ntnu/idi/idatt/session/UserSession.java
@@ -7,6 +7,7 @@
 import edu.ntnu.idi.idatt.storage.SessionManager;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 
 /**
  * Class for managing current session.
@@ -83,6 +84,7 @@ public void setExchange(Exchange exchange) {
   private final SimpleObjectProperty<BigDecimal> moneyProperty = new SimpleObjectProperty<>(BigDecimal.ZERO);
   private final SimpleObjectProperty<BigDecimal> netWorthProperty = new SimpleObjectProperty<>(BigDecimal.ZERO);
   private final SimpleIntegerProperty weekProperty = new SimpleIntegerProperty();
+  private final SimpleStringProperty statusProperty = new SimpleStringProperty();
 
   /**
    * Getter for moneyProperty.
@@ -111,6 +113,15 @@ public SimpleIntegerProperty weekProperty() {
     return weekProperty;
   }
 
+  /**
+   * Getter for statusProperty.
+   *
+   * @return SimpleStringProperty;
+   */
+  public SimpleStringProperty statusProperty() {
+    return statusProperty;
+  }
+
   /**
    * Method used for updating the game state.
    * <p>
@@ -128,6 +139,7 @@ public void updateGameState() {
     moneyProperty.set(player.getMoney());
     netWorthProperty.set(player.getNetWorth());
     weekProperty.set(exchange.getWeek());
+    statusProperty.set(player.getStatus());
     SessionManager.saveSession();
   }
 

diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java b/src/main/java/edu/ntnu/idi/idatt/view/components/ui/UIFactory.java
@@ -304,9 +304,9 @@ public static Parent createToolbar(ActionEventHandler menuHandle, ActionEventHan
     week.textProperty().bind(
         UserSession.getInstance().weekProperty().asString("Week: %d"));
 
-    // Player status only advances at purchases, doesn't need to be a observable
-    // value when saving game state.
-    Label playerStatus = new Label("Status: " + UserSession.getInstance().getPlayer().getStatus());
+    Label playerStatus = new Label();
+    playerStatus.textProperty().bind(Bindings.format("Status: %s",
+        UserSession.getInstance().statusProperty()));
 
     Label playerNetWorth = new Label();
     playerNetWorth.textProperty().bind(