Update ui to include itinerary budget

AY2223S1-CS2103T-W11-4 · Oct 25, 2022 · 7e5b7ed · 7e5b7ed
1 parent 73c421f
commit 7e5b7ed
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/seedu/waddle/model/itinerary/Budget.java b/src/main/java/seedu/waddle/model/itinerary/Budget.java
@@ -47,7 +47,7 @@ public String toString() {
         return String.valueOf(this.initialBudget);
     }
 
-    public float getBudget() {
+    public float getValue() {
         return this.initialBudget;
     }
 
@@ -71,7 +71,7 @@ public void setSpending(float amt) {
     public boolean equals(Object other) {
         return other == this // short circuit if same object
                 || (other instanceof Budget // instanceof handles nulls
-                && this.initialBudget == (((Budget) other).getBudget())); // state check
+                && this.initialBudget == (((Budget) other).getValue())); // state check
     }
 
     @Override

diff --git a/src/main/java/seedu/waddle/ui/ItineraryCard.java b/src/main/java/seedu/waddle/ui/ItineraryCard.java
@@ -4,6 +4,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
+import seedu.waddle.model.itinerary.Budget;
 import seedu.waddle.model.itinerary.Itinerary;
 
 /**
@@ -37,6 +38,8 @@ public class ItineraryCard extends UiPart<Region> {
     private Label time;
     @FXML
     private Label people;
+    @FXML
+    private Label budget;
 
 
     /**
@@ -51,6 +54,13 @@ public ItineraryCard(Itinerary itinerary, int displayedIndex) {
         time.setText("Dates: " + itinerary.getTimeString());
         duration.setText("Duration: " + itinerary.getDuration().toString() + " Days");
         people.setText("Waddlers: " + itinerary.getPeople().numOfPeople);
+        Budget itineraryBudget = itinerary.getBudget();
+        if (itineraryBudget.getSpending() == 0) {
+            budget.setText("Budget: $" + itineraryBudget.getValue());
+        } else {
+            budget.setText("Budget: $" + itineraryBudget.getValue() + ", $"
+                    + itineraryBudget.calculateLeftOverBudget() + " remaining");
+        }
     }
 
     @Override

diff --git a/src/main/java/seedu/waddle/ui/UiSizes.java b/src/main/java/seedu/waddle/ui/UiSizes.java
@@ -4,6 +4,6 @@
  * Standard sizes for UI elements.
  */
 public class UiSizes {
-    public static final double ITEM_CARD_HEIGHT = 130;
+    public static final double ITEM_CARD_HEIGHT = 140;
     public static final double ITEM_LIST_MIN_HEIGHT = 20;
 }
diff --git a/src/main/resources/view/ItineraryListCard.fxml b/src/main/resources/view/ItineraryListCard.fxml
@@ -31,6 +31,7 @@
       <Label fx:id="duration" styleClass="cell_small_label" text="\$duration" />
       <Label fx:id="time" styleClass="cell_small_label" text="\$time" />
       <Label fx:id="people" styleClass="cell_small_label" text="\$people" />
+      <Label fx:id="budget" styleClass="cell_small_label" text="\$budget" />
     </VBox>
   </GridPane>
 </HBox>