From 25c30008045f3c8d04187147e1d83806ca0f6046 Mon Sep 17 00:00:00 2001 From: c0j0s Date: Fri, 31 Mar 2023 12:32:06 +0800 Subject: [PATCH 1/2] Move clear command to person group Renamed add delivery window to modify delivery window --- .../address/logic/commands/{ => person}/ClearCommand.java | 7 +++++-- .../java/seedu/address/logic/parser/DukeDriverParser.java | 4 ++-- .../java/seedu/address/ui/jobs/AddDeliveryJobWindow.java | 2 +- ...DeliveryJobWindow.fxml => ModifyDeliveryJobWindow.fxml} | 0 .../seedu/address/logic/commands/ClearCommandTest.java | 1 + .../address/logic/commands/person/EditCommandTest.java | 1 - .../seedu/address/logic/parser/AddressBookParserTest.java | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) rename src/main/java/seedu/address/logic/commands/{ => person}/ClearCommand.java (65%) rename src/main/resources/view/{AddDeliveryJobWindow.fxml => ModifyDeliveryJobWindow.fxml} (100%) diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/person/ClearCommand.java similarity index 65% rename from src/main/java/seedu/address/logic/commands/ClearCommand.java rename to src/main/java/seedu/address/logic/commands/person/ClearCommand.java index 9c86b1fa6e4..7cc2ebf27fd 100644 --- a/src/main/java/seedu/address/logic/commands/ClearCommand.java +++ b/src/main/java/seedu/address/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 index d607ccb92e9..38940d03d94 100644 --- 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 index b719c999c19..6852e5d3a3a 100644 --- 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 { - private static final String FXML = "AddDeliveryJobWindow.fxml"; + private static final String FXML = "ModifyDeliveryJobWindow.fxml"; private static final String EDIT_TITLE = "Edit Delivery Job"; diff --git a/src/main/resources/view/AddDeliveryJobWindow.fxml b/src/main/resources/view/ModifyDeliveryJobWindow.fxml similarity index 100% rename from src/main/resources/view/AddDeliveryJobWindow.fxml rename to src/main/resources/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 index c5b91bbe748..b3a8ef6cba2 100644 --- 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 index fe8da4de0c2..00affe83881 100644 --- 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 index 4c4443563fa..a86d63c366a 100644 --- 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; From 1d3a712a1d5ee7eb0c0e77481133200b501dda56 Mon Sep 17 00:00:00 2001 From: c0j0s Date: Fri, 31 Mar 2023 12:43:09 +0800 Subject: [PATCH 2/2] Fix null pointer in date picker Refine text feedbacks --- .../seedu/address/ui/jobs/AddDeliveryJobWindow.java | 2 +- .../java/seedu/address/ui/jobs/DeliveryJobCard.java | 11 ++++++++--- .../seedu/address/ui/jobs/DeliveryJobDetailPane.java | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java b/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java index 6852e5d3a3a..b9a602d6344 100644 --- a/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java +++ b/src/main/java/seedu/address/ui/jobs/AddDeliveryJobWindow.java @@ -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 index 783d7ca9a2c..1e721760d8e 100644 --- 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 { - 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 index ac83cad6f39..aea549fd495 100644 --- 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 -> {