Merge pull request #19 from cs0320-2021/frontend-tweaks

added link, gain

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/java/edu/brown/cs/student/term/Main.java b/src/main/java/edu/brown/cs/student/term/Main.java
index 6ba2393..d1e5604 100644
--- a/src/main/java/edu/brown/cs/student/term/Main.java
+++ b/src/main/java/edu/brown/cs/student/term/Main.java
@@ -189,12 +189,17 @@ public final class Main {
       double gains = profit.calculateGainsSingle(holder_id);
       double sp500PercentGain = profit.compareToSP500();
 
+      double percentGain = 100 * (gains / profit.getMoneyInput());
+      if (profit.getMoneyInput() == 0) {
+        percentGain = 0;
+      }
+
       Map<String, Object> res = new HashMap<>();
       res.put("holder_id", holder_id);
       res.put("moneyIn", profit.getMoneyInput());
       res.put("moneyOut", profit.getMoneyInput() + gains);
       res.put("holdings", holdings);
-      res.put("percentGain", 100 * (gains / profit.getMoneyInput()));
+      res.put("percentGain", percentGain);
       res.put("SP500", (1 + sp500PercentGain) * profit.getMoneyInput());
       res.put("percentSP500", 100 * sp500PercentGain);
       System.err.println("LOG: Returning to GUI " + res);
diff --git a/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
index d5fa872..4b19899 100644
--- a/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
+++ b/src/main/java/edu/brown/cs/student/term/profit/ProfitCalculation.java
@@ -299,17 +299,22 @@ public class ProfitCalculation {
     if (!tablesFilled) {
       organizeOrders(id);
       getRealizedGains();
+      getUnrealizedGains();
       tablesFilled = true;
     }
 
 
-    double realizedGains = 0;
+    double gains = 0;
 
     for (double value : realizedGainsMap.values()) {
-      realizedGains += value;
+      gains += value;
+    }
+
+    for (double value: unrealizedGainsMap.values()) {
+      gains += value;
     }
 
-    return realizedGains;
+    return gains;
   }
 
   public List<StockHolding> getHoldingsList(Integer id) {