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 4e9f1bc77f02134b0d3e7da8602d6ffbc7737e9e..e9d59c3659f64342a8f08cad8c73ec4fbc15da7f 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java @@ -41,7 +41,7 @@ import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory; import no.ntnu.idatt1002.demo.data.Economics.IncomeRegister; public class IncomeExpenseController implements FinanceController { - + private final static String sumText = "Sum: "; @FXML private TableColumn<Expense, Double> expAmountCol; @@ -79,10 +79,10 @@ public class IncomeExpenseController implements FinanceController { private TableView<Income> incomeTableView; @FXML - private Text inSum; + private Label inSum; @FXML - private Text expSum; + private Label expSum; @FXML private MenuItem addExpense; @@ -164,9 +164,11 @@ 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())); + inSum.setText(sumText + String.valueOf(incomeRegister.getTotalSum())); + expSum.setText(sumText + String.valueOf(expenseRegister.getTotalSum())); + } private void setColumns() { @@ -287,10 +289,10 @@ public class IncomeExpenseController implements FinanceController { @Override public void refreshTableView() { this.income.setAll(incomeRegister.getItems()); - //this.sum.setText(String.valueOf(incomeRegister.getTotalSum())); + this.inSum.setText("Sum: " + String.valueOf(incomeRegister.getTotalSum())); this.expenses.setAll(expenseRegister.getItems()); - //this.sum.setText(String.valueOf(incomeRegister.getTotalSum())); + this.expSum.setText("Sum: " + String.valueOf(expenseRegister.getTotalSum())); } private void refreshPieCharts() { @@ -402,7 +404,7 @@ public class IncomeExpenseController implements FinanceController { // Show the Dialog and wait for the user to close it dialog.showAndWait(); - this.incomePieChart.setData(createIncomePieChart()); + incomePieChart.setData(createIncomePieChart()); } diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register index ec17f6ed2d4603e74ca8e338c12178108b19d29a..d86205273fb7085531f7ea54866f44e9ecfc706e 100644 --- a/src/main/resources/Economics/Expense.register +++ b/src/main/resources/Economics/Expense.register @@ -11,7 +11,7 @@ isRecurring=Not recurring category=OTHER date=2023-03-26 -amount=10.0 +amount=200.0 isRecurring=Not recurring category=FOOD diff --git a/src/main/resources/Economics/Income.register b/src/main/resources/Economics/Income.register index 80d6de630145291c7e1a9fd83856c885274554f2..b058ccdeba1d571bb6c65e5043018f3e2f538305 100644 --- a/src/main/resources/Economics/Income.register +++ b/src/main/resources/Economics/Income.register @@ -1,10 +1,11 @@ +date=2023-03-24 +description=studie +amount=1000.0 +isRecurring=Recurring +category=STUDENT_LOAN + date=2023-03-25 amount=100.0 isRecurring=Not recurring category=GIFT -date=2023-03-31 -amount=500.0 -isRecurring=Not recurring -category=SALARY -