Skip to content
Snippets Groups Projects
Commit 219018ce authored by Harry Linrui XU's avatar Harry Linrui XU
Browse files

Enabled filereading for tableview such that files can be loaded

parent 78b0ffb2
No related branches found
No related tags found
10 merge requests!43Merging frontend-testing into master,!38"Made progressbar dynamic in accordance to spending. Added balance field....,!37Made the sub progress bars respond to changes in expense,!32Added input validation to add dialog boxes.,!30Redesigned scenes,!29Redesigned scenes,!28Redesigned scenes,!26Redesigned Main menu and expense/income windows,!24Merging frontend-testing with master,!23Merging frontend-testing and master
...@@ -85,9 +85,7 @@ public class ExpensesController { ...@@ -85,9 +85,7 @@ public class ExpensesController {
show.setItems(filter); show.setItems(filter);
show.setValue("All"); show.setValue("All");
//expenseRegister = loadDataFromFile("wawawiwa"); expenseRegister = loadDataFromFile("Expense");
Expense newExpense = new Expense(99, true, ExpenseCategory.FOOD, "1/1/23");
expenseRegister.addItem(newExpense);
expenses = FXCollections.observableArrayList(expenseRegister.getItems()); expenses = FXCollections.observableArrayList(expenseRegister.getItems());
dateColumn.setCellValueFactory(new PropertyValueFactory<Expense, String>("date")); dateColumn.setCellValueFactory(new PropertyValueFactory<Expense, String>("date"));
...@@ -182,7 +180,11 @@ public class ExpensesController { ...@@ -182,7 +180,11 @@ public class ExpensesController {
if (fileHandling.isEmpty(fileName)) { if (fileHandling.isEmpty(fileName)) {
//expenseRegister = new ExpenseRegister(); //expenseRegister = new ExpenseRegister();
} else { } else {
try{
expenseRegister = fileHandling.readExpenseRegisterFromFile(fileName); expenseRegister = fileHandling.readExpenseRegisterFromFile(fileName);
} catch(IOException e) {
e.printStackTrace();
}
} }
return expenseRegister; return expenseRegister;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment