From dcf937278f35fddafea98ebaad517dd26bca1454 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Mon, 16 Oct 2023 22:22:24 +0800
Subject: [PATCH 01/20] Add Select View to GUI

Added a SelectView TextArea beside the internshipApplicationListView
---
 .../seedu/letsgethired/ui/MainWindow.java     | 10 ++++++++
 .../seedu/letsgethired/ui/SelectView.java     | 23 +++++++++++++++++++
 src/main/resources/view/DarkTheme.css         | 12 ++++++++++
 src/main/resources/view/MainWindow.fxml       | 21 ++++++++++++-----
 src/main/resources/view/SelectView.fxml       |  9 ++++++++
 5 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/seedu/letsgethired/ui/SelectView.java
 create mode 100644 src/main/resources/view/SelectView.fxml

diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index cf48219e3cd..e2cce30ed05 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -8,6 +8,7 @@
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import seedu.letsgethired.commons.core.GuiSettings;
@@ -41,6 +42,12 @@ public class MainWindow extends UiPart<Stage> {
     @FXML
     private MenuItem helpMenuItem;
 
+    @FXML
+    private HBox panelPlaceholder;
+
+    @FXML
+    private StackPane selectViewPlaceholder;
+
     @FXML
     private StackPane internApplicationListPanelPlaceholder;
 
@@ -121,6 +128,9 @@ void fillInnerParts() {
 
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
+
+        SelectView selectView = new SelectView();
+        selectViewPlaceholder.getChildren().add(selectView.getRoot());
     }
 
     /**
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
new file mode 100644
index 00000000000..80591a46a61
--- /dev/null
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -0,0 +1,23 @@
+package seedu.letsgethired.ui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.Region;
+
+import static java.util.Objects.requireNonNull;
+
+public class SelectView extends UiPart<Region>{
+    private static final String FXML = "SelectView.fxml";
+    @FXML
+    private TextArea selectView;
+
+    public SelectView() {
+        super(FXML);
+        selectView.setText("This is the select view");
+    }
+
+    public void setNotesOfCard(String notes) {
+        requireNonNull(notes);
+        selectView.setText(notes);
+    }
+}
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 36e6b001cd8..c0e5220e1fa 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -153,6 +153,13 @@
     -fx-text-fill: white;
 }
 
+.select-view {
+    -fx-background-color: transparent;
+    -fx-font-family: "Segoe UI Light";
+    -fx-font-size: 13pt;
+    -fx-text-fill: white;
+}
+
 .result-display .label {
     -fx-text-fill: black !important;
 }
@@ -337,6 +344,11 @@
     -fx-background-radius: 0;
 }
 
+#selectView .content {
+    -fx-background-color: transparent, #383838, transparent, #383838;
+    -fx-background-radius: 0;
+}
+
 #tags {
     -fx-hgap: 7;
     -fx-vgap: 3;
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index edf93b39e09..754101168ce 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -11,6 +11,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
+<?import javafx.scene.layout.HBox?>
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
          title="LetsGetHired" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
   <icons>
@@ -45,13 +46,21 @@
             <Insets top="5" right="10" bottom="5" left="10" />
           </padding>
         </StackPane>
+        <HBox VBox.vgrow="ALWAYS" alignment="CENTER" styleClass="pane-with-border">
+          <VBox VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="internApplicationList" styleClass="pane-with-border">
+            <padding>
+              <Insets top="10" right="10" bottom="10" left="10" />
+            </padding>
+            <StackPane fx:id="internApplicationListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
+          </VBox>
 
-        <VBox fx:id="internApplicationList" styleClass="pane-with-border" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
-          <padding>
-            <Insets top="10" right="10" bottom="10" left="10" />
-          </padding>
-          <StackPane fx:id="internApplicationListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
-        </VBox>
+          <StackPane VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="selectViewPlaceholder" styleClass="pane-with-border">
+            <padding>
+              <Insets top="5" right="10" bottom="5" left="10" />
+            </padding>
+          </StackPane>
+
+        </HBox>
 
         <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
       </VBox>
diff --git a/src/main/resources/view/SelectView.fxml b/src/main/resources/view/SelectView.fxml
new file mode 100644
index 00000000000..3531eb00795
--- /dev/null
+++ b/src/main/resources/view/SelectView.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.StackPane?>
+
+<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/17"
+           xmlns:fx="http://javafx.com/fxml/1">
+    <TextArea fx:id="selectView" editable="false" styleClass="select-view"/>
+</StackPane>

From 6b5c7efae54ffebda8b41b8b792d59c5c7e0babe Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Tue, 17 Oct 2023 00:56:28 +0800
Subject: [PATCH 02/20] Integrate View Command with Select View

Added the logic to make SelectView update whenever a view command is
invoked
---
 .../logic/commands/CommandResult.java         | 23 ++++++++++++++++---
 .../logic/commands/ExitCommand.java           |  2 +-
 .../logic/commands/HelpCommand.java           |  2 +-
 .../logic/commands/ViewCommand.java           |  2 +-
 .../seedu/letsgethired/ui/MainWindow.java     | 12 +++++++++-
 .../seedu/letsgethired/ui/SelectView.java     |  1 -
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
index 4a76a28b419..9f80eae7dbe 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
@@ -19,13 +19,24 @@ public class CommandResult {
     /** The application should exit. */
     private final boolean exit;
 
+    private final String notesToUser;
+
     /**
      * Constructs a {@code CommandResult} with the specified fields.
      */
-    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit, String notesToUser) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
         this.showHelp = showHelp;
         this.exit = exit;
+        this.notesToUser = notesToUser;
+    }
+
+    /**
+     * Constructs a {@code CommandResult} with the specified {@code feedbackToUser} and {@code notesToUser},
+     * and other fields set to their default value.
+     */
+    public CommandResult(String feedbackToUser, String notesToUser) {
+        this(feedbackToUser, false, false, notesToUser);
     }
 
     /**
@@ -33,13 +44,17 @@ public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
      * and other fields set to their default value.
      */
     public CommandResult(String feedbackToUser) {
-        this(feedbackToUser, false, false);
+        this(feedbackToUser, false, false, "");
     }
 
     public String getFeedbackToUser() {
         return feedbackToUser;
     }
 
+    public String getNotesToUser() {
+        return notesToUser;
+    }
+
     public boolean isShowHelp() {
         return showHelp;
     }
@@ -62,7 +77,8 @@ public boolean equals(Object other) {
         CommandResult otherCommandResult = (CommandResult) other;
         return feedbackToUser.equals(otherCommandResult.feedbackToUser)
                 && showHelp == otherCommandResult.showHelp
-                && exit == otherCommandResult.exit;
+                && exit == otherCommandResult.exit
+                && notesToUser.equals(otherCommandResult.notesToUser);
     }
 
     @Override
@@ -76,6 +92,7 @@ public String toString() {
                 .add("feedbackToUser", feedbackToUser)
                 .add("showHelp", showHelp)
                 .add("exit", exit)
+                .add("notesToUser", notesToUser)
                 .toString();
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
index 7012f94585e..2a129c4209d 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "");
     }
 
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
index 438d479c257..b8c3aa4e5d6 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+        return new CommandResult(SHOWING_HELP_MESSAGE, true, false, "");
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
index 39eba1dfa32..ff7256e4695 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
@@ -44,7 +44,7 @@ public CommandResult execute(Model model) throws CommandException {
         InternApplication internApplicationToView = lastShownList.get(targetIndex.getZeroBased());
         model.setCurrentInternApplication(internApplicationToView);
         return new CommandResult(String.format(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView)));
+                Messages.format(internApplicationToView)), "this is a placeholder for the returned string from notes command");
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index e2cce30ed05..3aedfb51f2c 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -34,6 +34,7 @@ public class MainWindow extends UiPart<Stage> {
     // Independent Ui parts residing in this Ui container
     private InternApplicationListPanel internApplicationListPanel;
     private ResultDisplay resultDisplay;
+    private SelectView selectView;
     private HelpWindow helpWindow;
 
     @FXML
@@ -129,7 +130,7 @@ void fillInnerParts() {
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
 
-        SelectView selectView = new SelectView();
+        selectView = new SelectView();
         selectViewPlaceholder.getChildren().add(selectView.getRoot());
     }
 
@@ -157,6 +158,14 @@ public void handleHelp() {
         }
     }
 
+    /**
+     * Displays the notes of a selected application onto the SelectView widget
+     */
+    @FXML
+    public void handleNotes() {
+        selectView.setNotesOfCard("");
+    }
+
     void show() {
         primaryStage.show();
     }
