Fix null pointer in date picker

Refine text feedbacks
nus-cs2103-AY2223S2 · Mar 31, 2023 · 1d3a712 · 1d3a712
1 parent 25c3000
commit 1d3a712
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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 -> {