Merge pull request #83 from Deculsion/B-FixedDurationTasks

[CS2113-F09-3]-Deculsion-B-FixedDurationTasks

data/saved_tasks.txt

@@ -1,3 +1 @@
-4/D/1/x /04/05/2000 2000
-5/E/0/project meeting /19/9/2019 1000
-6/T/0/sleep
+4/D/1/x /04/05/2000 2000

src/main/java/duke/Parser.java

@@ -15,12 +15,15 @@
 
 public class Parser {
 
-    private String addTodo(String input) throws InsufficientInfoException {
+    private String[] addTodo(String input) throws InsufficientInfoException {
         if (input.isBlank()) {
             throw new InsufficientInfoException("Sorry, the description of a Todo cannot be blank!");
-        } else {
-            return input;
         }
+
+        String[] checkHours = input.split(" /needs ", -1);
+
+        return checkHours;
+
     }
 
     private String[] addDeadline(String input) throws InsufficientInfoException {
@@ -89,7 +92,8 @@ private Command handleListInput(String listInput) throws BadInputException,
 
         //Commands which require string input.
         case "todo":
-            command = new AddCommand(Command.CommandType.TODO, addTodo(keyword[1]), null);
+            String[] todoTemp = addTodo(keyword[1]);
+            command = new AddCommand(Command.CommandType.TODO, todoTemp[0], (todoTemp.length > 1) ? todoTemp[1] : "");
             break;
         case "deadline": {
             String[] temp = addDeadline(keyword[1]);

src/main/java/duke/TaskList.java

@@ -58,6 +58,18 @@ public void addTodoItem(int index, String todoitem) {
         setListIndex(index + 1); //Next open index.
     }
 
+    /**
+     * Adds a todo item to the list but with duration.
+     * @param todoitem description of the task.
+     * @param hours duration of task.
+     */
+    public void addTodoItem(int index, String todoitem, int hours) {
+        taskList.add(new Todo(index, todoitem, hours)); //Use the constructor to create a new Task.
+        System.out.println("Todo item added: " + todoitem);
+        System.out.println("Hours needed: " + hours);
+        setListIndex(index + 1); //Next open index.
+    }
+
     /**
      * Adds a deadline item to the list and prints a confirmation.
      *

src/main/java/duke/commands/AddCommand.java

@@ -28,7 +28,11 @@ public void execute(TaskList list, Ui ui, Storage storage)  {
         int index = list.getListIndex();
 
         if (super.type == CommandType.TODO) {
-            list.addTodoItem(index, description);
+            if (!details.equals("")) {
+                list.addTodoItem(index, description, Integer.parseInt(details));
+            } else {
+                list.addTodoItem(index, description);
+            }
         } else if (super.type == CommandType.DEADLINE) {
             list.addDeadlineItem(index, description, details);
         } else { //Type is event

src/main/java/duke/items/Todo.java

@@ -8,17 +8,27 @@
 
 public class Todo extends Task {
 
+    private int duration = 0;
+
     public Todo(int index, String description) {
         super(index, description, TaskType.TODO); //Using the Task constructor. isDone is set to false.
     }
 
+    public Todo(int index, String description, int duration) {
+        super(index, description, TaskType.TODO);
+        this.duration = duration;
+    }
+
     @Override
     public String saveDetailsString() {
         return super.saveDetailsString();
     }
 
     @Override
     public String toString() {
+        if (duration > 0) {
+            return  super.toString() + " (needs " + duration + "hours)";
+        }
         return super.toString();
     }
 }