@@ -187,6 +196,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
+            selectView.setNotesOfCard(commandResult.getNotesToUser());
 
             if (commandResult.isShowHelp()) {
                 handleHelp();
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index 80591a46a61..127a464a32f 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -13,7 +13,6 @@ public class SelectView extends UiPart<Region>{
 
     public SelectView() {
         super(FXML);
-        selectView.setText("This is the select view");
     }
 
     public void setNotesOfCard(String notes) {

From c2df269ffb849f16b44a16952837ca4406821f87 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Tue, 17 Oct 2023 01:34:52 +0800
Subject: [PATCH 03/20] Add InternApplication OnMouseClick functionality

Users will be able to view notes by simply clicking on the
InternApplicationCard in the panel
---
 .../letsgethired/ui/InternApplicationListPanel.java    |  6 +++++-
 src/main/java/seedu/letsgethired/ui/MainWindow.java    | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 604a729404f..ee231408704 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -23,10 +23,14 @@ public class InternApplicationListPanel extends UiPart<Region> {
     /**
      * Creates a {@code InternApplicationListPanel} with the given {@code ObservableList}.
      */
-    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList) {
+    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList, SelectView selectView) {
         super(FXML);
         internApplicationListView.setItems(internApplicationList);
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
+        internApplicationListView.setOnMouseClicked(e -> {
+            //arguments to be replaced with notes inside the model
+            selectView.setNotesOfCard(internApplicationListView.getSelectionModel().getSelectedItem().toString());
+        });
     }
 
     /**
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 3aedfb51f2c..44686f76aa5 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -118,7 +118,12 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
      * Fills up all the placeholders of this window.
      */
     void fillInnerParts() {
-        internApplicationListPanel = new InternApplicationListPanel(logic.getFilteredInternApplicationList());
+        selectView = new SelectView();
+        selectViewPlaceholder.getChildren().add(selectView.getRoot());
+
+        internApplicationListPanel = new InternApplicationListPanel(
+                logic.getFilteredInternApplicationList(),
+                selectView);
         internApplicationListPanelPlaceholder.getChildren().add(internApplicationListPanel.getRoot());
 
         resultDisplay = new ResultDisplay();
@@ -129,9 +134,6 @@ void fillInnerParts() {
 
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
-
-        selectView = new SelectView();
-        selectViewPlaceholder.getChildren().add(selectView.getRoot());
     }
 
     /**

From 731d4ecbc293eec9fb17cd6b370b0539b1595389 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Tue, 17 Oct 2023 01:45:32 +0800
Subject: [PATCH 04/20] Fix CheckStyles

---
 .../letsgethired/logic/commands/ViewCommand.java |  3 ++-
 .../java/seedu/letsgethired/ui/SelectView.java   | 12 +++++++++---
 .../logic/commands/CommandResultTest.java        | 16 ++++++++++------
 .../logic/commands/ExitCommandTest.java          |  3 ++-
 .../logic/commands/HelpCommandTest.java          |  3 ++-
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
index ff7256e4695..f2f5fc45b3b 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
@@ -44,7 +44,8 @@ public CommandResult execute(Model model) throws CommandException {
         InternApplication internApplicationToView = lastShownList.get(targetIndex.getZeroBased());
         model.setCurrentInternApplication(internApplicationToView);
         return new CommandResult(String.format(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView)), "this is a placeholder for the returned string from notes command");
+                Messages.format(internApplicationToView)),
+                "this is a placeholder for the returned string from notes command");
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index 127a464a32f..4ba2f4e46a4 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -1,16 +1,22 @@
 package seedu.letsgethired.ui;
 
+import static java.util.Objects.requireNonNull;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.Region;
 
-import static java.util.Objects.requireNonNull;
-
-public class SelectView extends UiPart<Region>{
+/**
+ * A ui for the select view that displays the notes of a selected application.
+ */
+public class SelectView extends UiPart<Region> {
     private static final String FXML = "SelectView.fxml";
     @FXML
     private TextArea selectView;
 
+    /**
+     * Creates a {@code SelectView}.
+     */
     public SelectView() {
         super(FXML);
     }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index cc2bc828aa5..3ff28968412 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -14,7 +14,7 @@ public void equals() {
 
         // same values -> returns true
         assertTrue(commandResult.equals(new CommandResult("feedback")));
-        assertTrue(commandResult.equals(new CommandResult("feedback", false, false)));
+        assertTrue(commandResult.equals(new CommandResult("feedback", false, false, "")));
 
         // same object -> returns true
         assertTrue(commandResult.equals(commandResult));
@@ -29,10 +29,12 @@ public void equals() {
         assertFalse(commandResult.equals(new CommandResult("different")));
 
         // different showHelp value -> returns false
-        assertFalse(commandResult.equals(new CommandResult("feedback", true, false)));
+        assertFalse(commandResult.equals(
+                new CommandResult("feedback", true, false, "")));
 
         // different exit value -> returns false
-        assertFalse(commandResult.equals(new CommandResult("feedback", false, true)));
+        assertFalse(commandResult.equals(
+                new CommandResult("feedback", false, true, "")));
     }
 
     @Test
@@ -46,10 +48,12 @@ public void hashcode() {
         assertNotEquals(commandResult.hashCode(), new CommandResult("different").hashCode());
 
         // different showHelp value -> returns different hashcode
-        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false).hashCode());
+        assertNotEquals(commandResult.hashCode(),
+                new CommandResult("feedback", true, false, "").hashCode());
 
         // different exit value -> returns different hashcode
-        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true).hashCode());
+        assertNotEquals(commandResult.hashCode(),
+                new CommandResult("feedback", false, true, "").hashCode());
     }
 
     @Test
@@ -57,7 +61,7 @@ public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
                 + commandResult.getFeedbackToUser() + ", showHelp=" + commandResult.isShowHelp()
-                + ", exit=" + commandResult.isExit() + "}";
+                + ", exit=" + commandResult.isExit() + ", notesToUser=" + commandResult.getNotesToUser() + "}";
         assertEquals(expected, commandResult.toString());
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
index e15387ee170..9819236046e 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
@@ -14,7 +14,8 @@ public class ExitCommandTest {
 
     @Test
     public void execute_exit_success() {
-        CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        CommandResult expectedCommandResult =
+                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "");
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
index 98a73aad8ae..ac3cc1d7ecb 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
@@ -14,7 +14,8 @@ public class HelpCommandTest {
 
     @Test
     public void execute_help_success() {
-        CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+        CommandResult expectedCommandResult =
+                new CommandResult(SHOWING_HELP_MESSAGE, true, false, "");
         assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
     }
 }

From 9e54e8491381f7dac58215dd0a7651400a292a7d Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Wed, 18 Oct 2023 12:33:02 +0800
Subject: [PATCH 05/20] More consistent method name and test cases for notes

Change setNotesOfCard to displayNotes
Add test cases for commandResult with notes
---
 .../letsgethired/ui/InternApplicationListPanel.java   |  2 +-
 src/main/java/seedu/letsgethired/ui/MainWindow.java   |  4 ++--
 src/main/java/seedu/letsgethired/ui/SelectView.java   |  2 +-
 .../logic/commands/CommandResultTest.java             | 11 ++++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index ee231408704..24f0f9f8866 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -29,7 +29,7 @@ public InternApplicationListPanel(ObservableList<InternApplication> internApplic
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
         internApplicationListView.setOnMouseClicked(e -> {
             //arguments to be replaced with notes inside the model
-            selectView.setNotesOfCard(internApplicationListView.getSelectionModel().getSelectedItem().toString());
+            selectView.displayNotes(internApplicationListView.getSelectionModel().getSelectedItem().toString());
         });
     }
 
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 44686f76aa5..3fe76c83231 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -165,7 +165,7 @@ public void handleHelp() {
      */
     @FXML
     public void handleNotes() {
-        selectView.setNotesOfCard("");
+        selectView.displayNotes("");
     }
 
     void show() {
@@ -198,7 +198,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
-            selectView.setNotesOfCard(commandResult.getNotesToUser());
+            selectView.displayNotes(commandResult.getNotesToUser());
 
             if (commandResult.isShowHelp()) {
                 handleHelp();
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index 4ba2f4e46a4..ebf4314cd97 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -21,7 +21,7 @@ public SelectView() {
         super(FXML);
     }
 
-    public void setNotesOfCard(String notes) {
+    public void displayNotes(String notes) {
         requireNonNull(notes);
         selectView.setText(notes);
     }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index 3ff28968412..8bc9bb1a7b5 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -11,10 +11,13 @@ public class CommandResultTest {
     @Test
     public void equals() {
         CommandResult commandResult = new CommandResult("feedback");
+        CommandResult commandResultWithNotes = new CommandResult("feedback",
+                false, false, "notes");
 
         // same values -> returns true
         assertTrue(commandResult.equals(new CommandResult("feedback")));
-        assertTrue(commandResult.equals(new CommandResult("feedback", false, false, "")));
+        assertTrue(commandResult.equals(new CommandResult("feedback",
+                false, false, "")));
 
         // same object -> returns true
         assertTrue(commandResult.equals(commandResult));
@@ -28,6 +31,12 @@ public void equals() {
         // different feedbackToUser value -> returns false
         assertFalse(commandResult.equals(new CommandResult("different")));
 
+        // different notesToUser value -> returns false
+        assertFalse(commandResultWithNotes.equals(new CommandResult("feedback",
+                false, false, "different")));
+        assertFalse(commandResult.equals(new CommandResult("feedback",
+                false, false, "different")));
+
         // different showHelp value -> returns false
         assertFalse(commandResult.equals(
                 new CommandResult("feedback", true, false, "")));

From 6873112a070bb138d2e621bfd37451f3456cc4fb Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Wed, 18 Oct 2023 16:08:41 +0800
Subject: [PATCH 06/20] Add Delete Entry Button

---
 .../ui/InternApplicationListPanel.java        | 19 +++++-
 .../seedu/letsgethired/ui/MainWindow.java     |  6 ++
 .../letsgethired/ui/UtilityButtonBar.java     | 59 +++++++++++++++++++
 src/main/resources/view/DarkTheme.css         |  9 +++
 src/main/resources/view/MainWindow.fxml       | 17 ++++--
 src/main/resources/view/UtilityButtonBar.fxml | 14 +++++
 6 files changed, 118 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
 create mode 100644 src/main/resources/view/UtilityButtonBar.fxml

diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 24f0f9f8866..ab4326a11f5 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -3,6 +3,8 @@
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
@@ -29,7 +31,7 @@ public InternApplicationListPanel(ObservableList<InternApplication> internApplic
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
         internApplicationListView.setOnMouseClicked(e -> {
             //arguments to be replaced with notes inside the model
-            selectView.displayNotes(internApplicationListView.getSelectionModel().getSelectedItem().toString());
+            selectView.displayNotes(this.getSelectedItem().toString());
         });
     }
 
@@ -51,4 +53,19 @@ protected void updateItem(InternApplication internApplication, boolean empty) {
         }
     }
 
+    /**
+     * Gets selected Intern Application from the list panel
+     * @return Selected InternApplication from the list
+     */
+    public InternApplication getSelectedItem() {
+        return internApplicationListView.getSelectionModel().getSelectedItem();
+    }
+
+    /**
+     * Gets index of selected Intern Application from the list panel
+     * @return Index of selected InternApplication from the list
+     */
+    public int getSelectedItemIndex() {
+        return internApplicationListView.getSelectionModel().getSelectedIndex();
+    }
 }
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 3fe76c83231..81ec0afb4d3 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -58,6 +58,9 @@ public class MainWindow extends UiPart<Stage> {
     @FXML
     private StackPane statusbarPlaceholder;
 
+    @FXML
+    private StackPane buttonbarPlaceholder;
+
     /**
      * Creates a {@code MainWindow} with the given {@code Stage} and {@code Logic}.
      */
@@ -134,6 +137,9 @@ void fillInnerParts() {
 
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
+
+        UtilityButtonBar buttonBar = new UtilityButtonBar(internApplicationListPanel, this:: executeCommand);
+        buttonbarPlaceholder.getChildren().add(buttonBar.getRoot());
     }
 
     /**
diff --git a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
new file mode 100644
index 00000000000..781d047610d
--- /dev/null
+++ b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
@@ -0,0 +1,59 @@
+package seedu.letsgethired.ui;
+
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ListView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import seedu.letsgethired.commons.core.LogsCenter;
+import seedu.letsgethired.logic.commands.CommandResult;
+import seedu.letsgethired.logic.commands.exceptions.CommandException;
+import seedu.letsgethired.logic.parser.exceptions.ParseException;
+import seedu.letsgethired.model.application.InternApplication;
+
+import java.util.Optional;
+import java.util.logging.Logger;
+
+public class UtilityButtonBar extends UiPart<Region> {
+    private static final String FXML = "UtilityButtonBar.fxml";
+    private final CommandExecutor commandExecutor;
+    private final InternApplicationListPanel listPanel;
+    @FXML
+    Button deleteNotesButton;
+
+    public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor commandExecutor) {
+        super(FXML);
+        this.commandExecutor = commandExecutor;
+        this.listPanel = listPanel;
+        deleteNotesButton.setOnMouseClicked(onDeleteClick);
+    }
+
+    EventHandler<MouseEvent> onDeleteClick = new EventHandler<>() {
+        @Override
+        public void handle(MouseEvent event) {
+            int itemIndex = listPanel.getSelectedItemIndex();
+            String commandText = "delete " + itemIndex;
+            try {
+                commandExecutor.execute(commandText);
+            } catch (CommandException | ParseException e) {
+                //should never reach here unless the hard-coded input is wrong
+            }
+        }
+    };
+
+    /**
+     * Represents a function that can execute commands.
+     */
+    @FunctionalInterface
+    public interface CommandExecutor {
+        /**
+         * Executes the command and returns the result.
+         *
+         * @see seedu.letsgethired.logic.Logic#execute(String)
+         */
+        CommandResult execute(String commandText) throws CommandException, ParseException;
+    }
+}
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index c0e5220e1fa..abcf2a8627a 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -160,6 +160,10 @@
     -fx-text-fill: white;
 }
 
+.button-bar {
+    -fx-background-color: transparent;
+}
+
 .result-display .label {
     -fx-text-fill: black !important;
 }
@@ -345,6 +349,11 @@
 }
 
 #selectView .content {
+    -fx-background-color: transparent, #383838, transparent, #383838;
+    -fx-border-width: 0;
+}
+
+#buttonBar .content {
     -fx-background-color: transparent, #383838, transparent, #383838;
     -fx-background-radius: 0;
 }
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 754101168ce..b261a97830c 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -54,12 +54,19 @@
             <StackPane fx:id="internApplicationListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
           </VBox>
 
-          <StackPane VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="selectViewPlaceholder" styleClass="pane-with-border">
-            <padding>
-              <Insets top="5" right="10" bottom="5" left="10" />
-            </padding>
-          </StackPane>
+          <VBox VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" styleClass="pane-with-border">
+            <StackPane VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="selectViewPlaceholder" styleClass="pane-with-border">
+              <padding>
+                <Insets top="5" right="10" bottom="5" left="10" />
+              </padding>
+            </StackPane>
 
+            <StackPane VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" fx:id="buttonbarPlaceholder" styleClass="pane-with-border">
+              <padding>
+                <Insets top="5" right="10" bottom="5" left="10" />
+              </padding>
+            </StackPane>
+          </VBox>
         </HBox>
 
         <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
diff --git a/src/main/resources/view/UtilityButtonBar.fxml b/src/main/resources/view/UtilityButtonBar.fxml
new file mode 100644
index 00000000000..581f3c38b10
--- /dev/null
+++ b/src/main/resources/view/UtilityButtonBar.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<?import java.lang.Double?>
+<GridPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+    <HBox styleClass="button-bar" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
+        <Button HBox.hgrow="ALWAYS" fx:id="deleteNotesButton" text="Delete Entry">
+            <maxHeight><Double fx:constant="MAX_VALUE" /></maxHeight>
+            <maxWidth><Double fx:constant="MAX_VALUE" /></maxWidth>
+        </Button>
+    </HBox>
+</GridPane>

From b76c1aebdd73045d6be045149d0820532e2fee98 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 02:16:51 +0800
Subject: [PATCH 07/20] Change Details display on SelectView

---
 .../logic/commands/CommandResult.java         | 23 ++-----------
 .../logic/commands/ExitCommand.java           |  2 +-
 .../logic/commands/HelpCommand.java           |  2 +-
 .../logic/commands/ViewCommand.java           |  3 +-
 .../ui/InternApplicationListPanel.java        |  5 +--
 .../seedu/letsgethired/ui/MainWindow.java     |  9 -----
 .../seedu/letsgethired/ui/SelectView.java     | 16 +++++++--
 .../letsgethired/ui/UtilityButtonBar.java     | 33 +++++++++----------
 .../logic/commands/CommandResultTest.java     | 20 +++--------
 .../logic/commands/ExitCommandTest.java       |  2 +-
 .../logic/commands/HelpCommandTest.java       |  2 +-
 11 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
index 9f80eae7dbe..4a76a28b419 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
@@ -19,24 +19,13 @@ public class CommandResult {
     /** The application should exit. */
     private final boolean exit;
 
-    private final String notesToUser;
-
     /**
      * Constructs a {@code CommandResult} with the specified fields.
      */
-    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit, String notesToUser) {
+    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
         this.showHelp = showHelp;
         this.exit = exit;
-        this.notesToUser = notesToUser;
-    }
-
-    /**
-     * Constructs a {@code CommandResult} with the specified {@code feedbackToUser} and {@code notesToUser},
-     * and other fields set to their default value.
-     */
-    public CommandResult(String feedbackToUser, String notesToUser) {
-        this(feedbackToUser, false, false, notesToUser);
     }
 
     /**
@@ -44,17 +33,13 @@ public CommandResult(String feedbackToUser, String notesToUser) {
      * and other fields set to their default value.
      */
     public CommandResult(String feedbackToUser) {
-        this(feedbackToUser, false, false, "");
+        this(feedbackToUser, false, false);
     }
 
     public String getFeedbackToUser() {
         return feedbackToUser;
     }
 
-    public String getNotesToUser() {
-        return notesToUser;
-    }
-
     public boolean isShowHelp() {
         return showHelp;
     }
@@ -77,8 +62,7 @@ public boolean equals(Object other) {
         CommandResult otherCommandResult = (CommandResult) other;
         return feedbackToUser.equals(otherCommandResult.feedbackToUser)
                 && showHelp == otherCommandResult.showHelp
-                && exit == otherCommandResult.exit
-                && notesToUser.equals(otherCommandResult.notesToUser);
+                && exit == otherCommandResult.exit;
     }
 
     @Override
@@ -92,7 +76,6 @@ public String toString() {
                 .add("feedbackToUser", feedbackToUser)
                 .add("showHelp", showHelp)
                 .add("exit", exit)
-                .add("notesToUser", notesToUser)
                 .toString();
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
index 2a129c4209d..7012f94585e 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "");
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
     }
 
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
index b8c3aa4e5d6..438d479c257 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(SHOWING_HELP_MESSAGE, true, false, "");
+        return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
index f2f5fc45b3b..39eba1dfa32 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
@@ -44,8 +44,7 @@ public CommandResult execute(Model model) throws CommandException {
         InternApplication internApplicationToView = lastShownList.get(targetIndex.getZeroBased());
         model.setCurrentInternApplication(internApplicationToView);
         return new CommandResult(String.format(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView)),
-                "this is a placeholder for the returned string from notes command");
+                Messages.format(internApplicationToView)));
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index ab4326a11f5..148a506a6bd 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -3,8 +3,6 @@
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
@@ -30,8 +28,7 @@ public InternApplicationListPanel(ObservableList<InternApplication> internApplic
         internApplicationListView.setItems(internApplicationList);
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
         internApplicationListView.setOnMouseClicked(e -> {
-            //arguments to be replaced with notes inside the model
-            selectView.displayNotes(this.getSelectedItem().toString());
+            selectView.displayDetails(getSelectedItem());
         });
     }
 
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 81ec0afb4d3..fe9e0a08211 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -166,14 +166,6 @@ public void handleHelp() {
         }
     }
 
