Merge pull request #156 from muhammadaljunied/Bugfix-001

Standardised converted amount and rates printing.
AY1920S1-CS2103-T14-4 · Nov 11, 2019 · d002d24 · d002d24
2 parents d5e84d5 + 036342f
commit d002d24
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/seedu/address/model/expense/Expense.java b/src/main/java/seedu/address/model/expense/Expense.java
@@ -133,10 +133,18 @@ public String toString() {
         final StringBuilder builder = new StringBuilder();
         builder.append("\n")
             .append("Name: " + getName())
-            .append("\n")
-            .append("Amount: " + getAmount())
-            .append(" " + getCurrency())
-            .append("\n")
+            .append("\n");
+        if (isForeign()) {
+            builder.append("Amount: " + getConvertedAmount())
+                .append(" " + DEFAULT_BASE_CURRENCY)
+                .append(" (" + String.format("%.2f", getAmount().getValue()))
+                .append(" " + getCurrency().toString())
+                .append(")");
+        } else {
+            builder.append("Amount: " + getAmount())
+                .append(" " + getCurrency().name);
+        }
+        builder.append("\n")
             .append("Date: " + getDate())
             .append("\n")
             .append("Tag: " + getTag());

diff --git a/src/main/java/seedu/address/ui/ExpenseCard.java b/src/main/java/seedu/address/ui/ExpenseCard.java
@@ -46,7 +46,7 @@ public ExpenseCard(Expense expense, int displayedIndex) {
         name.setText(expense.getName().fullName);
         if (expense.isForeign()) {
             amount.setText(expense.getConvertedAmount().value + " SGD");
-            currency.setText("(" + expense.getCurrency().toString() + ")");
+            currency.setText("(" + expense.getAmount() + expense.getCurrency().toString() + ")");
         } else {
             amount.setText(expense.getAmount().value);
             currency.setText(expense.getCurrency().name);

diff --git a/src/test/java/seedu/address/testutil/ExpenseUtil.java b/src/test/java/seedu/address/testutil/ExpenseUtil.java
@@ -29,6 +29,7 @@ public static String getExpenseDetails(Expense expense) {
         StringBuilder sb = new StringBuilder();
         sb.append(PREFIX_NAME + expense.getName().fullName + " ");
         sb.append(PREFIX_AMOUNT + expense.getAmount().value + " ");
+        sb.append(PREFIX_CURRENCY + expense.getCurrency().name + " ");
         sb.append(PREFIX_DATE + expense.getDate().value + " ");
         sb.append(PREFIX_TAG + expense.getTag().tagName);
         return sb.toString();