diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java index 45f7fdeac74a19b620c7ef5cc98788dd9c085d11..8c2469899488c3e184f24f40e81a8e7ff385ffec 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java @@ -1,5 +1,6 @@ package no.ntnu.idatt1002.demo.controller; +import java.time.LocalDate; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -60,6 +61,9 @@ public class BudgetController implements FinanceController { @FXML private Text sum; + @FXML + private DatePicker date; + @FXML private TableColumn<BudgetItem, Double> percentageColumn; @@ -85,6 +89,7 @@ public class BudgetController implements FinanceController { budgetList = FXCollections.observableArrayList(general.getBudgetItems()); budgetTableView.setItems(budgetList); + formatDatePicker(); //createBudgetPieChart(); //Initialize sum field under the tableview //sum.setText(String.valueOf(general.totalSum())); @@ -99,6 +104,16 @@ public class BudgetController implements FinanceController { ); } + /** + * Method for disabling the date picker, yet having its opacity at max. + */ + private void formatDatePicker() { + date.setValue(LocalDate.now()); + date.setDisable(true); + date.setStyle("-fx-opacity: 1"); + date.getEditor().setStyle("-fx-opacity: 1"); + } + @Override public void handleAddBtn(ActionEvent event) { handleEditBtn(event); @@ -189,7 +204,7 @@ public class BudgetController implements FinanceController { public void refreshTableView(){ this.budgetList.setAll(general.getBudgetItems()); //Refreshing the sum of the amounts of the budget - this.sum.setText(String.valueOf(general.totalSum())); + //this.sum.setText(String.valueOf(general.totalSum())); } /** diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java index 4b3014da6cee07ac96b5ecc93cb32f3b41f912de..0052c5d6274233f43796c2c4fa83c1be88eadb5e 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java @@ -2,6 +2,7 @@ package no.ntnu.idatt1002.demo.controller; import java.awt.event.ActionEvent; import java.io.IOException; +import java.time.LocalDate; import java.util.Optional; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -156,6 +157,7 @@ public class IncomeExpenseController implements FinanceController { refreshProgress(); + formatDatePicker(); //Initialize sum field under the tableview // inSum.setText(String.valueOf(incomeRegister.getTotalSum())); //expSum.setText(String.valueOf(expenseRegister.getTotalSum())); @@ -192,6 +194,15 @@ public class IncomeExpenseController implements FinanceController { ); } + /** + * Method for disabling the date picker, yet having its opacity at max. + */ + private void formatDatePicker() { + date.setValue(LocalDate.now()); + date.setDisable(true); + date.setStyle("-fx-opacity: 1"); + date.getEditor().setStyle("-fx-opacity: 1"); + } /** * Method for handling the adding of new entries in the tableview. * @param event A button click on the add button. diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java index c785b25ecb9d941d2dd6bbbafe44bfa3be1ee770..d19410de06d75d2a1e3c0e6071be913478ba298f 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java @@ -163,6 +163,7 @@ public class MainMenu { Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow(); Scene scene = new Scene(root); stage.setScene(scene); + stage.setResizable(false); stage.show(); } }