Merge branch 'master' into branch-ListCategory

Author: tanwayne890

docs/UserGuide.md

@@ -198,6 +198,7 @@ Action | Format, Examples
 **List** | `list`
 **Delete** | `delete INDEX`<br> e.g., `delete 3`
 **View** | `view INDEX`<br> e.g., `view 5`
+**View existing categori labels** | `viewCategory`
 **Add Description** | `addDes INDEX d/DESCRIPTION`<br> e.g., `addDes 2 d/ENTERTAINMENT`
 **Delete Description** | `deleteDes INDEX`<br> e.g., `deleteDes 2`
 **Set Budget** | `setBudget a/AMOUNT`<br> e.g., `setBudget a/1000`

src/main/java/seedu/address/ExpenseMainApp.java

@@ -69,7 +69,8 @@ public void init() throws Exception {
     }
 
     /**
-     * Returns a {@code ExpenseModelManager} with the data from {@code storage}'s expense book and {@code userPrefs}. <br>
+     * Returns a {@code ExpenseModelManager} with the data from {@code storage}'s expense book
+     * and {@code userPrefs}. <br>
      * The data from the sample expense book will be used instead if {@code storage}'s expense book is not found,
      * or an empty expense book will be used instead if errors occur when reading {@code storage}'s expense book.
      */

src/main/java/seedu/address/logic/commands/DeleteDescriptionCommand.java

@@ -8,8 +8,9 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Expense;
 import seedu.address.model.person.Description;
+import seedu.address.model.person.Expense;
+
 
 
 /**
@@ -30,8 +31,8 @@ public class DeleteDescriptionCommand extends Command {
     public static final String MESSAGE_ARGUMENTS = "Index: %1$d, Description: %2$s";
     public static final String MESSAGE_ADD_DESCRIPTION_SUCCESS = "Added description to Expense: %1$s \n";
     public static final String MESSAGE_DELETE_DESCRIPTION_SUCCESS = "Removed description from Expense: %1$s \n";
-    private final Index index;
     private static final Description EMPTY_DESCRIPTION = new Description("");
+    private final Index index;
 
     /**
      * @param index of the expense in the filtered expense list to edit the description
@@ -51,7 +52,8 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Expense expenseToEdit = lastShownList.get(index.getZeroBased());
-        Expense editedExpense = new Expense(expenseToEdit.getAmount(), expenseToEdit.getDate(), expenseToEdit.getCategory(),
+        Expense editedExpense = new Expense(expenseToEdit.getAmount(), expenseToEdit.getDate(),
+                expenseToEdit.getCategory(),
                 EMPTY_DESCRIPTION);
 
         model.setExpense(expenseToEdit, editedExpense);
@@ -85,4 +87,4 @@ private String generateSuccessMessage(Expense expenseToEdit) {
         String message = MESSAGE_DELETE_DESCRIPTION_SUCCESS;
         return String.format(message, expenseToEdit);
     }
-}
+}

src/main/java/seedu/address/logic/commands/ViewCategoryCommand.java

@@ -1,4 +1,35 @@
 package seedu.address.logic.commands;
 
-public class ViewCategoryCommand {
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.person.Category;
+import seedu.address.model.person.Expense;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ViewCategoryCommand extends Command {
+
+    public static final String COMMAND_WORD = "viewCategory";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD
+            + ": Finds all the category labels used in the ExpenseBook so far. \n"
+            + "Example: " + COMMAND_WORD ;
+
+    public static final String MESSAGE_VIEW_CATEGORY_LABELS_SUCCESS =
+            "View all the existing category labels: \n";
+
+    public ViewCategoryCommand() {
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        String message = "";
+        List<Category> categories = model.getCategoryLabels();
+        for (int i = 0; i < categories.size(); i++){
+            message = message + categories.get(i).categoryName + "\n";
+        }
+        return new CommandResult(MESSAGE_VIEW_CATEGORY_LABELS_SUCCESS + message);
+    }
+
 }

src/main/java/seedu/address/logic/commands/ViewCommand.java

@@ -20,7 +20,7 @@ public class ViewCommand extends Command {
             + "Parameters: INDEX (must be a positive integer)\n"
             + "Example: " + COMMAND_WORD + " 1";
 
-    public static final String MESSAGE_VIEW_EXPENSE_SUCCESS = "View Expense: %1$s";
+    public static final String MESSAGE_VIEW_EXPENSE_SUCCESS = "View Expense: %s";
 
     private final Index targetIndex;
 
@@ -37,9 +37,9 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Expense expenseToView = lastShownList.get(targetIndex.getZeroBased());
-        String message = targetIndex.toString() + "\n" + expenseToView.toString();
-//        model.viewExpense(targetIndex);
-        return new CommandResult(String.format(MESSAGE_VIEW_EXPENSE_SUCCESS, message));
+        String prefix = String.format(MESSAGE_VIEW_EXPENSE_SUCCESS, targetIndex.getOneBased());
+        String message = prefix + "\n" + expenseToView.toString();
+        return new CommandResult(message);
     }
 
     @Override

src/main/java/seedu/address/logic/parser/ExpenseBookParser.java

@@ -1,7 +1,7 @@
 package seedu.address.logic.parser;
 
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import seedu.address.logic.commands.*;
+import seedu.address.logic.parser.exceptions.ParseException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,9 +17,11 @@
 import seedu.address.logic.commands.ViewCommand;
 import seedu.address.logic.commands.SetBudgetCommand;
 import seedu.address.logic.commands.ShowBudgetCommand;
-
 import seedu.address.logic.parser.exceptions.ParseException;
 
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+
 /**
  * Parses user input.
  */