-    /**
-     * Displays the notes of a selected application onto the SelectView widget
-     */
-    @FXML
-    public void handleNotes() {
-        selectView.displayNotes("");
-    }
-
     void show() {
         primaryStage.show();
     }
@@ -204,7 +196,6 @@ private CommandResult executeCommand(String commandText) throws CommandException
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
-            selectView.displayNotes(commandResult.getNotesToUser());
 
             if (commandResult.isShowHelp()) {
                 handleHelp();
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index ebf4314cd97..078bb7dfe6e 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -5,6 +5,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.Region;
+import seedu.letsgethired.model.application.InternApplication;
 
 /**
  * A ui for the select view that displays the notes of a selected application.
@@ -21,8 +22,17 @@ public SelectView() {
         super(FXML);
     }
 
-    public void displayNotes(String notes) {
-        requireNonNull(notes);
-        selectView.setText(notes);
+    /**
+     * Sets detail text onto the select view text area
+     * @param entry the intern application to be viewed
+     */
+    public void displayDetails(InternApplication entry) {
+        requireNonNull(entry);
+        String details = "Company: " + entry.getCompany().toString() + "\n"
+                + "Role:" + entry.getRole().toString() + "\n"
+                + "Cycle:" + entry.getCycle().toString() + "\n"
+                + "Status:" + entry.getStatus().toString() + "\n"
+                + "Additional Notes:\n" + entry.getNote().toString();
+        selectView.setText(details);
     }
 }
diff --git a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
index 781d047610d..cf3a0acac4d 100644
--- a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
+++ b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
@@ -1,37 +1,26 @@
 package seedu.letsgethired.ui;
 
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
+
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
-import seedu.letsgethired.commons.core.LogsCenter;
 import seedu.letsgethired.logic.commands.CommandResult;
 import seedu.letsgethired.logic.commands.exceptions.CommandException;
 import seedu.letsgethired.logic.parser.exceptions.ParseException;
-import seedu.letsgethired.model.application.InternApplication;
-
-import java.util.Optional;
-import java.util.logging.Logger;
 
+/**
+ * A ui for utility buttons below the select view
+ */
 public class UtilityButtonBar extends UiPart<Region> {
     private static final String FXML = "UtilityButtonBar.fxml";
     private final CommandExecutor commandExecutor;
     private final InternApplicationListPanel listPanel;
     @FXML
-    Button deleteNotesButton;
-
-    public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor commandExecutor) {
-        super(FXML);
-        this.commandExecutor = commandExecutor;
-        this.listPanel = listPanel;
-        deleteNotesButton.setOnMouseClicked(onDeleteClick);
-    }
+    private Button deleteNotesButton;
 
-    EventHandler<MouseEvent> onDeleteClick = new EventHandler<>() {
+    private EventHandler<MouseEvent> onDeleteClick = new EventHandler<>() {
         @Override
         public void handle(MouseEvent event) {
             int itemIndex = listPanel.getSelectedItemIndex();
@@ -44,6 +33,16 @@ public void handle(MouseEvent event) {
         }
     };
 
+    /**
+     * Creates a {@code UtilityButtonBar}.
+     */
+    public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor commandExecutor) {
+        super(FXML);
+        this.commandExecutor = commandExecutor;
+        this.listPanel = listPanel;
+        deleteNotesButton.setOnMouseClicked(onDeleteClick);
+    }
+
     /**
      * Represents a function that can execute commands.
      */
diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index 8bc9bb1a7b5..cd4a83bdb6f 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -11,13 +11,9 @@ public class CommandResultTest {
     @Test
     public void equals() {
         CommandResult commandResult = new CommandResult("feedback");
-        CommandResult commandResultWithNotes = new CommandResult("feedback",
-                false, false, "notes");
 
         // same values -> returns true
         assertTrue(commandResult.equals(new CommandResult("feedback")));
-        assertTrue(commandResult.equals(new CommandResult("feedback",
-                false, false, "")));
 
         // same object -> returns true
         assertTrue(commandResult.equals(commandResult));
@@ -31,19 +27,13 @@ public void equals() {
         // different feedbackToUser value -> returns false
         assertFalse(commandResult.equals(new CommandResult("different")));
 
-        // different notesToUser value -> returns false
-        assertFalse(commandResultWithNotes.equals(new CommandResult("feedback",
-                false, false, "different")));
-        assertFalse(commandResult.equals(new CommandResult("feedback",
-                false, false, "different")));
-
         // different showHelp value -> returns false
         assertFalse(commandResult.equals(
-                new CommandResult("feedback", true, false, "")));
+                new CommandResult("feedback", true, false)));
 
         // different exit value -> returns false
         assertFalse(commandResult.equals(
-                new CommandResult("feedback", false, true, "")));
+                new CommandResult("feedback", false, true)));
     }
 
     @Test
@@ -58,11 +48,11 @@ public void hashcode() {
 
         // different showHelp value -> returns different hashcode
         assertNotEquals(commandResult.hashCode(),
-                new CommandResult("feedback", true, false, "").hashCode());
+                new CommandResult("feedback", true, false).hashCode());
 
         // different exit value -> returns different hashcode
         assertNotEquals(commandResult.hashCode(),
-                new CommandResult("feedback", false, true, "").hashCode());
+                new CommandResult("feedback", false, true).hashCode());
     }
 
     @Test
@@ -70,7 +60,7 @@ public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
                 + commandResult.getFeedbackToUser() + ", showHelp=" + commandResult.isShowHelp()
-                + ", exit=" + commandResult.isExit() + ", notesToUser=" + commandResult.getNotesToUser() + "}";
+                + ", exit=" + commandResult.isExit() + "}";
         assertEquals(expected, commandResult.toString());
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
index 9819236046e..017585f3b06 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
@@ -15,7 +15,7 @@ public class ExitCommandTest {
     @Test
     public void execute_exit_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "");
+                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
index ac3cc1d7ecb..5c373aa6630 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
@@ -15,7 +15,7 @@ public class HelpCommandTest {
     @Test
     public void execute_help_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(SHOWING_HELP_MESSAGE, true, false, "");
+                new CommandResult(SHOWING_HELP_MESSAGE, true, false);
         assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
     }
 }

From e5af2d7f483caa72c0c8e50f89f55f08a9624271 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 03:25:59 +0800
Subject: [PATCH 08/20] Fix View Command bug

