diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/model/App.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/model/App.java index ecc0e47..4b4d772 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/model/App.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/model/App.java @@ -12,7 +12,7 @@ public enum App { BANK("Bank"), SETTINGS("Settings"), FILEPICKER("File Picker"), - WEEKENDRAPPORT("Weekend Rapport"), + WEEKENDREPORT("Weekend Report"), WARNING("Warning"), GAMEOVER("Game Over"); diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/Popup.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/Popup.java index e4be32b..3f74d0d 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/Popup.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/Popup.java @@ -134,7 +134,7 @@ private void loadStylesheets() { case SETTINGS -> "/css/settings.css"; case STOCK -> "/css/stock.css"; case FILEPICKER -> "/css/filepicker.css"; - case WEEKENDRAPPORT -> "/css/rapport.css"; + case WEEKENDREPORT -> "/css/rapport.css"; case WARNING, GAMEOVER -> "/css/warning.css"; default -> null; }; @@ -143,7 +143,7 @@ private void loadStylesheets() { } // Some apps need receipt.css - if (type == App.STOCK || type == App.WEEKENDRAPPORT) { + if (type == App.STOCK || type == App.WEEKENDREPORT) { sheets.add("/css/receipt.css"); } diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/apps/WeekendReportApp.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/apps/WeekendReportApp.java index 1e2e9a9..fc50860 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/apps/WeekendReportApp.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/apps/WeekendReportApp.java @@ -47,7 +47,7 @@ public class WeekendReportApp extends Popup { *

Initializes the layout and binds the continue button to close/advance the report. */ public WeekendReportApp() { - super(740, 620, 0, 0, App.WEEKENDRAPPORT); + super(740, 620, 0, 0, App.WEEKENDREPORT); getCloseButton().setOnAction(event -> continueButton.fire()); diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/views/DesktopView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/views/DesktopView.java index b731713..5832074 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/views/DesktopView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/views/DesktopView.java @@ -313,7 +313,7 @@ private GridPane createGrid() { } private static boolean isDesktopApp(final App app) { - return app != App.WEEKENDRAPPORT + return app != App.WEEKENDREPORT && app != App.WARNING && app != App.GAMEOVER && app != App.SETTINGS