Merge pull request nus-cs2103-AY1819S2#75 from wSemis/branch-test

[V1.2] Copy enhanced, taskcopy, result_display ui enhanced

docs/UserGuide.adoc

@@ -196,18 +196,21 @@ Makes an exact copy of a person’s data and adds it to the personnel data
 records. This is implemented in the case that multiple people share
 similar details.
 
-Format: `copy INDEX`
+Format: `copy INDEX [Count]`
 
 Note: If the copied entry is not modified before exiting the program,
-there will be a notification.
+there will be a confirmation.
 
 Example:
 
-
 * `copy 3` +
 Makes a copy of the person at index 3 and inserts it at the bottom of
 the current personnel records with a copy tag.
 
+* `copy 3 4` +
+Makes 4 copies of the person at index 3 and inserts them at the bottom of
+the current personnel records with a copy tag.
+
 === Record: Access a person’s dental records
 ==== record add
 
@@ -507,10 +510,14 @@ Clears all personnel data and records from the application
 Format: `clear`
 
 === Exit
-Exits the program
+Exits the program. You won't be able to exit if copies exist
 
 Format: `exit`
 
+=== Exit anyway
+Exits the program. You can exit under no circumstances
+
+Format: `exit!`
 
 === Appointments [Coming in v2.0]
 Schedule patient appointments.

src/main/java/seedu/address/MainApp.java

@@ -174,11 +174,6 @@ public void start(Stage primaryStage) {
     @Override
     public void stop() {
         logger.info("============================ [ Stopping Address Book ] =============================");
-        if (model.checkNoCopy()) {
-            logger.info("No copies left");
-        } else {
-            logger.info("Unedited copies exist");
-        }
         try {
             storage.saveUserPrefs(model.getUserPrefs());
         } catch (IOException e) {

src/main/java/seedu/address/logic/Logic.java

@@ -73,4 +73,6 @@ public interface Logic {
      * @see seedu.address.model.Model#setSelectedPerson(Person)
      */
     void setSelectedPerson(Person person);
+
+    boolean checkNoCopy();
 }

src/main/java/seedu/address/logic/LogicManager.java

@@ -67,6 +67,9 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
         return commandResult;
     }
 
+    @Override
+    public boolean checkNoCopy() { return model.checkNoCopy(); }
+
     @Override
     public ReadOnlyAddressBook getAddressBook() {
         return model.getAddressBook();

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

@@ -10,29 +10,34 @@
 import seedu.address.logic.CommandHistory;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
+import seedu.address.model.patient.Patient;
+import seedu.address.model.patient.exceptions.PersonIsNotPatient;
 import seedu.address.model.person.Person;
 
 /**
- * Adds a person to the address book.
+ * Copy a temporary person to the address book.
  */
 public class CopyCommand extends Command {
 
     public static final String COMMAND_WORD = "copy";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Have a temporary duplicate person in the addressbook. "
-            + "Parameters: Index (Must be an integer)"
-            + "Example: " + COMMAND_WORD + " 1 ";
+            + "Parameters: Index (Must be an integer) [Number of Copies]"
+            + "Example: " + COMMAND_WORD + " 1";
 
     public static final String MESSAGE_SUCCESS = "Person copied: %1$s";
 
     private final Index index;
 
+    private final int numOfCopies;
+
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an CopyCommand to add the specified {@code Person}
      */
-    public CopyCommand(Index index) {
+    public CopyCommand(Index index, int numOfCopies) {
         requireNonNull(index);
         this.index = index;
+        this.numOfCopies = numOfCopies;
     }
 
     @Override
@@ -45,9 +50,18 @@ public CommandResult execute(Model model, CommandHistory history) throws Command
         }
 
         Person personToCopy = lastShownList.get(index.getZeroBased());
-        Person copyPerson = personToCopy.copy();
+        Person copyPerson;
+
+        requireNonNull(personToCopy);
+        if (personToCopy instanceof Patient) {
+            copyPerson = personToCopy.copy();
+        } else {
+            throw new PersonIsNotPatient();
+        }
 
-        model.addPerson(copyPerson);
+        for (int i = 0; i < numOfCopies; i++) {
+            model.addPerson(copyPerson);
+        }
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
         model.commitAddressBook();
         return new CommandResult(String.format(MESSAGE_SUCCESS, copyPerson));

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

@@ -0,0 +1,19 @@
+package seedu.address.logic.commands;
+
+import seedu.address.logic.CommandHistory;
+import seedu.address.model.Model;
+
+/**
+ * Terminates the program without any checking
+ */
+public class ExitAnywayCommand extends Command {
+    public static final String COMMAND_WORD = "exit!";
+
+    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) {
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+    }
+
+}

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

@@ -10,11 +10,19 @@ public class ExitCommand extends Command {
 
     public static final String COMMAND_WORD = "exit";
 
-    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+    static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+
+    private static final String MEESAGE_COPY_EXIST = "!eExists unedited copies in addressbook.\n"
+                                                   + "No copies will be saved.\n"
+                                                   + "Use exit! to exit anyway";
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        if (model.checkNoCopy()) {
+            return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        } else {
+            return new CommandResult(MEESAGE_COPY_EXIST);
+        }
     }
 
 }

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

@@ -0,0 +1,70 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.CommandHistory;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.task.Task;
+
+/**
+ * Copy a temporary person to the address book.
+ */
+public class TaskcopyCommand extends Command {
+
+    public static final String COMMAND_WORD = "taskcopy";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Have a temporary duplicate task in the addressbook. "
+            + "Parameters: Index (Must be an integer) [Number of Copies]"
+            + "Example: " + COMMAND_WORD + " 1";
+
+    public static final String MESSAGE_SUCCESS = "Person copied: %1$s";
+
+    private final Index index;
+
+    private final int numOfCopies;
+
+    /**
+     * Creates an TaskcopyCommand to add the specified {@code Person}
+     */
+    public TaskcopyCommand(Index index, int numOfCopies) {
+        requireNonNull(index);
+        this.index = index;
+        this.numOfCopies = numOfCopies;
+    }
+
+    @Override
+    public CommandResult execute(Model model, CommandHistory history) throws CommandException {
+        requireNonNull(model);
+        List<Task> lastShownList = model.getFilteredTaskList();
+
+        if (index.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+        }
+
+        Task taskToCopy = lastShownList.get(index.getZeroBased());
+        Task copytask = taskToCopy;
+
+        for (int i = 0; i < numOfCopies; i++) {
+            requireNonNull(taskToCopy);
+            copytask = taskToCopy.copy();
+            model.addTask(copytask);
+        }
+
+        model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+        model.commitAddressBook();
+        return new CommandResult(String.format(MESSAGE_SUCCESS, copytask));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof TaskcopyCommand // instanceof handles nulls
+                && index.equals(((TaskcopyCommand) other).index));
+    }
+}

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

@@ -12,6 +12,7 @@
 import seedu.address.logic.commands.CopyCommand;
 import seedu.address.logic.commands.DeleteCommand;
 import seedu.address.logic.commands.EditCommand;
+import seedu.address.logic.commands.ExitAnywayCommand;
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.ExportCommand;
 import seedu.address.logic.commands.FindCommand;
@@ -28,6 +29,7 @@
 import seedu.address.logic.commands.TaskAddCommand;
 import seedu.address.logic.commands.TaskDeleteCommand;
 import seedu.address.logic.commands.TaskEditCommand;
+import seedu.address.logic.commands.TaskcopyCommand;
 import seedu.address.logic.commands.UndoCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
@@ -54,7 +56,7 @@ public Command parseCommand(String userInput) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE));
         }
 