@@ -57,6 +59,21 @@ public Command parseCommand(String userInput) throws ParseException {
         case ListExpenseCommand.COMMAND_WORD:
             return new ListExpenseCommand();
 
+        case ViewCommand.COMMAND_WORD:
+            return new ViewCommandParser().parse(arguments);
+
+        case ViewCategoryCommand.COMMAND_WORD:
+            return new ViewCategoryCommandParser().parse(arguments);
+
+        case DeleteDescriptionCommand.COMMAND_WORD:
+            return new DeleteDescriptionCommandParser().parse(arguments);
+
+        case DeleteExpenseCommand.COMMAND_WORD:
+            return new DeleteExpenseCommandParser().parse(arguments);
+
+        case ListExpenseCommand.COMMAND_WORD:
+            return new ListExpenseCommand();
+
         case ListExpenseByCategoryCommand.COMMAND_WORD:
             return new ListExpenseByCategoryCommandParser().parse(arguments);
 
@@ -71,7 +88,7 @@ public Command parseCommand(String userInput) throws ParseException {
 
         case SetBudgetCommand.COMMAND_WORD:
             return new SetBudgetCommandParser().parse(arguments);
-
+            
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }

src/main/java/seedu/address/logic/parser/ViewCategoryCommandParser.java

@@ -1,4 +1,20 @@
 package seedu.address.logic.parser;
 
-public class ViewCategoryCommandParser {
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.logic.commands.DescriptionCommand;
+import seedu.address.logic.commands.ShowBudgetCommand;
+import seedu.address.logic.commands.ViewCategoryCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.Description;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_CATEGORY;
+
+public class ViewCategoryCommandParser implements Parser<ViewCategoryCommand>{
+    @Override
+    public ViewCategoryCommand parse(String args) throws ParseException {
+        return new ViewCategoryCommand();
+    }
 }

src/main/java/seedu/address/model/ExpenseBook.java

@@ -6,6 +6,7 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.index.Index;
+import seedu.address.model.person.Category;
 import seedu.address.model.person.Expense;
 import seedu.address.model.person.UniqueExpenseList;
 
@@ -145,4 +146,8 @@ public double getRemainingBudget() {
     }
     //end of yuanxing edits
 
+    public List<Category> getCategoryLabels(){
+        return expenses.getCategoryLabels();
+    }
+
 }

src/main/java/seedu/address/model/ExpenseModelManager.java

@@ -4,6 +4,7 @@
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 
@@ -12,6 +13,7 @@
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.commons.core.index.Index;
+import seedu.address.model.person.Category;
 import seedu.address.model.person.Expense;
 import seedu.address.model.person.Person;
 
@@ -26,6 +28,7 @@ public class ExpenseModelManager implements Model {
     private final FilteredList<Expense> filteredExpenses;
 
 
+
     /**
      * Initializes a ModelManager with the given addressBook and userPrefs.
      */
@@ -120,15 +123,6 @@ public void setExpense(Expense target, Expense editedExpense) {
         expenseBook.setExpense(target, editedExpense);
     }
 
-    /**
-     * View the detals of a certain expense.
-     *
-     * @param index The index of the expense to be viewed in the ExpenseBook.
-     */
-    public void viewExpense(Index index) {
-        expenseBook.viewExpense(index);
-    }
-
     //=========== Filtered Expense List Accessors =============================================================
 
     /**
@@ -191,5 +185,10 @@ public void setExpenseBookBudget(double budget) {
         expenseBook.setBudget(budget);
     }
 
+    @Override
+    public List<Category> getCategoryLabels() {
+        return expenseBook.getCategoryLabels();
+    }
+
 
 }

src/main/java/seedu/address/model/Model.java

@@ -1,10 +1,13 @@
 package seedu.address.model;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.function.Predicate;
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.person.Category;
 import seedu.address.model.person.Expense;
 import seedu.address.model.person.Person;
 
@@ -101,4 +104,6 @@ public interface Model {
     double getExpenseBookRemaining();
 
     void setExpenseBookBudget(double budget);
+
+    List<Category> getCategoryLabels();
 }

src/main/java/seedu/address/model/ModelManager.java

@@ -4,13 +4,16 @@
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.nio.file.Path;
+import java.util.List;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.person.Category;
 import seedu.address.model.person.Expense;
 import seedu.address.model.person.Person;
 
@@ -26,7 +29,6 @@ public class ModelManager implements Model {
 
     private final FilteredList<Expense> filteredExpenses;
 
-    private Expense expenseToBeViewed;
 
     /**
      * Initializes a ModelManager with the given addressBook and userPrefs.
@@ -198,6 +200,11 @@ public void setExpenseBookBudget(double budget) {
 
     }
 
+    @Override
+    public List<Category> getCategoryLabels() {
+        return null;
+    }
+
     @Override
     public boolean equals(Object obj) {
         // short circuit if same object

src/main/java/seedu/address/model/person/Expense.java

@@ -89,23 +89,27 @@ public String toString() {
         if (description.isEmpty()) {
             builder.append(" Amount: ")
                     .append(this.getAmount())
+                    .append("\n")
                     .append(" Date: ")
                     .append(this.getDate())
+                    .append("\n")
                     .append(" Category: ")
-                    .append(this.getCategory());
+                    .append(this.getCategory())
+                    .append("\n");
             return builder.toString();
         } else {
             builder.append(" Amount: ")
                     .append(this.getAmount())
-                    .append("/n")
+                    .append("\n")
                     .append(" Date: ")
                     .append(this.getDate())
+                    .append("\n")
                     .append(" Category: ")
-                    .append("/n")
                     .append(this.getCategory())
+                    .append("\n")
                     .append(" Description: ")
                     .append(this.getDescription())
-                    .append("/n");
+                    .append("\n");
             return builder.toString();
         }
     }

src/main/java/seedu/address/model/person/UniqueExpenseList.java

@@ -4,6 +4,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -159,9 +160,21 @@ public double getBudget() {
 
     public double getRemainingBudget() {
         double used = 0;
-        for (int i = 0; i < internalList.size() - 1; i++) {
+        for (int i = 0; i < internalList.size(); i++) {
             used += internalList.get(i).getAmount().getValue();
         }
         return this.budget - used;
     }
+
+    public List<Category> getCategoryLabels(){
+        List<Category> categories = new ArrayList<>();
+        for(int i = 0; i < internalList.size(); i++) {
+            Expense current = internalList.get(i);
+            Category currentCategory = current.getCategory();
+            if(!categories.contains(currentCategory)){
+                categories.add(currentCategory);
+            }
+        }
+        return categories;
+    }
 }