diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java index 06439131ed6f66c4f5083fe64e0d7e99e0051cff..9a6e3245a2fb4e5e178fc317a886c558cf3da383 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java @@ -52,14 +52,11 @@ public class MainMenuController { @FXML private DatePicker date; - @FXML - private Button expenseBtn; - @FXML private Button foodBtn; @FXML - private Button incomeBtn; + private Button incomeExpenseBtn; @FXML private ProgressBar mainBar; @@ -126,6 +123,13 @@ public class MainMenuController { //Make calendar uneditable formatDatePicker(); + if (generalBudget.getDaysLeftOfBudgetPeriod() == 0) { + daysLeftLbl.setOpacity(0); + //Disable buttons once budget period has passed + foodBtn.setDisable(true); + incomeExpenseBtn.setDisable(true); + budgetBtn.setDisable(true); + } daysLeftLbl.setText("Days left of budget: " + generalBudget.getDaysLeftOfBudgetPeriod()); } @@ -303,9 +307,7 @@ public class MainMenuController { FXMLLoader loader = new FXMLLoader(); if (event.getSource() == foodBtn) { loader.setLocation(getClass().getResource("/view/SuggestRecipes.fxml")); - } else if (event.getSource() == expenseBtn) { - loader.setLocation(getClass().getResource("/view/IncomeAndExpenses.fxml")); - } else if (event.getSource() == incomeBtn) { + } else if (event.getSource() == incomeExpenseBtn) { loader.setLocation(getClass().getResource("/view/IncomeAndExpenses.fxml")); } else if (event.getSource() == budgetBtn) { loader.setLocation(getClass().getResource("/view/BudgetNewest.fxml")); diff --git a/src/main/resources/view/MainMenuNew.fxml b/src/main/resources/view/MainMenuNew.fxml index 5093e2d83672e711f441b684a672f81a95bcea22..5aaaddad5a000599caef4d860e97428dbc4285e6 100644 --- a/src/main/resources/view/MainMenuNew.fxml +++ b/src/main/resources/view/MainMenuNew.fxml @@ -127,7 +127,7 @@ <String fx:value="font" /> </styleClass> </Button> - <Button fx:id="incomeBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Income/expenses"> + <Button fx:id="incomeExpenseBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Income/expenses"> <graphic> <ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true"> <image>