-        final String commandWord = matcher.group("commandWord");
+        final String commandWord = matcher.group("commandWord").toLowerCase();
         final String arguments = matcher.group("arguments");
         switch (commandWord) {
         case AddCommand.COMMAND_WORD:
@@ -123,6 +125,12 @@ public Command parseCommand(String userInput) throws ParseException {
         case TaskDeleteCommand.COMMAND_WORD:
             return new TaskDeleteCommandParser().parse(arguments);
 
+        case TaskcopyCommand.COMMAND_WORD:
+            return new TaskcopyCommandParser().parse(arguments);
+
+        case ExitAnywayCommand.COMMAND_WORD:
+            return new ExitAnywayCommand();
+
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }

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

@@ -3,6 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 
+import javafx.util.Pair;
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.CopyCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -22,14 +23,18 @@ public CopyCommand parse(String args) throws ParseException {
         requireNonNull(args);
 
         Index index;
+        int numOfCopies;
 
         try {
-            index = ParserUtil.parseIndex(args);
+            Pair<Index, Integer> parsedPair = ParserUtil.parseCopy(args);
+            index = parsedPair.getKey();
+            numOfCopies = parsedPair.getValue();
+
         } catch (ParseException pe) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, CopyCommand.MESSAGE_USAGE), pe);
         }
 
 
-        return new CopyCommand(index);
+        return new CopyCommand(index, numOfCopies);
     }
 }

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

@@ -9,6 +9,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javafx.util.Pair;
 import seedu.address.commons.core.index.Index;
 import seedu.address.commons.util.StringUtil;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -278,4 +279,44 @@ public static ParsedInOut parseImportExport(String input) throws ParseException
 
         return new ParsedInOut(new File(filepath), parsedIndex);
     }
+
+    /**
+     * Parse a {@code  String argument} from copy or taskcopy command to number of copies needed
+     * @param input input from copy or taskcopy command
+     * @return number of copies requested
+     * @throws ParseException
+     */
+    public static Pair<Index, Integer> parseCopy(String input) throws ParseException {
+        requireNonNull(input);
+        input = input.trim();
+
+        String[] parsedInput = input.split("\\s+");
+        Index i;
+        int numOfCopies;
+
+        if (parsedInput.length == 1) {
+
+            try {
+                i = parseIndex(parsedInput[0]);
+            } catch (NumberFormatException e) {
+                throw new ParseException("Wrong input format!");
+            }
+            return new Pair(i, 1);
+        } else if (parsedInput.length == 2) {
+
+            try {
+                i = parseIndex(parsedInput[0]);
+                numOfCopies = Integer.parseInt(parsedInput[1]);
+            } catch (NumberFormatException e) {
+                throw new ParseException("Wrong input format!");
+            }
+            if (numOfCopies < 1) {
+                throw new ParseException("Input number must be positive!");
+            }
+
+            return new Pair(i, numOfCopies);
+        }
+
+        throw new ParseException("Wrong number of arguments");
+    }
 }