Merge pull request #249 from TanZhanMing/master

Fixed help bug, commented out shortcut in helpWindow for now.
AY1920S1-CS2103T-W12-1 · Oct 31, 2019 · 53b83fb · 53b83fb
2 parents 37226c2 + 70166ba
commit 53b83fb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/main/java/seedu/address/model/budget/BudgetPlotter.java b/src/main/java/seedu/address/model/budget/BudgetPlotter.java
@@ -24,7 +24,7 @@ public class BudgetPlotter {
 
     XYSeries plotBudget() {
         double currentBudget;
-        for (int day = 1; day <= 31; day++) {
+        for (int day = 1; day <= 30; day++) {
             currentBudget = incomeSeries.getDataItem(day - 1).getYValue()
                     - claimSeries.getDataItem(day - 1).getYValue();
             budgetSeries.add(day, currentBudget);

diff --git a/src/main/java/seedu/address/model/budget/ClaimPlotter.java b/src/main/java/seedu/address/model/budget/ClaimPlotter.java
@@ -39,7 +39,7 @@ XYSeries plotClaims() {
         claimSeries.add(1, startingExpenses);
         double currentExpenses = startingExpenses;
         List<Claim> approvedClaimsInCurrentMonthList = findApprovedClaimsInCurrentMonth();
-        for (int day = 2; day <= 31; day++) {
+        for (int day = 2; day <= 30; day++) {
             for (Claim claim : approvedClaimsInCurrentMonthList) {
                 if (claim.getDate().date.getDayOfMonth() == day) {
                     currentExpenses += Double.parseDouble(claim.getAmount().value);

diff --git a/src/main/java/seedu/address/model/budget/IncomePlotter.java b/src/main/java/seedu/address/model/budget/IncomePlotter.java
@@ -38,7 +38,7 @@ XYSeries plotIncomes() {
         incomeSeries.add(1, startingIncome);
         double currentIncome = startingIncome;
         List<Income> approvedIncomesInCurrentMonthList = findIncomesInCurrentMonth();
-        for (int day = 2; day <= 31; day++) {
+        for (int day = 2; day <= 30; day++) {
             for (Income income : approvedIncomesInCurrentMonthList) {
                 if (income.getDate().date.getDayOfMonth() == day) {
                     currentIncome += Double.parseDouble(income.getAmount().value);

diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/seedu/address/ui/HelpWindow.java
@@ -1,6 +1,7 @@
 package seedu.address.ui;
 
 import java.io.IOException;
+import java.util.TreeSet;
 import java.util.logging.Logger;
 
 import javafx.fxml.FXML;
@@ -18,9 +19,17 @@ public class HelpWindow extends UiPart<Stage> {
 
     public static final String USERGUIDE_URL = "https://ay1920s1-cs2103t-w12-1.github.io/main/UserGuide.html";
     public static final String HELP_MESSAGE = "The 'help' command format is as follows: "
-            + "help cmd/COMMAND type/TYPE\n\nCommand List: \n"
-            + FinSecParser.getCommandList().keySet().toString().replace(", ", "]\n[")
+            + "help cmd/COMMAND type/TYPE"
             + "\n\n"
+            + "Command List: \n"
+            + getDefaultCommandList().toString().replace(", ", "]\n[")
+            + "\n\n"
+            //+ "Shortcut List:\n"
+            //+ FinSecParser.getShortcutList().toString()
+            //    .replace(", ", "]\n[")
+            //    .replace(" Word", "Shortcut")
+            //    .replace("Task", "    Command")
+            //+ "\n\n"
             + "Type List:\n"
             + "[brief] (gives a brief description)\n"
             + "[guide] (opens up our user guide on your browser) \n"
@@ -30,6 +39,7 @@ public class HelpWindow extends UiPart<Stage> {
 
     private static final Logger logger = LogsCenter.getLogger(HelpWindow.class);
     private static final String FXML = "HelpWindow.fxml";
+    private static TreeSet<String> defaultCommandList = new TreeSet<>(FinSecParser.getCommandList().values());
 
     @FXML
     private Button gotoButton;
@@ -99,6 +109,10 @@ public void focus() {
         getRoot().requestFocus();
     }
 
+    public static TreeSet<String> getDefaultCommandList() {
+        return defaultCommandList;
+    }
+
     /**
      * Copies the URL to the user guide to the clipboard.
      */