Added sum field under income and expense tables

src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java

@@ -42,6 +42,7 @@ 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 +80,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 +165,10 @@ 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(incomeRegister.getTotalSum()));
   }
 
   private void refreshPieCharts() {
@@ -402,8 +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());
   }
 
   @FXML

src/main/resources/view/IncomeAndExpenses.fxml

@@ -155,7 +155,7 @@
                               </ContextMenu>
                            </contextMenu>
                         </TableView>
-                        <Label text="Sum: ">
+                        <Label fx:id="inSum" text="Sum: ">
                            <font>
                               <Font name="Lucida Console" size="14.0" />
                            </font>
@@ -203,7 +203,7 @@
                               </ContextMenu>
                            </contextMenu>
                         </TableView>
-                        <Label text="Sum: ">
+                        <Label fx:id="expSum" text="Sum: ">
                            <font>
                               <Font name="Lucida Console" size="14.0" />
                            </font>