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 c9c1a5a0872c9a237d5690e404a4c9a1c7725691..d7dbaf99b0c09725e726bce848d07a9a6eb79251 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java @@ -23,6 +23,7 @@ import javafx.stage.Stage; import no.ntnu.idatt1002.demo.data.Economics.Expense; import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory; import no.ntnu.idatt1002.demo.data.Economics.ExpenseRegister; +import no.ntnu.idatt1002.demo.data.Economics.FileHandling; import no.ntnu.idatt1002.demo.view.ExpenseRepository; enum DialogMode { @@ -73,11 +74,13 @@ public class ExpensesController { @FXML public void initialize() { ObservableList<String> filter = FXCollections.observableArrayList("All", "Other", "Food"); - expenses = FXCollections.observableArrayList(expenseRegister.getItems()); - show.setItems(filter); show.setValue("All"); + + expenses = FXCollections.observableArrayList(expenseRegister.getItems()); + + dateColumn.setCellValueFactory(new PropertyValueFactory<Expense, String>("date")); amountColumn.setCellValueFactory(new PropertyValueFactory<Expense, Double>("amount")); categoryColumn.setCellValueFactory(new PropertyValueFactory<Expense, ExpenseCategory>("category")); @@ -153,6 +156,7 @@ public class ExpensesController { } public void loadDataFromFile(String fileName) { + FileHandling fileHandling = new FileHandling(); File file = new File(System.getProperty("user.dir") + "/src/main/resources/" + fileName + ".txt"); if (file.length() == 0) {