---
 .../logic/commands/CommandResult.java         | 25 +++++++++--
 .../logic/commands/ExitCommand.java           |  2 +-
 .../logic/commands/HelpCommand.java           |  2 +-
 .../logic/commands/ViewCommand.java           |  7 +++-
 .../ui/InternApplicationListPanel.java        | 42 ++++++++++++++++---
 .../seedu/letsgethired/ui/MainWindow.java     |  3 +-
 .../seedu/letsgethired/ui/SelectView.java     | 11 ++---
 7 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
index 4a76a28b419..a09fa60f53f 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
@@ -19,27 +19,42 @@ public class CommandResult {
     /** The application should exit. */
     private final boolean exit;
 
+    private final String detailsToUser;
+
     /**
      * Constructs a {@code CommandResult} with the specified fields.
      */
-    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+    public CommandResult(String feedbackToUser, String detailsToUser, boolean showHelp, boolean exit) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
+        this.detailsToUser = detailsToUser;
         this.showHelp = showHelp;
         this.exit = exit;
     }
 
+    /**
+     * Constructs a {@code CommandResult} with the specified fields {@code feedbackToUser} and {@code detailsToUser},
+     * and other fields set to their default value.
+     */
+    public CommandResult(String feedbackToUser, String detailsToUser) {
+        this(feedbackToUser, detailsToUser, false, false);
+    }
+
     /**
      * Constructs a {@code CommandResult} with the specified {@code feedbackToUser},
      * and other fields set to their default value.
      */
     public CommandResult(String feedbackToUser) {
-        this(feedbackToUser, false, false);
+        this(feedbackToUser, "", false, false);
     }
 
     public String getFeedbackToUser() {
         return feedbackToUser;
     }
 
+    public String getDetailsToUser() {
+        return detailsToUser;
+    }
+
     public boolean isShowHelp() {
         return showHelp;
     }
@@ -62,18 +77,20 @@ public boolean equals(Object other) {
         CommandResult otherCommandResult = (CommandResult) other;
         return feedbackToUser.equals(otherCommandResult.feedbackToUser)
                 && showHelp == otherCommandResult.showHelp
-                && exit == otherCommandResult.exit;
+                && exit == otherCommandResult.exit
+                && detailsToUser.equals(otherCommandResult.detailsToUser);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(feedbackToUser, showHelp, exit);
+        return Objects.hash(feedbackToUser, detailsToUser, showHelp, exit);
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .add("feedbackToUser", feedbackToUser)
+                .add("detailsToUser", detailsToUser)
                 .add("showHelp", showHelp)
                 .add("exit", exit)
                 .toString();
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
index 7012f94585e..18c4a9092ab 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, "", false, true);
     }
 
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
index 438d479c257..8237d3d7358 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+        return new CommandResult(SHOWING_HELP_MESSAGE, "", true, false);
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
index 39eba1dfa32..7491e6423da 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
@@ -42,9 +42,14 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         InternApplication internApplicationToView = lastShownList.get(targetIndex.getZeroBased());
+        String details = "Company: " + internApplicationToView.getCompany().toString() + "\n"
+                + "Role:" + internApplicationToView.getRole().toString() + "\n"
+                + "Cycle:" + internApplicationToView.getCycle().toString() + "\n"
+                + "Status:" + internApplicationToView.getStatus().toString() + "\n"
+                + "Additional Notes:\n" + internApplicationToView.getNote().toString();
         model.setCurrentInternApplication(internApplicationToView);
         return new CommandResult(String.format(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView)));
+                Messages.format(internApplicationToView)), details);
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 148a506a6bd..6ea8ba9d1c7 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -3,11 +3,16 @@
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import seedu.letsgethired.commons.core.LogsCenter;
+import seedu.letsgethired.logic.commands.CommandResult;
+import seedu.letsgethired.logic.commands.exceptions.CommandException;
+import seedu.letsgethired.logic.parser.exceptions.ParseException;
 import seedu.letsgethired.model.application.InternApplication;
 
 /**
@@ -15,21 +20,33 @@
  */
 public class InternApplicationListPanel extends UiPart<Region> {
     private static final String FXML = "InternApplicationListPanel.fxml";
+    private CommandExecutor commandExecutor;
     private final Logger logger = LogsCenter.getLogger(InternApplicationListPanel.class);
-
     @FXML
     private ListView<InternApplication> internApplicationListView;
+    private EventHandler<MouseEvent> onCardClick = new EventHandler<>() {
+        @Override
+        public void handle(MouseEvent event) {
+            int itemIndex = getSelectedItemIndex();
+            String commandText = "view " + itemIndex;
+            try {
+                commandExecutor.execute(commandText);
+            } catch (CommandException | ParseException e) {
+                //should never reach here unless the hard-coded input is wrong
+            }
+        }
+    };
 
     /**
      * Creates a {@code InternApplicationListPanel} with the given {@code ObservableList}.
      */
-    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList, SelectView selectView) {
+    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList, CommandExecutor commandExecutor) {
         super(FXML);
         internApplicationListView.setItems(internApplicationList);
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
-        internApplicationListView.setOnMouseClicked(e -> {
-            selectView.displayDetails(getSelectedItem());
-        });
+        this.commandExecutor = commandExecutor;
+
+        internApplicationListView.setOnMouseClicked(onCardClick);
     }
 
     /**
@@ -63,6 +80,19 @@ public InternApplication getSelectedItem() {
      * @return Index of selected InternApplication from the list
      */
     public int getSelectedItemIndex() {
-        return internApplicationListView.getSelectionModel().getSelectedIndex();
+        return internApplicationListView.getSelectionModel().getSelectedIndex() + 1;
+    }
+
+    /**
+     * Represents a function that can execute commands.
+     */
+    @FunctionalInterface
+    public interface CommandExecutor {
+        /**
+         * Executes the command and returns the result.
+         *
+         * @see seedu.letsgethired.logic.Logic#execute(String)
+         */
+        CommandResult execute(String commandText) throws CommandException, ParseException;
     }
 }
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index fe9e0a08211..56855d3d787 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -126,7 +126,7 @@ void fillInnerParts() {
 
         internApplicationListPanel = new InternApplicationListPanel(
                 logic.getFilteredInternApplicationList(),
-                selectView);
+                this::executeCommand);
         internApplicationListPanelPlaceholder.getChildren().add(internApplicationListPanel.getRoot());
 
         resultDisplay = new ResultDisplay();
