From 672d2783ea5820cacd89bd61b43ade1bf77d4772 Mon Sep 17 00:00:00 2001 From: Harry Linrui XU <xulr0820@hotmail.com> Date: Tue, 21 Mar 2023 17:39:06 +0100 Subject: [PATCH] Made the show combox provide options to choose from - All, food or other --- .../ntnu/idatt1002/demo/controller/ExpensesController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java index 488cab69..b6881e9c 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java @@ -73,6 +73,10 @@ public class ExpensesController { @FXML public void initialize() { + ObservableList<String> filter = FXCollections.observableArrayList("All", "Other", "Food"); + show.setItems(filter); + show.setValue("All"); + dateColumn.setCellValueFactory(new PropertyValueFactory<Expense, String>("date")); amountColumn.setCellValueFactory(new PropertyValueFactory<Expense, Double>("amount")); categoryColumn.setCellValueFactory(new PropertyValueFactory<Expense, ExpenseCategory>("category")); @@ -80,8 +84,7 @@ public class ExpensesController { recurringColumn.setCellValueFactory(new PropertyValueFactory<Expense, Boolean>("recurring")); expenseTableView.setItems(expenses); - ObservableList<String> filter = FXCollections.observableArrayList("All", "Other", "Food"); - show.setItems(filter); + } @FXML -- GitLab