"Added context menus to income and expenses"

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

@@ -113,6 +113,19 @@ public class IncomeExpenseController implements FinanceController {
 
   @FXML
   private Label title;
+
+  @FXML
+  private MenuItem editIncomeMenu;
+
+  @FXML
+  private MenuItem deleteIncomeMenu;
+
+  @FXML
+  private MenuItem editExpenseMenu;
+
+  @FXML
+  private MenuItem deleteExpenseMenu;
+
   private IncomeRegister incomeRegister;
 
   private ExpenseRegister expenseRegister;
@@ -232,23 +245,32 @@ 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();
 
-    if (event.getSource() == editBtn) {
-      if (chosenIncome!= null) {
+    System.out.println(chosenIncome);
+    System.out.println(chosenExpense);
+
+    if (chosenIncome != null) {
+      if (event.getSource() == editBtn || event.getSource() == editIncomeMenu) {
         handleEditIncome(chosenIncome);
-      } else if (chosenExpense != null) {
-        handleEditExpense(chosenExpense);
-      } else return;
-    } else if (event.getSource() == deleteBtn) {
-      if (chosenIncome != null) {
+        System.out.println(1);
+      } else if (event.getSource() == deleteIncomeMenu) {
         handleDeleteIncome(chosenIncome);
-      } else if (chosenExpense != null) {
+        System.out.println(2);
+      } else return;
+    } else if (chosenExpense != null) {
+      if (event.getSource() == editBtn || event.getSource() == editExpenseMenu) {
+        handleEditExpense(chosenExpense);
+        System.out.println(3);
+      } else if (event.getSource() == deleteExpenseMenu) {
         handleDeleteExpense(chosenExpense);
+        System.out.println(4);
       } else return;
-    }
+    } else return;
+
     //Updates the tableview and pie chart using the register
     refreshTableView();
     refreshPieCharts();

src/main/resources/view/IncomeAndExpenses.fxml

@@ -173,7 +173,8 @@
                            <contextMenu>
                               <ContextMenu>
                                 <items>
-                                  <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+                                    <MenuItem fx:id="editIncomeMenu" mnemonicParsing="false" onAction="#handleEditBtn" text="Edit" />
+                                    <MenuItem fx:id="deleteIncomeMenu" mnemonicParsing="false" onAction="#handleDeleteBtn" text="Delete " />
                                 </items>
                               </ContextMenu>
                            </contextMenu>
@@ -220,7 +221,8 @@
                            <contextMenu>
                               <ContextMenu>
                                 <items>
-                                  <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+                                    <MenuItem fx:id="editExpenseMenu" mnemonicParsing="false" onAction="#handleEditBtn" text="Edit" />
+                                    <MenuItem fx:id="deleteExpenseMenu" mnemonicParsing="false" onAction="#handleDeleteBtn" text="Delete" />
                                 </items>
                               </ContextMenu>
                            </contextMenu>