@@ -196,6 +196,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
+            selectView.displayDetails(commandResult.getDetailsToUser());
 
             if (commandResult.isShowHelp()) {
                 handleHelp();
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index 078bb7dfe6e..26b8f0263c4 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -24,15 +24,10 @@ public SelectView() {
 
     /**
      * Sets detail text onto the select view text area
-     * @param entry the intern application to be viewed
+     * @param details the intern application to be viewed
      */
-    public void displayDetails(InternApplication entry) {
-        requireNonNull(entry);
-        String details = "Company: " + entry.getCompany().toString() + "\n"
-                + "Role:" + entry.getRole().toString() + "\n"
-                + "Cycle:" + entry.getCycle().toString() + "\n"
-                + "Status:" + entry.getStatus().toString() + "\n"
-                + "Additional Notes:\n" + entry.getNote().toString();
+    public void displayDetails(String details) {
+        requireNonNull(details);
         selectView.setText(details);
     }
 }

From b5a06f0acea82ccb7f8e3f62469f77fd49a6f8da Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 03:26:14 +0800
Subject: [PATCH 09/20] Fix View Command bug

---
 .../letsgethired/ui/InternApplicationListPanel.java  |  3 ++-
 src/main/java/seedu/letsgethired/ui/SelectView.java  |  1 -
 .../logic/commands/CommandResultTest.java            | 12 +++++++-----
 .../letsgethired/logic/commands/ExitCommandTest.java |  2 +-
 .../letsgethired/logic/commands/HelpCommandTest.java |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 6ea8ba9d1c7..7ec4ceaa2e5 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -40,7 +40,8 @@ public void handle(MouseEvent event) {
     /**
      * Creates a {@code InternApplicationListPanel} with the given {@code ObservableList}.
      */
-    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList, CommandExecutor commandExecutor) {
+    public InternApplicationListPanel(ObservableList<InternApplication> internApplicationList,
+                                      CommandExecutor commandExecutor) {
         super(FXML);
         internApplicationListView.setItems(internApplicationList);
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
diff --git a/src/main/java/seedu/letsgethired/ui/SelectView.java b/src/main/java/seedu/letsgethired/ui/SelectView.java
index 26b8f0263c4..e4c11be0690 100644
--- a/src/main/java/seedu/letsgethired/ui/SelectView.java
+++ b/src/main/java/seedu/letsgethired/ui/SelectView.java
@@ -5,7 +5,6 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.Region;
-import seedu.letsgethired.model.application.InternApplication;
 
 /**
  * A ui for the select view that displays the notes of a selected application.
diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index cd4a83bdb6f..7c08ed92ac2 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -29,11 +29,11 @@ public void equals() {
 
         // different showHelp value -> returns false
         assertFalse(commandResult.equals(
-                new CommandResult("feedback", true, false)));
+                new CommandResult("feedback", "", true, false)));
 
         // different exit value -> returns false
         assertFalse(commandResult.equals(
-                new CommandResult("feedback", false, true)));
+                new CommandResult("feedback", "", false, true)));
     }
 
     @Test
@@ -48,18 +48,20 @@ public void hashcode() {
 
         // different showHelp value -> returns different hashcode
         assertNotEquals(commandResult.hashCode(),
-                new CommandResult("feedback", true, false).hashCode());
+                new CommandResult("feedback", "", true, false).hashCode());
 
         // different exit value -> returns different hashcode
         assertNotEquals(commandResult.hashCode(),
-                new CommandResult("feedback", false, true).hashCode());
+                new CommandResult("feedback", "", false, true).hashCode());
     }
 
     @Test
     public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
-                + commandResult.getFeedbackToUser() + ", showHelp=" + commandResult.isShowHelp()
+                + commandResult.getFeedbackToUser()
+                + ", detailsToUser="
+                + ", showHelp=" + commandResult.isShowHelp()
                 + ", exit=" + commandResult.isExit() + "}";
         assertEquals(expected, commandResult.toString());
     }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
index 017585f3b06..fe626eb81d4 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
@@ -15,7 +15,7 @@ public class ExitCommandTest {
     @Test
     public void execute_exit_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, "", false, true);
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
index 5c373aa6630..838b0bfc37e 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
@@ -15,7 +15,7 @@ public class HelpCommandTest {
     @Test
     public void execute_help_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+                new CommandResult(SHOWING_HELP_MESSAGE, "", true, false);
         assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
     }
 }

From 2d04f5226f5f3588151ba4aeac8d4fa31e3821db Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 10:54:43 +0800
Subject: [PATCH 10/20] Improve Code readability

Shifted all event listeners to FXML files
Created CommandExecutor interface class
Remove private CommandExecutor interface in all classes
---
 .../letsgethired/ui/CommandExecutor.java      | 18 +++++++++
 .../ui/InternApplicationCard.java             | 22 ++++++++++-
 .../ui/InternApplicationListPanel.java        | 38 ++-----------------
 .../letsgethired/ui/UtilityButtonBar.java     | 38 +++++--------------
 .../view/InternApplicationListCard.fxml       |  2 +-
 src/main/resources/view/UtilityButtonBar.fxml |  2 +-
 6 files changed, 54 insertions(+), 66 deletions(-)
 create mode 100644 src/main/java/seedu/letsgethired/ui/CommandExecutor.java

diff --git a/src/main/java/seedu/letsgethired/ui/CommandExecutor.java b/src/main/java/seedu/letsgethired/ui/CommandExecutor.java
new file mode 100644
index 00000000000..cb68c8b02f5
--- /dev/null
+++ b/src/main/java/seedu/letsgethired/ui/CommandExecutor.java
@@ -0,0 +1,18 @@
+package seedu.letsgethired.ui;
+
+import seedu.letsgethired.logic.commands.CommandResult;
+import seedu.letsgethired.logic.commands.exceptions.CommandException;
+import seedu.letsgethired.logic.parser.exceptions.ParseException;
+
+/**
+ * Represents a function that can execute commands.
+ */
+@FunctionalInterface
+public interface CommandExecutor {
+    /**
+     * Executes the command and returns the result.
+     *
+     * @see seedu.letsgethired.logic.Logic#execute(String)
+     */
+    CommandResult execute(String commandText) throws CommandException, ParseException;
+}
diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java b/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
index c7cf28f6231..53970bd6ec0 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
@@ -4,6 +4,9 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
+import seedu.letsgethired.logic.commands.CommandResult;
+import seedu.letsgethired.logic.commands.exceptions.CommandException;
+import seedu.letsgethired.logic.parser.exceptions.ParseException;
 import seedu.letsgethired.model.application.InternApplication;
 
 /**
@@ -23,6 +26,8 @@ public class InternApplicationCard extends UiPart<Region> {
 
     public final InternApplication internApplication;
 
+    private final CommandExecutor commandExecutor;
+    private int indexNum;
     @FXML
     private HBox cardPane;
     @FXML
@@ -41,9 +46,14 @@ public class InternApplicationCard extends UiPart<Region> {
     /**
      * Creates a {@code InternApplicationCard} with the given {@code internApplication} and index to display.
      */
-    public InternApplicationCard(InternApplication internApplication, int displayedIndex) {
+    public InternApplicationCard(InternApplication internApplication,
+                                 int displayedIndex,
+                                 CommandExecutor commandExecutor) {
         super(FXML);
         this.internApplication = internApplication;
+        this.indexNum = displayedIndex;
+        this.commandExecutor = commandExecutor;
+
         id.setText(displayedIndex + ". ");
         company.setText(internApplication.getCompany().value);
         role.setText(internApplication.getRole().value);
@@ -51,4 +61,14 @@ public InternApplicationCard(InternApplication internApplication, int displayedI
         note.setText(internApplication.getNote().value);
         cycle.setText(internApplication.getCycle().value);
     }
+
+    @FXML
+    public void handleCardClick() {
+        String commandText = "view " + this.indexNum;
+        try {
+            commandExecutor.execute(commandText);
+        } catch (CommandException | ParseException e) {
+            //should never reach here unless the hard-coded input is wrong
+        }
+    }
 }
diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 7ec4ceaa2e5..3a6f3516959 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -3,16 +3,13 @@
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
-import javafx.scene.input.MouseEvent;
+
 import javafx.scene.layout.Region;
 import seedu.letsgethired.commons.core.LogsCenter;
-import seedu.letsgethired.logic.commands.CommandResult;
-import seedu.letsgethired.logic.commands.exceptions.CommandException;
-import seedu.letsgethired.logic.parser.exceptions.ParseException;
+
 import seedu.letsgethired.model.application.InternApplication;
 
 /**
@@ -20,22 +17,10 @@
  */
 public class InternApplicationListPanel extends UiPart<Region> {
     private static final String FXML = "InternApplicationListPanel.fxml";
-    private CommandExecutor commandExecutor;
+    private final CommandExecutor commandExecutor;
     private final Logger logger = LogsCenter.getLogger(InternApplicationListPanel.class);
     @FXML
     private ListView<InternApplication> internApplicationListView;
-    private EventHandler<MouseEvent> onCardClick = new EventHandler<>() {
-        @Override
-        public void handle(MouseEvent event) {
-            int itemIndex = getSelectedItemIndex();
-            String commandText = "view " + itemIndex;
-            try {
-                commandExecutor.execute(commandText);
-            } catch (CommandException | ParseException e) {
-                //should never reach here unless the hard-coded input is wrong
-            }
-        }
-    };
 
     /**
      * Creates a {@code InternApplicationListPanel} with the given {@code ObservableList}.
@@ -46,8 +31,6 @@ public InternApplicationListPanel(ObservableList<InternApplication> internApplic
         internApplicationListView.setItems(internApplicationList);
         internApplicationListView.setCellFactory(listView -> new InternApplicationListViewCell());
         this.commandExecutor = commandExecutor;
-
-        internApplicationListView.setOnMouseClicked(onCardClick);
     }
 
     /**
@@ -63,7 +46,7 @@ protected void updateItem(InternApplication internApplication, boolean empty) {
                 setGraphic(null);
                 setText(null);
             } else {
-                setGraphic(new InternApplicationCard(internApplication, getIndex() + 1).getRoot());
+                setGraphic(new InternApplicationCard(internApplication, getIndex() + 1, commandExecutor).getRoot());
             }
         }
     }
@@ -83,17 +66,4 @@ public InternApplication getSelectedItem() {
     public int getSelectedItemIndex() {
         return internApplicationListView.getSelectionModel().getSelectedIndex() + 1;
     }
-
-    /**
-     * Represents a function that can execute commands.
-     */
-    @FunctionalInterface
-    public interface CommandExecutor {
-        /**
-         * Executes the command and returns the result.
-         *
-         * @see seedu.letsgethired.logic.Logic#execute(String)
-         */
-        CommandResult execute(String commandText) throws CommandException, ParseException;
-    }
 }
diff --git a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
index cf3a0acac4d..743f51470e0 100644
--- a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
+++ b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
@@ -1,12 +1,8 @@
 package seedu.letsgethired.ui;
 
-
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
-import seedu.letsgethired.logic.commands.CommandResult;
 import seedu.letsgethired.logic.commands.exceptions.CommandException;
 import seedu.letsgethired.logic.parser.exceptions.ParseException;
 
@@ -20,19 +16,6 @@ public class UtilityButtonBar extends UiPart<Region> {
     @FXML
     private Button deleteNotesButton;
 
-    private EventHandler<MouseEvent> onDeleteClick = new EventHandler<>() {
-        @Override
-        public void handle(MouseEvent event) {
-            int itemIndex = listPanel.getSelectedItemIndex();
-            String commandText = "delete " + itemIndex;
-            try {
-                commandExecutor.execute(commandText);
-            } catch (CommandException | ParseException e) {
-                //should never reach here unless the hard-coded input is wrong
-            }
-        }
-    };
-
     /**
      * Creates a {@code UtilityButtonBar}.
      */
@@ -40,19 +23,16 @@ public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor co
         super(FXML);
         this.commandExecutor = commandExecutor;
         this.listPanel = listPanel;
-        deleteNotesButton.setOnMouseClicked(onDeleteClick);
     }
 
-    /**
-     * Represents a function that can execute commands.
-     */
-    @FunctionalInterface
-    public interface CommandExecutor {
-        /**
-         * Executes the command and returns the result.
-         *
-         * @see seedu.letsgethired.logic.Logic#execute(String)
-         */
-        CommandResult execute(String commandText) throws CommandException, ParseException;
+    @FXML
+    public void handleDeleteClick() {
+        int itemIndex = listPanel.getSelectedItemIndex();
+        String commandText = "delete " + itemIndex;
+        try {
+            commandExecutor.execute(commandText);
+        } catch (CommandException | ParseException e) {
+            //should never reach here unless the hard-coded input is wrong
+        }
     }
 }
diff --git a/src/main/resources/view/InternApplicationListCard.fxml b/src/main/resources/view/InternApplicationListCard.fxml
index 6b9cd26a2e9..ec39ae2f793 100644
--- a/src/main/resources/view/InternApplicationListCard.fxml
+++ b/src/main/resources/view/InternApplicationListCard.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
-<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+<HBox id="cardPane" fx:id="cardPane" onMouseClicked="#handleCardClick" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
   <GridPane HBox.hgrow="ALWAYS">
     <columnConstraints>
       <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
diff --git a/src/main/resources/view/UtilityButtonBar.fxml b/src/main/resources/view/UtilityButtonBar.fxml
index 581f3c38b10..2d2484ef84a 100644
--- a/src/main/resources/view/UtilityButtonBar.fxml
+++ b/src/main/resources/view/UtilityButtonBar.fxml
@@ -6,7 +6,7 @@
 <?import java.lang.Double?>
 <GridPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
     <HBox styleClass="button-bar" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
-        <Button HBox.hgrow="ALWAYS" fx:id="deleteNotesButton" text="Delete Entry">
+        <Button HBox.hgrow="ALWAYS" fx:id="deleteNotesButton" text="Delete Entry" onAction="#handleDeleteClick">
             <maxHeight><Double fx:constant="MAX_VALUE" /></maxHeight>
             <maxWidth><Double fx:constant="MAX_VALUE" /></maxWidth>
         </Button>

From 5905950dd4fa466cb9cea2a24326e83189a1bff0 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 16:54:14 +0800
Subject: [PATCH 11/20] Separate Feedback message to Feedback and Details

---
 .../java/seedu/letsgethired/logic/Messages.java  | 16 +++++++++-------
 .../letsgethired/logic/commands/AddCommand.java  |  4 ++--
 .../logic/commands/CommandResult.java            |  8 ++++++++
 .../logic/commands/DeleteCommand.java            |  3 +--
 .../letsgethired/logic/commands/EditCommand.java |  4 ++--
 .../letsgethired/logic/commands/ExitCommand.java |  2 +-
 .../letsgethired/logic/commands/HelpCommand.java |  2 +-
 .../letsgethired/logic/commands/NoteCommand.java |  6 ++++--
 .../letsgethired/logic/commands/ViewCommand.java | 11 +++--------
 .../model/application/InternApplication.java     |  3 ++-
 .../letsgethired/model/application/Note.java     | 14 +++++++++++---
 .../letsgethired/model/application/Role.java     |  1 -
 .../java/seedu/letsgethired/ui/MainWindow.java   |  1 +
 .../commands/AddCommandIntegrationTest.java      |  2 +-
 .../logic/commands/AddCommandTest.java           |  2 +-
 .../logic/commands/DeleteCommandTest.java        |  4 ++--
 .../logic/commands/EditCommandTest.java          |  8 ++++----
 .../logic/commands/ViewCommandTest.java          |  4 ++--
 18 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/Messages.java b/src/main/java/seedu/letsgethired/logic/Messages.java
index 53bba6eb677..eef38f410a7 100644
--- a/src/main/java/seedu/letsgethired/logic/Messages.java
+++ b/src/main/java/seedu/letsgethired/logic/Messages.java
@@ -35,16 +35,18 @@ public static String getErrorMessageForDuplicatePrefixes(Prefix... duplicatePref
     /**
      * Formats the {@code internApplication} for display to the user.
      */
-    public static String format(InternApplication internApplication) {
+    public static String formatDisplay(InternApplication internApplication) {
         final StringBuilder builder = new StringBuilder();
-        builder.append(internApplication.getCompany())
-                .append("; Role: ")
+        builder.append("Company: ")
+                .append(internApplication.getCompany())
+                .append("\nRole: ")
                 .append(internApplication.getRole())
-                .append("; Cycle: ")
+                .append("\nCycle: ")
                 .append(internApplication.getCycle())
-                .append("; Status: ")
-                .append(internApplication.getStatus());
+                .append("\nStatus: ")
+                .append(internApplication.getStatus())
+                .append("\nNotes: ")
+                .append(internApplication.getNote());
         return builder.toString();
     }
-
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java b/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
index 8d76a6aba59..b4201ea3c78 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
@@ -32,7 +32,7 @@ public class AddCommand extends Command {
             + PREFIX_CYCLE + "Summer 2024"
             + PREFIX_STATUS + "Accepted";
 
-    public static final String MESSAGE_SUCCESS = "New intern application added: %1$s";
+    public static final String MESSAGE_SUCCESS = "New intern application added: ";
     public static final String MESSAGE_DUPLICATE_INTERN_APPLICATION =
             "This application already exists in the intern tracker";
 
@@ -55,7 +55,7 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         model.addInternApplication(toAdd);
-        return new CommandResult(String.format(MESSAGE_SUCCESS, Messages.format(toAdd)));
+        return new CommandResult(MESSAGE_SUCCESS, Messages.formatDisplay(toAdd));
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
index a09fa60f53f..8f7676ac605 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/CommandResult.java
@@ -39,6 +39,14 @@ public CommandResult(String feedbackToUser, String detailsToUser) {
         this(feedbackToUser, detailsToUser, false, false);
     }
 
+    /**
+     * Constructs a {@code CommandResult} with the specified {@code feedbackToUser}, {@code showHelp} and {@code exit},
+     * and other fields set to their default value.
+     */
+    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+        this(feedbackToUser, "", false, false);
+    }
+
     /**
      * Constructs a {@code CommandResult} with the specified {@code feedbackToUser},
      * and other fields set to their default value.
diff --git a/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java b/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
index de50cbeaf7a..6219da7cf6a 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
@@ -42,8 +42,7 @@ public CommandResult execute(Model model) throws CommandException {
 
         InternApplication internApplicationToDelete = lastShownList.get(targetIndex.getZeroBased());
         model.deleteInternApplication(internApplicationToDelete);
-        return new CommandResult(String.format(MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToDelete)));
+        return new CommandResult(MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS);
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/logic/commands/EditCommand.java b/src/main/java/seedu/letsgethired/logic/commands/EditCommand.java
index 63030b5ea24..946139bf5c2 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/EditCommand.java
@@ -85,8 +85,8 @@ public CommandResult execute(Model model) throws CommandException {
 
         model.setInternApplication(internApplicationToEdit, editedInternApplication);
         model.updateFilteredInternApplicationList(PREDICATE_SHOW_ALL_APPLICATIONS);
-        return new CommandResult(String.format(MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
-                                               Messages.format(editedInternApplication)));
+        return new CommandResult(MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
+                Messages.formatDisplay(editedInternApplication));
     }
 
     /**
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
index 18c4a9092ab..7012f94585e 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, "", false, true);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
     }
 
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
index 8237d3d7358..438d479c257 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/HelpCommand.java
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(SHOWING_HELP_MESSAGE, "", true, false);
+        return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
     }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java b/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
index 595517abad0..0c85adb018a 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
@@ -54,9 +54,11 @@ public CommandResult execute(Model model) throws CommandException {
 
         InternApplication internApplicationToEdit = lastShownList.get(index.getZeroBased());
         InternApplication editedInternApplication = new InternApplication(
-                internApplicationToEdit.getCompany(), internApplicationToEdit.getRole(),
+                internApplicationToEdit.getCompany(),
+                internApplicationToEdit.getRole(),
                 internApplicationToEdit.getCycle(),
-                internApplicationToEdit.getNote(), internApplicationToEdit.getStatus());
+                internApplicationToEdit.getNote(),
+                internApplicationToEdit.getStatus());
 
         model.setInternApplication(internApplicationToEdit, editedInternApplication);
         model.updateFilteredInternApplicationList(PREDICATE_SHOW_ALL_APPLICATIONS);
diff --git a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
index 7491e6423da..c08541d3dd5 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/ViewCommand.java
@@ -24,7 +24,7 @@ public class ViewCommand extends Command {
             + "Parameters: INDEX (must be a positive integer)\n"
             + "Example: " + COMMAND_WORD + " 1";
 
-    public static final String MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS = "Viewed intern application: %1$s";
+    public static final String MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS = "Viewed intern application";
 
     private final Index targetIndex;
 
@@ -42,14 +42,9 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         InternApplication internApplicationToView = lastShownList.get(targetIndex.getZeroBased());
-        String details = "Company: " + internApplicationToView.getCompany().toString() + "\n"
-                + "Role:" + internApplicationToView.getRole().toString() + "\n"
-                + "Cycle:" + internApplicationToView.getCycle().toString() + "\n"
-                + "Status:" + internApplicationToView.getStatus().toString() + "\n"
-                + "Additional Notes:\n" + internApplicationToView.getNote().toString();
         model.setCurrentInternApplication(internApplicationToView);
-        return new CommandResult(String.format(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView)), details);
+        return new CommandResult(MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
+                Messages.formatDisplay(internApplicationToView));
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/model/application/InternApplication.java b/src/main/java/seedu/letsgethired/model/application/InternApplication.java
index e655f62ab5e..55c5072c153 100644
--- a/src/main/java/seedu/letsgethired/model/application/InternApplication.java
+++ b/src/main/java/seedu/letsgethired/model/application/InternApplication.java
@@ -81,6 +81,7 @@ public boolean equals(Object other) {
             return false;
         }
 
+        // No comparing notes because notes is not a strict differentiating factor
         InternApplication otherInternApplication = (InternApplication) other;
         return company.equals(otherInternApplication.company)
                 && role.equals(otherInternApplication.role)
@@ -90,7 +91,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        // use this method for custom fields hashing instead of implementing your own
+        // No comparing notes because notes is not a strict differentiating factor
         return Objects.hash(company, role, cycle, status);
     }
 
diff --git a/src/main/java/seedu/letsgethired/model/application/Note.java b/src/main/java/seedu/letsgethired/model/application/Note.java
index 54153007126..9206c9d5e74 100644
--- a/src/main/java/seedu/letsgethired/model/application/Note.java
+++ b/src/main/java/seedu/letsgethired/model/application/Note.java
@@ -45,9 +45,17 @@ public String toString() {
 
     @Override
     public boolean equals(Object other) {
-        return other == this // short circuit if same object
-                || (other instanceof Note // instanceof handles nulls
-                && value.equals(((Note) other).value)); // state check
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof Note)) {
+            return false;
+        }
+
+        Note otherNote = (Note) other;
+        return value.equals(otherNote.value);
     }
 
     @Override
diff --git a/src/main/java/seedu/letsgethired/model/application/Role.java b/src/main/java/seedu/letsgethired/model/application/Role.java
index 06861d8b36f..a8c4757396f 100644
--- a/src/main/java/seedu/letsgethired/model/application/Role.java
+++ b/src/main/java/seedu/letsgethired/model/application/Role.java
@@ -32,7 +32,6 @@ public Role(String role) {
      * Returns true if a given string is a valid role.
      */
     public static boolean isValidRole(String test) {
-        boolean t = test.matches(VALIDATION_REGEX);
         return test.matches(VALIDATION_REGEX);
     }
 
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 56855d3d787..9c52d2b5f10 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -196,6 +196,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
+
             selectView.displayDetails(commandResult.getDetailsToUser());
 
             if (commandResult.isShowHelp()) {
diff --git a/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
index a31d9b1a203..61d3bb80b36 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
@@ -34,7 +34,7 @@ public void execute_newInternApplication_success() {
         expectedModel.addInternApplication(validInternApplication);
 
         assertCommandSuccess(new AddCommand(validInternApplication), model,
-                String.format(AddCommand.MESSAGE_SUCCESS, Messages.format(validInternApplication)),
+                String.format(AddCommand.MESSAGE_SUCCESS, Messages.formatDisplay(validInternApplication)),
                 expectedModel);
     }
 
diff --git a/src/test/java/seedu/letsgethired/logic/commands/AddCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/AddCommandTest.java
index 7a824509847..087bc68c60b 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/AddCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/AddCommandTest.java
@@ -39,7 +39,7 @@ public void execute_internApplicationAcceptedByModel_addSuccessful() throws Exce
 
         CommandResult commandResult = new AddCommand(validInternApplication).execute(modelStub);
 
-        assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, Messages.format(validInternApplication)),
+        assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, Messages.formatDisplay(validInternApplication)),
                 commandResult.getFeedbackToUser());
         assertEquals(Arrays.asList(validInternApplication), modelStub.internApplicationAdded);
     }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
index c3f128d3e9d..ca71aff4d44 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
@@ -36,7 +36,7 @@ public void execute_validIndexUnfilteredList_success() {
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
         String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToDelete));
+                Messages.formatDisplay(internApplicationToDelete));
 
         ModelManager expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);
@@ -62,7 +62,7 @@ public void execute_validIndexFilteredList_success() {
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
         String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToDelete));
