From ac9294a6a0fcbbf822b1bd3687c3d103eca77802 Mon Sep 17 00:00:00 2001
From: eugene teu <eugeneteu@gmail.com>
Date: Mon, 11 Nov 2019 15:35:54 +0800
Subject: [PATCH 1/2] add phone tag

---
 .../java/seedu/address/ui/cards/ArchivedOrderCard.java   | 7 +++++++
 src/main/java/seedu/address/ui/cards/OrderCard.java      | 7 +++++++
 src/main/resources/view/ArchivedOrderListCard.fxml       | 4 ++++
 src/main/resources/view/OrderListCard.fxml               | 4 ++++
 src/main/resources/view/SMLTheme.css                     | 9 +++++++++
 5 files changed, 31 insertions(+)

diff --git a/src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java b/src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java
index ef7aeed0761..41b90d7c9cc 100644
--- a/src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java
+++ b/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) {
@@ -109,6 +111,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))
diff --git a/src/main/java/seedu/address/ui/cards/OrderCard.java b/src/main/java/seedu/address/ui/cards/OrderCard.java
index 5068648d15d..e6f71d361ac 100644
--- a/src/main/java/seedu/address/ui/cards/OrderCard.java
+++ b/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)));
diff --git a/src/main/resources/view/ArchivedOrderListCard.fxml b/src/main/resources/view/ArchivedOrderListCard.fxml
index 47eb6bb356e..19f773b3f1b 100644
--- a/src/main/resources/view/ArchivedOrderListCard.fxml
+++ b/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>
diff --git a/src/main/resources/view/OrderListCard.fxml b/src/main/resources/view/OrderListCard.fxml
index 0ff5d82d2ba..ce1343cddc0 100644
--- a/src/main/resources/view/OrderListCard.fxml
+++ b/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>
diff --git a/src/main/resources/view/SMLTheme.css b/src/main/resources/view/SMLTheme.css
index 56b4c4767df..934ea050afa 100644
--- a/src/main/resources/view/SMLTheme.css
+++ b/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;
 }

From 6c760dfe0d6a38eb145abc02af172cea4bd1af39 Mon Sep 17 00:00:00 2001
From: eugene teu <eugeneteu@gmail.com>
Date: Mon, 11 Nov 2019 15:40:47 +0800
Subject: [PATCH 2/2] add standard notation

---
 docs/UserGuide.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
index fb1e939760a..6374e5ff5df 100644
--- a/docs/UserGuide.adoc
+++ b/docs/UserGuide.adoc
@@ -862,10 +862,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,