Merge pull request #292 from EugeneTeu/ppp

phone tag

docs/UserGuide.adoc

@@ -864,10 +864,10 @@ This behaviour is intentional and not a bug.
 * Date range starts from 1970 onwards
 ** Date of year input starts from 1970 onwards. This is enough to fit our use case. Anything lower will be rejected.
 
-* Auto truncation of labels
+* Auto truncation of labels and values
 ** the X-axis labels will adjust automatically based on the range of inputs. This is intended to give users the
 flexibility with regards to the range of dates to be inputted. Above a certain range the interval between x-axis data
-will decrease e.g 2 months
+will decrease e.g 2 months. Above a certain values, labels will be replaced by standard notation e.g 9999999E8
 
 * Stats window data not updating
 ** If you already have a stats window open and you complete an order,

src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java

@@ -65,6 +65,8 @@ public class ArchivedOrderCard extends UiPart<Region> {
     private FlowPane scheduleTags;
     @FXML
     private FlowPane customerTags;
+    @FXML
+    private FlowPane phoneTags;
 
 
     public ArchivedOrderCard(Order order, int displayedIndex) {
@@ -107,6 +109,11 @@ public ArchivedOrderCard(Order order, int displayedIndex) {
                     .sorted(Comparator.comparing(tag -> tag.tagName))
                     .forEach(tag -> customerTags.getChildren().add(new Label(tag.tagName)));
         }
+        if (order.getPhone() != null) {
+            order.getPhone().getTags().stream()
+                    .sorted(Comparator.comparing(tag -> tag.tagName))
+                    .forEach(tag -> phoneTags.getChildren().add(new Label(tag.tagName)));
+        }
 
         order.getTags().stream()
                 .sorted(Comparator.comparing(tag -> tag.tagName))

src/main/java/seedu/address/ui/cards/OrderCard.java

@@ -62,6 +62,8 @@ public class OrderCard extends UiPart<Region> {
     private FlowPane scheduleTags;
     @FXML
     private FlowPane customerTags;
+    @FXML
+    private FlowPane phoneTags;
 
     public OrderCard(Order order, int displayedIndex) {
         super(FXML);
@@ -100,6 +102,11 @@ public OrderCard(Order order, int displayedIndex) {
                     .sorted(Comparator.comparing(tag -> tag.tagName))
                     .forEach(tag -> customerTags.getChildren().add(new Label(tag.tagName)));
         }
+        if (order.getPhone() != null) {
+            order.getPhone().getTags().stream()
+                    .sorted(Comparator.comparing(tag -> tag.tagName))
+                    .forEach(tag -> phoneTags.getChildren().add(new Label(tag.tagName)));
+        }
         order.getTags().stream()
                 .sorted(Comparator.comparing(tag -> tag.tagName))
                 .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));

src/main/resources/view/ArchivedOrderListCard.fxml

@@ -95,6 +95,10 @@
                         <Label text="Customer Tags: " styleClass="cell_small_label_header" />
                         <FlowPane fx:id="customerTags" />
                     </HBox>
+                    <HBox>
+                        <Label text="Phone Tags: " styleClass="cell_small_label_header" />
+                        <FlowPane fx:id="phoneTags" />
+                    </HBox>
                     <padding>
                         <Insets top="5" right="5" bottom="5" left="15" />
                     </padding>

src/main/resources/view/OrderListCard.fxml

@@ -99,6 +99,10 @@
                         <Label text="Customer Tags: " styleClass="cell_small_label_header" />
                         <FlowPane fx:id="customerTags" />
                     </HBox>
+                    <HBox>
+                        <Label text="Phone Tags: " styleClass="cell_small_label_header" />
+                        <FlowPane fx:id="phoneTags" />
+                    </HBox>
                     <padding>
                         <Insets top="5" right="5" bottom="5" left="15" />
                     </padding>

src/main/resources/view/SMLTheme.css

@@ -458,6 +458,15 @@
     -fx-font-size: 11;
 }
 
+#phoneTags .label {
+    -fx-text-fill: white;
+    -fx-background-color: #85ED;
+    -fx-padding: 1 3 1 3;
+    -fx-border-radius: 2;
+    -fx-background-radius: 2;
+    -fx-font-size: 11;
+}
+
 .panel-background {
     -fx-background-color: #484B95;
 }