+                Messages.formatDisplay(internApplicationToDelete));
 
         Model expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);
diff --git a/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
index 3e05facd44c..fd8a52370cf 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
@@ -42,7 +42,7 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() {
         EditCommand editCommand = new EditCommand(INDEX_FIRST_APPLICATION, descriptor);
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS, Messages
-                .format(editedInternApplication));
+                .formatDisplay(editedInternApplication));
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);
@@ -68,7 +68,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
         EditCommand editCommand = new EditCommand(indexLastInternApplication, descriptor);
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
-                Messages.format(editedInternApplication));
+                Messages.formatDisplay(editedInternApplication));
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(lastInternApplication, editedInternApplication);
@@ -83,7 +83,7 @@ public void execute_noFieldSpecifiedUnfilteredList_success() {
                 .get(INDEX_FIRST_APPLICATION.getZeroBased());
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS, Messages
-                .format(editedInternApplication));
+                .formatDisplay(editedInternApplication));
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
 
@@ -102,7 +102,7 @@ public void execute_filteredList_success() {
                 new EditInternApplicationDescriptorBuilder().withCompany(VALID_COMPANY_BYTEDANCE).build());
 
         String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
-                Messages.format(editedInternApplication));
+                Messages.formatDisplay(editedInternApplication));
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
index e0c25587f0e..1d66f1222fc 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
@@ -31,7 +31,7 @@ public void execute_validIndexUnfilteredList_success() {
         ViewCommand viewCommand = new ViewCommand(INDEX_FIRST_APPLICATION);
 
         String expectedMessage = String.format(ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView));
+                Messages.formatDisplay(internApplicationToView));
 
         ModelManager expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.setCurrentInternApplication(internApplicationToView);
@@ -56,7 +56,7 @@ public void execute_validIndexFilteredList_success() {
         ViewCommand viewCommand = new ViewCommand(INDEX_FIRST_APPLICATION);
 
         String expectedMessage = String.format(ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.format(internApplicationToView));
+                Messages.formatDisplay(internApplicationToView));
 
         Model expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         showInternApplicationAtIndex(expectedModel, INDEX_FIRST_APPLICATION);

From 6508318abe139b710288a0dec3c58cf1fe5457d6 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 17:40:30 +0800
Subject: [PATCH 12/20] Fix test cases and checkstyles

---
 .../ui/InternApplicationCard.java             |  4 +++-
 .../ui/InternApplicationListPanel.java        |  2 --
 .../letsgethired/ui/UtilityButtonBar.java     |  3 +++
 .../commands/AddCommandIntegrationTest.java   |  2 +-
 .../logic/commands/CommandTestUtil.java       | 10 ++++++++
 .../logic/commands/DeleteCommandTest.java     |  6 ++---
 .../logic/commands/EditCommandTest.java       | 24 +++++++++----------
 .../logic/commands/ExitCommandTest.java       |  2 +-
 .../logic/commands/HelpCommandTest.java       |  2 +-
 .../logic/commands/ViewCommandTest.java       | 12 +++++-----
 10 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java b/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
index 53970bd6ec0..9c0309a3efe 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationCard.java
@@ -4,7 +4,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
-import seedu.letsgethired.logic.commands.CommandResult;
 import seedu.letsgethired.logic.commands.exceptions.CommandException;
 import seedu.letsgethired.logic.parser.exceptions.ParseException;
 import seedu.letsgethired.model.application.InternApplication;
@@ -62,6 +61,9 @@ public InternApplicationCard(InternApplication internApplication,
         cycle.setText(internApplication.getCycle().value);
     }
 
