Skip to content
Snippets Groups Projects
Commit f95d7d16 authored by Harry Linrui Xu's avatar Harry Linrui Xu
Browse files

Merge branch 'master' into 'frontend-testing'

parents 771a3cfd bb30da12
No related branches found
No related tags found
3 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
Pipeline #215868 failed
......@@ -174,6 +174,7 @@ public class IncomeExpenseController implements FinanceController {
refreshPieCharts();
refreshPieCharts();
refreshProgress();
formatDatePicker();
......@@ -252,7 +253,8 @@ public class IncomeExpenseController implements FinanceController {
* @param event A button click on the edit button.
*/
@Override
public void handleEditBtn(javafx.event.ActionEvent event) {
public void handleEditBtn(javafx.event.ActionEvent event) {
System.out.println(event.getSource());
Income chosenIncome = incomeTableView.getSelectionModel().getSelectedItem();
Expense chosenExpense = expenseTableView.getSelectionModel().getSelectedItem();
......
......@@ -42,6 +42,31 @@ public class Overview {
this.expenseRegister = expenseRegister;
this.budget = budget;
updateBalance();
this.budget = budget;
}
/**
* Get the IncomeRegister of the Overview.
* @return IncomeRegister
*/
public IncomeRegister getIncomeRegister() {
return incomeRegister;
}
/**
* Get the ExpenseRegister of the Overview.
* @return ExpenseRegister
*/
public ExpenseRegister getExpenseRegister() {
return expenseRegister;
}
/**
* Get the GeneralBudget of the Overview.
* @return GeneralBudget
*/
public GeneralBudget getBudget() {
return budget;
}
/**
......
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