Skip to content

rapport -> report #140

Merged
merged 1 commit into from
May 20, 2026
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ntnu/idi/idatt2003/gruppe42/view/Popup.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand All @@ -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");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class WeekendReportApp extends Popup {
* <p>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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down