+    /**
+     * Displays card details on the SelectView
+     */
     @FXML
     public void handleCardClick() {
         String commandText = "view " + this.indexNum;
diff --git a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
index 3a6f3516959..0e80b58773c 100644
--- a/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationListPanel.java
@@ -6,10 +6,8 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
-
 import javafx.scene.layout.Region;
 import seedu.letsgethired.commons.core.LogsCenter;
-
 import seedu.letsgethired.model.application.InternApplication;
 
 /**
diff --git a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
index 743f51470e0..053cf9afe3c 100644
--- a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
+++ b/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
@@ -25,6 +25,9 @@ public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor co
         this.listPanel = listPanel;
     }
 
+    /**
+     * Deletes the selected card in UI
+     */
     @FXML
     public void handleDeleteClick() {
         int itemIndex = listPanel.getSelectedItemIndex();
diff --git a/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
index 61d3bb80b36..33da55b1bc7 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/AddCommandIntegrationTest.java
@@ -34,7 +34,7 @@ public void execute_newInternApplication_success() {
         expectedModel.addInternApplication(validInternApplication);
 
         assertCommandSuccess(new AddCommand(validInternApplication), model,
-                String.format(AddCommand.MESSAGE_SUCCESS, Messages.formatDisplay(validInternApplication)),
+                AddCommand.MESSAGE_SUCCESS, Messages.formatDisplay(validInternApplication),
                 expectedModel);
     }
 
diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandTestUtil.java b/src/test/java/seedu/letsgethired/logic/commands/CommandTestUtil.java
index 601ccd3d958..069d091a514 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandTestUtil.java
@@ -99,6 +99,16 @@ public static void assertCommandSuccess(Command command, Model actualModel, Stri
         assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
     }
 
+    /**
+     * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
+     * that takes a string {@code expectedMessage}.
+     */
+    public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
+                                            String expectedDetails, Model expectedModel) {
+        CommandResult expectedCommandResult = new CommandResult(expectedMessage, expectedDetails);
+        assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
+    }
+
     /**
      * Executes the given {@code command}, confirms that <br>
      * - a {@code CommandException} is thrown <br>
diff --git a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
index ca71aff4d44..1762b9dab27 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
@@ -35,8 +35,7 @@ public void execute_validIndexUnfilteredList_success() {
                 .getZeroBased());
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(internApplicationToDelete));
+        String expectedMessage = DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS;
 
         ModelManager expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);
@@ -61,8 +60,7 @@ public void execute_validIndexFilteredList_success() {
                 .getZeroBased());
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(internApplicationToDelete));
+        String expectedMessage = DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS;
 
         Model expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);
diff --git a/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
index fd8a52370cf..3d27a741a67 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/EditCommandTest.java
@@ -41,13 +41,13 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() {
                 new EditInternApplicationDescriptorBuilder(editedInternApplication).build();
         EditCommand editCommand = new EditCommand(INDEX_FIRST_APPLICATION, descriptor);
 
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS, Messages
-                .formatDisplay(editedInternApplication));
+        String expectedMessage = EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(editedInternApplication);
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);
 
-        assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(editCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test
@@ -67,13 +67,13 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
                 .build();
         EditCommand editCommand = new EditCommand(indexLastInternApplication, descriptor);
 
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(editedInternApplication));
+        String expectedMessage = EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(editedInternApplication);
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(lastInternApplication, editedInternApplication);
 
-        assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(editCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test
@@ -82,12 +82,12 @@ public void execute_noFieldSpecifiedUnfilteredList_success() {
         InternApplication editedInternApplication = model.getFilteredInternApplicationList()
                 .get(INDEX_FIRST_APPLICATION.getZeroBased());
 
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS, Messages
-                .formatDisplay(editedInternApplication));
+        String expectedMessage = EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(editedInternApplication);
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
 
-        assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(editCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test
@@ -101,13 +101,13 @@ public void execute_filteredList_success() {
         EditCommand editCommand = new EditCommand(INDEX_FIRST_APPLICATION,
                 new EditInternApplicationDescriptorBuilder().withCompany(VALID_COMPANY_BYTEDANCE).build());
 
-        String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(editedInternApplication));
+        String expectedMessage = EditCommand.MESSAGE_EDIT_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(editedInternApplication);
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);
 
-        assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(editCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
index fe626eb81d4..017585f3b06 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ExitCommandTest.java
@@ -15,7 +15,7 @@ public class ExitCommandTest {
     @Test
     public void execute_exit_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, "", false, true);
+                new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
index 838b0bfc37e..5c373aa6630 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/HelpCommandTest.java
@@ -15,7 +15,7 @@ public class HelpCommandTest {
     @Test
     public void execute_help_success() {
         CommandResult expectedCommandResult =
-                new CommandResult(SHOWING_HELP_MESSAGE, "", true, false);
+                new CommandResult(SHOWING_HELP_MESSAGE, true, false);
         assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
     }
 }
diff --git a/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
index 1d66f1222fc..98faea09fa7 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/ViewCommandTest.java
@@ -30,12 +30,12 @@ public void execute_validIndexUnfilteredList_success() {
                         .getZeroBased());
         ViewCommand viewCommand = new ViewCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = String.format(ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(internApplicationToView));
+        String expectedMessage = ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(internApplicationToView);
 
         ModelManager expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.setCurrentInternApplication(internApplicationToView);
-        assertCommandSuccess(viewCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(viewCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test
@@ -55,14 +55,14 @@ public void execute_validIndexFilteredList_success() {
                         .getZeroBased());
         ViewCommand viewCommand = new ViewCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = String.format(ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS,
-                Messages.formatDisplay(internApplicationToView));
+        String expectedMessage = ViewCommand.MESSAGE_VIEW_INTERN_APPLICATION_SUCCESS;
+        String expectedDetails = Messages.formatDisplay(internApplicationToView);
 
         Model expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         showInternApplicationAtIndex(expectedModel, INDEX_FIRST_APPLICATION);
         expectedModel.setCurrentInternApplication(internApplicationToView);
 
-        assertCommandSuccess(viewCommand, model, expectedMessage, expectedModel);
+        assertCommandSuccess(viewCommand, model, expectedMessage, expectedDetails, expectedModel);
     }
 
     @Test

From e0da242039a20c8a4ee1622ff590bcd8df09a697 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 17:51:43 +0800
Subject: [PATCH 13/20] Fix more test cases and Notes Feedback messages

---
 .../java/seedu/letsgethired/logic/commands/NoteCommand.java | 4 ++--
 .../seedu/letsgethired/logic/commands/NoteCommandTest.java  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java b/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
index 335928d0932..ed8c6bc6127 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/NoteCommand.java
@@ -28,7 +28,7 @@ public class NoteCommand extends Command {
             + "Example: " + COMMAND_WORD + " 1 "
             + PREFIX_NOTE + "John Street is the leading market maker in the APAC region";
     public static final String MESSAGE_ADD_NOTE_SUCCESS = "Added note to InternApplication: %1$s";
-    public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Removed note from InternApplication: %1$s";
+    public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Removed note from InternApplication";
     public static final String NO_NOTE_PARAMETER_MESSAGE = "A note field must be provided. "
             + "If you intended to delete a note, you can type i/ instead.";
 
@@ -70,7 +70,7 @@ public CommandResult execute(Model model) throws CommandException {
 
     private String generateSuccessMessage(InternApplication internApplicationToEdit) {
         String message = !note.value.isEmpty() ? MESSAGE_ADD_NOTE_SUCCESS : MESSAGE_DELETE_NOTE_SUCCESS;
-        return String.format(message, Messages.formatDisplay(internApplicationToEdit));
+        return message;
     }
 
     @Override
diff --git a/src/test/java/seedu/letsgethired/logic/commands/NoteCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/NoteCommandTest.java
index 477df27ff91..b4d4a44fe46 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/NoteCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/NoteCommandTest.java
@@ -45,8 +45,7 @@ public void execute_validNoteCommandAdd_success() {
         NoteCommand noteCommand = new NoteCommand(INDEX_FIRST_APPLICATION,
                 new InternApplicationBuilder().build().getNote());
 
-        String expectedMessage = String.format(NoteCommand.MESSAGE_ADD_NOTE_SUCCESS,
-                Messages.format(editedInternApplication));
+        String expectedMessage = NoteCommand.MESSAGE_ADD_NOTE_SUCCESS;
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);
@@ -62,8 +61,7 @@ public void execute_validNoteCommandDelete_success() {
                 .withNote("").build();
         NoteCommand noteCommand = new NoteCommand(INDEX_FIRST_APPLICATION, emptyNote);
 
-        String expectedMessage = String.format(NoteCommand.MESSAGE_DELETE_NOTE_SUCCESS,
-                Messages.format(editedInternApplication));
+        String expectedMessage = NoteCommand.MESSAGE_DELETE_NOTE_SUCCESS;
 
         Model expectedModel = new ModelManager(new InternTracker(model.getInternTracker()), new UserPrefs());
         expectedModel.setInternApplication(model.getFilteredInternApplicationList().get(0), editedInternApplication);

From 76edf045c9e98684488e410e9793ff966c97d5a8 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 18:34:50 +0800
Subject: [PATCH 14/20] Add Code Coverage test

---
 .../seedu/letsgethired/logic/commands/CommandResultTest.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index 7c08ed92ac2..c3b6d2ab8f3 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -27,6 +27,9 @@ public void equals() {
         // different feedbackToUser value -> returns false
         assertFalse(commandResult.equals(new CommandResult("different")));
 
+        // different feedbackToUser value -> returns false
+        assertFalse(commandResult.equals(new CommandResult("feedback", "different")));
+
         // different showHelp value -> returns false
         assertFalse(commandResult.equals(
                 new CommandResult("feedback", "", true, false)));

From cd7fef1cf0a09a6807eb82a8ee1e7753afe1cd8f Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 21:56:55 +0800
Subject: [PATCH 15/20] Fix Delete command feedback bug

---
 .../seedu/letsgethired/logic/Messages.java     | 18 ++++++++++++++++++
 .../logic/commands/DeleteCommand.java          |  3 ++-
 .../logic/commands/DeleteCommandTest.java      |  6 ++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seedu/letsgethired/logic/Messages.java b/src/main/java/seedu/letsgethired/logic/Messages.java
index eef38f410a7..7881869312e 100644
--- a/src/main/java/seedu/letsgethired/logic/Messages.java
+++ b/src/main/java/seedu/letsgethired/logic/Messages.java
@@ -49,4 +49,22 @@ public static String formatDisplay(InternApplication internApplication) {
                 .append(internApplication.getNote());
         return builder.toString();
     }
+
+    /**
+     * Formats the {@code internApplication} for feedback to the user.
+     */
+    public static String formatFeedback(InternApplication internApplication) {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Company: ")
+                .append(internApplication.getCompany())
+                .append("; Role: ")
+                .append(internApplication.getRole())
+                .append("; Cycle: ")
+                .append(internApplication.getCycle())
+                .append("; Status: ")
+                .append(internApplication.getStatus())
+                .append("; Note: ")
+                .append(internApplication.getNote());
+        return builder.toString();
+    }
 }
diff --git a/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java b/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
index 6219da7cf6a..5dd820a058b 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/DeleteCommand.java
@@ -42,7 +42,8 @@ public CommandResult execute(Model model) throws CommandException {
 
         InternApplication internApplicationToDelete = lastShownList.get(targetIndex.getZeroBased());
         model.deleteInternApplication(internApplicationToDelete);
-        return new CommandResult(MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS);
+        return new CommandResult(String.format(MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
+                Messages.formatFeedback(internApplicationToDelete)));
     }
 
     @Override
