Merge pull request #112 from Originalidk/branch-assignment-feature

Add individual assignment list person index
AY2324S1-CS2103T-T15-1 · Oct 28, 2023 · b735c14 · b735c14
2 parents 295c48f + e2f82c3
commit b735c14
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
@@ -4,6 +4,7 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
+import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -53,6 +54,9 @@ public interface Logic {
     /** Returns an unmodifiable view of all assignments */
     ObservableList<Assignment> getAssignments();
 
+    /** Returns the index of the student whose list of assignments was last displayed */
+    Index getIndex();
+
     /**
      * Returns the user prefs' address book file path.
      */

diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
@@ -128,6 +128,11 @@ public ObservableList<Assignment> getAssignments() {
         return assignmentList;
     }
 
+    @Override
+    public Index getIndex() {
+        return this.indexToDisplay;
+    }
+
     @Override
     public Path getAddressBookFilePath() {
         return model.getAddressBookFilePath();

diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
@@ -5,6 +5,7 @@
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.KeyCombination;
@@ -69,6 +70,9 @@ public class MainWindow extends UiPart<Stage> {
     @FXML
     private StackPane statusbarPlaceholder;
 
+    @FXML
+    private Label assignmentListLabel;
+
     /**
      * Creates a {@code MainWindow} with the given {@code Stage} and {@code Logic}.
      */
@@ -143,6 +147,7 @@ void fillInnerParts() {
 
         assignmentNameListPanel = new AssignmentNameListPanel(logic.getAssignmentNameList());
         assignmentListPanelPlaceholder.getChildren().add(assignmentNameListPanel.getRoot());
+        assignmentListLabel.setText("Assignment List");
 
         resultDisplay = new ResultDisplay();
         resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
@@ -226,13 +231,15 @@ private CommandResult executeCommand(String commandText) throws CommandException
 
             if (commandResult.isAssignmentNames()) {
                 showAssignmentNames();
+                assignmentListLabel.setText("Assignment List");
             }
 
             boolean isAssignmentNames =
                 assignmentListPanelPlaceholder.getChildren().get(0).equals(assignmentNameListPanel.getRoot());
 
             if (!isAssignmentNames || commandResult.isPersonAssignments()) {
                 showStudentAssignments(logic.getAssignments());
+                assignmentListLabel.setText("Assignment List: Person " + logic.getIndex().getOneBased());
             }
 
             if (commandResult.isShowHelp()) {

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -69,7 +69,7 @@
           </VBox>
 
           <VBox fx:id="assignmentList" minWidth="300" prefWidth="300" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
-            <Label text="Assignment List" maxWidth="Infinity" wrapText="true" styleClass="section-label"/>
+            <Label fx:id="assignmentListLabel" text="\$assignmentListLabel" maxWidth="Infinity" wrapText="true" styleClass="section-label"/>
             <StackPane VBox.vgrow="ALWAYS" fx:id="assignmentListPanelPlaceholder" />
           </VBox>
         </HBox>