Merge pull request #110 from einaskoi/per/popups

fixed bugs
einaskoi · May 14, 2026 · b9f1fcc · b9f1fcc
2 parents a6b04b7 + 5a40c1a
commit b9f1fcc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.claude/worktrees/nostalgic-liskov-9129de b/.claude/worktrees/nostalgic-liskov-9129de
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/GameController.java
@@ -52,7 +52,7 @@ public void setGameState(GameState gameState) {
   public void startGame() {
     timer = new Timer(true);
     final int delay = 0;
-    final int period = 1000; //TODO: This has to be 1000 (1 second) on release
+    final int period = 10; //TODO: This has to be 1000 (1 second) on release
 
     timer.scheduleAtFixedRate(
         new TimerTask() {

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java
@@ -116,4 +116,9 @@ public void updateGameState() {
     }
     gameController.setGameState(GameState.WORKDAY);
   }
+
+  public void setDay(int index) {
+    dayIndex.set(index);
+    updateGameState();
+  }
 }
diff --git a/...ava/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java b/...ava/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java
@@ -10,6 +10,7 @@
 import edu.ntnu.idi.idatt2003.gruppe42.Controller.PopupsController;
 import edu.ntnu.idi.idatt2003.gruppe42.Controller.TimeAndWeatherController;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.App;
+import edu.ntnu.idi.idatt2003.gruppe42.Model.Day;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Player;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Purchase;
 import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Sale;
@@ -164,6 +165,7 @@ private void wireWeekendRapport() {
     weekendRapportApp.getContinueButton().setOnAction(event -> {
       weekendRapportApp.getRoot().setVisible(false);
       desktopView.exitLayer(ModalLayer.RAPPORT);
+      timeAndWeatherController.setDay(0);
     });
   }