diff --git a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
index 1762b9dab27..6f161d2744a 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/DeleteCommandTest.java
@@ -35,7 +35,8 @@ public void execute_validIndexUnfilteredList_success() {
                 .getZeroBased());
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS;
+        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
+                Messages.formatFeedback(internApplicationToDelete));
 
         ModelManager expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);
@@ -60,7 +61,8 @@ public void execute_validIndexFilteredList_success() {
                 .getZeroBased());
         DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_APPLICATION);
 
-        String expectedMessage = DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS;
+        String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_INTERN_APPLICATION_SUCCESS,
+                Messages.formatFeedback(internApplicationToDelete));
 
         Model expectedModel = new ModelManager(model.getInternTracker(), new UserPrefs());
         expectedModel.deleteInternApplication(internApplicationToDelete);

From a57130bb107fbcb5c5c9c0b0b5edb1a45dd54740 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 22:03:26 +0800
Subject: [PATCH 16/20] Fix missing details getter test in CommandResult

---
 .../seedu/letsgethired/logic/commands/CommandResultTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
index c3b6d2ab8f3..1bdd4f18b09 100644
--- a/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/letsgethired/logic/commands/CommandResultTest.java
@@ -63,7 +63,7 @@ public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
                 + commandResult.getFeedbackToUser()
-                + ", detailsToUser="
+                + ", detailsToUser=" + commandResult.getDetailsToUser()
                 + ", showHelp=" + commandResult.isShowHelp()
                 + ", exit=" + commandResult.isExit() + "}";
         assertEquals(expected, commandResult.toString());

From 02f19e2b7ac62bf9612eacccf426ddf479e719e9 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 22:25:42 +0800
Subject: [PATCH 17/20] Fix Delete command feedback bug

---
 .../seedu/letsgethired/model/InternTrackerTest.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
index ace739b724f..a4d544d9c03 100644
--- a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
+++ b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
@@ -17,6 +17,7 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import seedu.letsgethired.logic.commands.DeleteCommand;
 import seedu.letsgethired.model.application.InternApplication;
 import seedu.letsgethired.model.application.exceptions.DuplicateInternApplicationException;
 import seedu.letsgethired.testutil.InternApplicationBuilder;
@@ -125,4 +126,14 @@ public ObservableList<InternApplication> getApplicationList() {
         }
     }
 
+    @Test
+    public void same_InternTracker_is_equal() {
+        assertEquals(internTracker, internTracker);
+    }
+
+    @Test
+    public void differentObjectIsNotEqual() {
+        Object obj = new Object();
+        assertFalse(internTracker.equals(obj));
+    }
 }

From 6c86b6612953738844f47e801ac92d5a583198be Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 22:39:35 +0800
Subject: [PATCH 18/20] Add new test cases for userPrefs

---
 .../seedu/letsgethired/model/UserPrefsTest.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
index 9bd28deda47..9644861908b 100644
--- a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
+++ b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
@@ -1,5 +1,7 @@
 package seedu.letsgethired.model;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static seedu.letsgethired.testutil.Assert.assertThrows;
 
 import org.junit.jupiter.api.Test;
@@ -18,4 +20,16 @@ public void setInternTrackerFilePath_nullPath_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () -> userPrefs.setInternTrackerFilePath(null));
     }
 
+    @Test
+    public void same_InternTracker_is_equal() {
+        UserPrefs userPrefs = new UserPrefs();
+        assertEquals(userPrefs, userPrefs);
+    }
+
+    @Test
+    public void differentObjectIsNotEqual() {
+        UserPrefs userPrefs = new UserPrefs();
+        Object obj = new Object();
+        assertFalse(userPrefs.equals(obj));
+    }
 }

From e1eab0f27aa87180647a7b812ae1410ee6159f74 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 22:42:59 +0800
Subject: [PATCH 19/20] Fix Checkstyle

---
 src/test/java/seedu/letsgethired/model/InternTrackerTest.java | 3 +--
 src/test/java/seedu/letsgethired/model/UserPrefsTest.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
index a4d544d9c03..aedb5925725 100644
--- a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
+++ b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
@@ -17,7 +17,6 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import seedu.letsgethired.logic.commands.DeleteCommand;
 import seedu.letsgethired.model.application.InternApplication;
 import seedu.letsgethired.model.application.exceptions.DuplicateInternApplicationException;
 import seedu.letsgethired.testutil.InternApplicationBuilder;
@@ -127,7 +126,7 @@ public ObservableList<InternApplication> getApplicationList() {
     }
 
     @Test
-    public void same_InternTracker_is_equal() {
+    public void sameInternTrackerIsEqual() {
         assertEquals(internTracker, internTracker);
     }
 
diff --git a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
index 9644861908b..64aea652285 100644
--- a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
+++ b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
@@ -21,7 +21,7 @@ public void setInternTrackerFilePath_nullPath_throwsNullPointerException() {
     }
 
     @Test
-    public void same_InternTracker_is_equal() {
+    public void sameUserPrefsIsEqual() {
         UserPrefs userPrefs = new UserPrefs();
         assertEquals(userPrefs, userPrefs);
     }

From 097dda3fb0fa97bcc073bb2403a2d4299c852a28 Mon Sep 17 00:00:00 2001
From: You Wei <thamyouwei@gmail.com>
Date: Thu, 19 Oct 2023 23:28:52 +0800
Subject: [PATCH 20/20] Better naming convention and new test case

---
 .../seedu/letsgethired/logic/commands/AddCommand.java |  2 +-
 ...onBar.java => InternApplicationUtilityButton.java} |  8 ++++----
 src/main/java/seedu/letsgethired/ui/MainWindow.java   |  4 +++-
 ...onBar.fxml => InternApplicationUtilityButton.fxml} |  0
 .../seedu/letsgethired/model/InternTrackerTest.java   | 11 ++++++++---
 .../java/seedu/letsgethired/model/UserPrefsTest.java  |  9 ++++-----
 .../model/application/InternApplicationTest.java      |  4 ++++
 7 files changed, 24 insertions(+), 14 deletions(-)
 rename src/main/java/seedu/letsgethired/ui/{UtilityButtonBar.java => InternApplicationUtilityButton.java} (76%)
 rename src/main/resources/view/{UtilityButtonBar.fxml => InternApplicationUtilityButton.fxml} (100%)

diff --git a/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java b/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
index b4201ea3c78..5d190597c47 100644
--- a/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/letsgethired/logic/commands/AddCommand.java
@@ -32,7 +32,7 @@ public class AddCommand extends Command {
             + PREFIX_CYCLE + "Summer 2024"
             + PREFIX_STATUS + "Accepted";
 
-    public static final String MESSAGE_SUCCESS = "New intern application added: ";
+    public static final String MESSAGE_SUCCESS = "New intern application added";
     public static final String MESSAGE_DUPLICATE_INTERN_APPLICATION =
             "This application already exists in the intern tracker";
 
diff --git a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java b/src/main/java/seedu/letsgethired/ui/InternApplicationUtilityButton.java
similarity index 76%
rename from src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
rename to src/main/java/seedu/letsgethired/ui/InternApplicationUtilityButton.java
index 053cf9afe3c..c468d89fcb2 100644
--- a/src/main/java/seedu/letsgethired/ui/UtilityButtonBar.java
+++ b/src/main/java/seedu/letsgethired/ui/InternApplicationUtilityButton.java
@@ -9,17 +9,17 @@
 /**
  * A ui for utility buttons below the select view
  */
-public class UtilityButtonBar extends UiPart<Region> {
-    private static final String FXML = "UtilityButtonBar.fxml";
+public class InternApplicationUtilityButton extends UiPart<Region> {
+    private static final String FXML = "InternApplicationUtilityButton.fxml";
     private final CommandExecutor commandExecutor;
     private final InternApplicationListPanel listPanel;
     @FXML
     private Button deleteNotesButton;
 
     /**
-     * Creates a {@code UtilityButtonBar}.
+     * Creates a {@code InternApplicationUtilityButton}.
      */
-    public UtilityButtonBar(InternApplicationListPanel listPanel, CommandExecutor commandExecutor) {
+    public InternApplicationUtilityButton(InternApplicationListPanel listPanel, CommandExecutor commandExecutor) {
         super(FXML);
         this.commandExecutor = commandExecutor;
         this.listPanel = listPanel;
diff --git a/src/main/java/seedu/letsgethired/ui/MainWindow.java b/src/main/java/seedu/letsgethired/ui/MainWindow.java
index 9c52d2b5f10..c2421fc16ae 100644
--- a/src/main/java/seedu/letsgethired/ui/MainWindow.java
+++ b/src/main/java/seedu/letsgethired/ui/MainWindow.java
@@ -138,7 +138,9 @@ void fillInnerParts() {
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
 
-        UtilityButtonBar buttonBar = new UtilityButtonBar(internApplicationListPanel, this:: executeCommand);
+        InternApplicationUtilityButton buttonBar = new InternApplicationUtilityButton(
+                internApplicationListPanel,
+                this:: executeCommand);
         buttonbarPlaceholder.getChildren().add(buttonBar.getRoot());
     }
 
diff --git a/src/main/resources/view/UtilityButtonBar.fxml b/src/main/resources/view/InternApplicationUtilityButton.fxml
similarity index 100%
rename from src/main/resources/view/UtilityButtonBar.fxml
rename to src/main/resources/view/InternApplicationUtilityButton.fxml
diff --git a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
index aedb5925725..c80ac4f99fc 100644
--- a/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
+++ b/src/test/java/seedu/letsgethired/model/InternTrackerTest.java
@@ -126,12 +126,17 @@ public ObservableList<InternApplication> getApplicationList() {
     }
 
     @Test
-    public void sameInternTrackerIsEqual() {
-        assertEquals(internTracker, internTracker);
+    public void differentObjectIsNotEqual() {
+        Object obj = new Object();
+        assertFalse(internTracker.equals(obj));
     }
 
     @Test
-    public void differentObjectIsNotEqual() {
+    public void equals() {
+        // same instance -> returns true
+        assertEquals(internTracker, internTracker);
+
+        // non-subclass -> returns true
         Object obj = new Object();
         assertFalse(internTracker.equals(obj));
     }
diff --git a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
index 64aea652285..ba58c4d99a2 100644
--- a/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
+++ b/src/test/java/seedu/letsgethired/model/UserPrefsTest.java
@@ -21,14 +21,13 @@ public void setInternTrackerFilePath_nullPath_throwsNullPointerException() {
     }
 
     @Test
-    public void sameUserPrefsIsEqual() {
+    public void equals() {
         UserPrefs userPrefs = new UserPrefs();
+
+        // same instance -> returns true
         assertEquals(userPrefs, userPrefs);
-    }
 
-    @Test
-    public void differentObjectIsNotEqual() {
-        UserPrefs userPrefs = new UserPrefs();
+        // non-subclass -> returns true
         Object obj = new Object();
         assertFalse(userPrefs.equals(obj));
     }
diff --git a/src/test/java/seedu/letsgethired/model/application/InternApplicationTest.java b/src/test/java/seedu/letsgethired/model/application/InternApplicationTest.java
index a33a07c6318..624f60336b1 100644
--- a/src/test/java/seedu/letsgethired/model/application/InternApplicationTest.java
+++ b/src/test/java/seedu/letsgethired/model/application/InternApplicationTest.java
@@ -83,6 +83,10 @@ public void equals() {
         // different status -> returns false
         editedInternApplication = new InternApplicationBuilder(JANE_STREET).withStatus(VALID_STATUS_REJECTED).build();
         assertFalse(JANE_STREET.equals(editedInternApplication));
+
+        // different note -> returns true
+        editedInternApplication = new InternApplicationBuilder(JANE_STREET).withNote("").build();
+        assertTrue(JANE_STREET.equals(editedInternApplication));
     }
 
     @Test