Merge pull request #207 from c0j0s/patch-group-clear-command-to-person

Patch clear command to person
nus-cs2103-AY2223S2 · Apr 3, 2023 · 2f677a0 · 2f677a0
2 parents 0e13531 + 1d3a712
commit 2f677a0
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 14 deletions.
diff --git a/.../address/logic/commands/ClearCommand.java → ...s/logic/commands/person/ClearCommand.java b/.../address/logic/commands/ClearCommand.java → ...s/logic/commands/person/ClearCommand.java
@@ -1,14 +1,17 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.commands.CommandGroup;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 
 /**
  * Clears the address book.
  */
-public class ClearCommand extends Command {
+public class ClearCommand extends PersonCommand {
+    public static final CommandGroup COMMAND_GROUP = CommandGroup.PERSON;
 
     public static final String COMMAND_WORD = "clear";
     public static final String MESSAGE_SUCCESS = "Address book has been cleared!";

diff --git a/src/main/java/seedu/address/logic/parser/DukeDriverParser.java b/src/main/java/seedu/address/logic/parser/DukeDriverParser.java
@@ -6,7 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.CommandGroup;
 import seedu.address.logic.commands.ExitCommand;
@@ -19,6 +18,7 @@
 import seedu.address.logic.commands.jobs.FindDeliveryJobCommand;
 import seedu.address.logic.commands.jobs.ListDeliveryJobCommand;
 import seedu.address.logic.commands.person.AddCommand;
+import seedu.address.logic.commands.person.ClearCommand;
 import seedu.address.logic.commands.person.DeleteCommand;
 import seedu.address.logic.commands.person.EditCommand;
 import seedu.address.logic.commands.person.FindCommand;
@@ -74,8 +74,8 @@ public CommandGroup parseCommandGroup(String userInput) throws ParseException {
         case EditCommand.COMMAND_WORD:
         case DeleteCommand.COMMAND_WORD:
         case FindCommand.COMMAND_WORD:
-            return FindCommand.COMMAND_GROUP;
         case ClearCommand.COMMAND_WORD:
+            return FindCommand.COMMAND_GROUP;
         case ListCommand.COMMAND_WORD:
         case ExitCommand.COMMAND_WORD:
         case HelpCommand.COMMAND_WORD:

diff --git a/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java b/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java
@@ -43,7 +43,7 @@
  */
 public class AddDeliveryJobWindow extends UiPart<Stage> {
 
-    private static final String FXML = "AddDeliveryJobWindow.fxml";
+    private static final String FXML = "ModifyDeliveryJobWindow.fxml";
 
     private static final String EDIT_TITLE = "Edit Delivery Job";
 
@@ -322,7 +322,7 @@ private EditDeliveryJobCommand.EditDeliveryJobDescriptor prepareChange() {
             });
         }
 
-        if (!inputDeliverySlot.getValue().isEmpty()) {
+        if (inputDeliverySlot.getValue() != null) {
             // slot field has value
             job.getDeliverySlot().ifPresentOrElse(val -> {
                 // slot is different from existing value, overwrite.

diff --git a/src/main/java/seedu/address/ui/jobs/DeliveryJobCard.java b/src/main/java/seedu/address/ui/jobs/DeliveryJobCard.java
@@ -7,6 +7,7 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Region;
+import seedu.address.model.jobs.DeliveryDate;
 import seedu.address.model.jobs.DeliveryJob;
 import seedu.address.ui.UiPart;
 
@@ -63,15 +64,19 @@ public DeliveryJobCard(DeliveryJob job, int displayedIndex, Consumer<DeliveryJob
         address.setText("Refine later");
 
         job.getDeliveryDate().ifPresentOrElse(val -> {
-            deliveryTimeDate.setText(val.date);
+            if (val.date.equals(DeliveryDate.placeholder().date)) {
+                deliveryTimeDate.setText("Not scheduled");
+            } else {
+                deliveryTimeDate.setText(val.date);
+            }
         }, () -> {
-            deliveryTimeDate.setText("N.A");
+            deliveryTimeDate.setText("Not scheduled");
         });
 
         job.getDeliverySlot().ifPresentOrElse(val -> {
             deliveryTimeSlot.setText(val.getDescription());
         }, () -> {
-            deliveryTimeSlot.setText("N.A");
+            deliveryTimeSlot.setText("");
         });
 
         job.getEarning().ifPresentOrElse(val -> {

diff --git a/src/main/java/seedu/address/ui/jobs/DeliveryJobDetailPane.java b/src/main/java/seedu/address/ui/jobs/DeliveryJobDetailPane.java
@@ -90,18 +90,18 @@ public void fillInnerParts(ReadOnlyAddressBook ab) {
 
         job.getDeliveryDate().ifPresentOrElse(val -> {
             if (val.date.equals(DeliveryDate.placeholder().toString())) {
-                deliveryTimeDate.setText("N.A");
+                deliveryTimeDate.setText("Not scheduled");
             } else {
                 deliveryTimeDate.setText(val.date);
             }
         }, () -> {
-            deliveryTimeDate.setText("N.A");
+            deliveryTimeDate.setText("Not scheduled");
         });
 
         job.getDeliverySlot().ifPresentOrElse(val -> {
             deliveryTimeSlot.setText(val.getDescription());
         }, () -> {
-            deliveryTimeSlot.setText("N.A");
+            deliveryTimeSlot.setText("Not scheduled");
         });
 
         job.getEarning().ifPresentOrElse(val -> {

diff --git a/.../resources/view/AddDeliveryJobWindow.fxml → ...sources/view/ModifyDeliveryJobWindow.fxml b/.../resources/view/AddDeliveryJobWindow.fxml → ...sources/view/ModifyDeliveryJobWindow.fxml
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -5,6 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import seedu.address.logic.commands.person.ClearCommand;
 import seedu.address.model.AddressBook;
 import seedu.address.model.DeliveryJobSystem;
 import seedu.address.model.Model;

diff --git a/src/test/java/seedu/address/logic/commands/person/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/person/EditCommandTest.java
@@ -19,7 +19,6 @@
 
 import seedu.address.commons.core.Messages;
 import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.person.EditCommand.EditPersonDescriptor;
 import seedu.address.model.AddressBook;
 import seedu.address.model.DeliveryJobSystem;

diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -13,11 +13,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.StatisticsCommand;
 import seedu.address.logic.commands.person.AddCommand;
+import seedu.address.logic.commands.person.ClearCommand;
 import seedu.address.logic.commands.person.DeleteCommand;
 import seedu.address.logic.commands.person.EditCommand;
 import seedu.address.logic.commands.person.EditCommand.EditPersonDescriptor;