[Aaron Chan Zhi] iP

src/main/java/Deadline.java

@@ -0,0 +1,14 @@
+public class Deadline extends Task {
+    private String dueDate;
+
+    public Deadline(String description, String dueDate){
+        this.description = description;
+        this.isDone = false;
+        this.taskType = "D";
+        this.dueDate = dueDate;
+    }
+
+    public String getDueDate(){
+        return this.dueDate;
+    }
+}

src/main/java/Duke.java

@@ -5,7 +5,7 @@ public class Duke {
     public static void main(String[] args) {
         boolean isExit = false;
         Scanner scanner = new Scanner(System.in);
-        TaskList task_list = new TaskList();
+        TaskList taskList = new TaskList();
 
         String logo = " ____        _        \n"
                     + "|  _ \\ _   _| | _____ \n"
@@ -23,16 +23,17 @@ public static void main(String[] args) {
             //Getting Input
             System.out.println("---------------------------------------------------");
             System.out.print("You: ");
-            String raw_input = scanner.nextLine();
-            String[] input_list = raw_input.split(" ");
-            String cmd = input_list[0];
+            String rawInput = scanner.nextLine();
+            String[] inputList = rawInput.split(" ");
+            String cmd = inputList[0];
+            String description;
 
             //Responding
             switch (cmd) {
                 case ("list"):
                     System.out.println("---------------------------------------------------");
                     System.out.println("Tasks: ");
-                    task_list.printList();
+                    taskList.printList();
                     break;
                 case ("bye"):
                     isExit = true;
@@ -44,16 +45,71 @@ public static void main(String[] args) {
                     System.out.println("---------------------------------------------------");
                     System.out.println("Marked as done:");
 
-                    String task_description = String.join(" ", Arrays.copyOfRange(input_list, 1, input_list.length));
-                    task_list.searchTask(task_description).markAsDone();
+                    description = String.join(" ", Arrays.copyOfRange(inputList, 1, inputList.length));
+                    taskList.searchTask(description).markAsDone();
 
                     System.out.print("[X] ");
-                    System.out.println(task_description);
+                    System.out.println(description);
                     break;
-                default: //Add to list
+                case ("unmark"):
                     System.out.println("---------------------------------------------------");
-                    System.out.println("Added: " + raw_input);
-                    task_list.addTask(raw_input);
+                    System.out.println("Marked as not completed:");
+
+                    description = String.join(" ", Arrays.copyOfRange(inputList, 1, inputList.length));
+                    taskList.searchTask(description).markAsNotDone();
+
+                    System.out.print("[ ] ");
+                    System.out.println(description);
+                    break;
+                case ("todo"): //Add to list
+                    System.out.println("---------------------------------------------------");
+                    description = String.join(" ", Arrays.copyOfRange(inputList, 1, inputList.length));
+                    System.out.println("Added:");
+                    System.out.println(" [T][ ] " + description);
+                    taskList.addToDo(description);
+                    System.out.println("Now you have " + taskList.getSize() + " tasks in the list.");
+                    break;
+                case ("deadline"):
+                    System.out.println("---------------------------------------------------");
+                    int byPosition = 0;
+                    String dueDate;
+                    for (int i=0; i<inputList.length; i++){
+                        if (inputList[i].equals("by")) {
+                            byPosition = i;
+                            break;
+                        }
+                    }
+                    if (byPosition == 0){
+                        System.out.println("Please state the deadline!");
+                        break;
+                    }
+                    description = String.join(" ", Arrays.copyOfRange(inputList, 1, byPosition));
+                    dueDate = String.join(" ", Arrays.copyOfRange(inputList, byPosition+1, inputList.length));
+                    System.out.println("Added:");
+                    System.out.println(" [D][ ] " + description + " (by: " + dueDate + ")");
+                    taskList.addDeadline(description, dueDate);
+                    System.out.println("Now you have " + taskList.getSize() + " tasks in the list.");
+                    break;
+                case ("event"):
+                    System.out.println("---------------------------------------------------");
+                    int atPosition = 0;
+                    String dateTime;
+                    for (int i=0; i<inputList.length; i++){
+                        if (inputList[i].equals("at")){
+                            atPosition = i;
+                            break;
+                        }
+                    }
+                    if (atPosition == 0){
+                        System.out.println("Please state the date and time!");
+                        break;
+                    }
+                    description = String.join(" ", Arrays.copyOfRange(inputList, 1, atPosition-1));
+                    dateTime = String.join(" ", Arrays.copyOfRange(inputList, atPosition+1, inputList.length));
+                    System.out.println("Added:");
+                    System.out.println(" [E][ ] " + description + " (at: " + dateTime + ")");
+                    taskList.addEvent(description, dateTime);
+                    System.out.println("Now you have " + taskList.getSize() + " tasks in the list.");
                     break;
             }
         }

src/main/java/Event.java

@@ -0,0 +1,14 @@
+public class Event extends Task {
+    protected String dateTime;
+
+    public Event(String description, String dateTime){
+        this.description = description;
+        this.isDone = false;
+        this.taskType = "E";
+        this.dateTime = dateTime;
+    }
+
+    public String getDateTime(){
+        return this.dateTime;
+    }
+}

src/main/java/Task.java

@@ -1,17 +1,32 @@
 public class Task {
     public String description;
+    protected String taskType;
     protected boolean isDone;
 
-    public Task(String description){
-        this.description = description;
-        this.isDone = false;
-    }
-
     public String getStatusIcon() {
         return (isDone ? "X" : " ");
     }
 
+    public String getTaskType(){
+        return taskType;
+    }
+
+    public void setTaskType(String type){
+        taskType = type;
+    }
+
     public void markAsDone() {
         if (isDone==false) this.isDone = true;
     }
+
+    public void markAsNotDone(){
+        if (isDone==true) this.isDone = false;
+    }
+
+    public String getDueDate(){
+        return " ";
+    }
+    public String getDateTime(){
+        return " ";
+    }
 }

src/main/java/TaskList.java

@@ -1,27 +1,58 @@
 import java.util.ArrayList;
 
 public class TaskList{
+
     public int size = 0;
     protected ArrayList<Task> list = new ArrayList<Task>();
-
     public TaskList(){}
 
-    public void addTask(String task_name){
-        Task task = new Task(task_name);
-        list.add(task);
+    public void addToDo(String description){
+        ToDo toDo = new ToDo(description);
+        list.add(toDo);
+        this.size++;
+    }
+
+    public void addDeadline(String description, String dueDate){
+        Deadline deadline = new Deadline(description, dueDate);
+        list.add(deadline);
+        this.size++;
+    }
+
+    public void addEvent(String description, String dateTime){
+        Event event = new Event(description, dateTime);
+        list.add(event);
         this.size++;
     }
 
     public Task getTask(int index){
-        return list.get(index);
+        return (Task)list.get(index);
     }
 
     public void printList(){
         for (int i=0; i<size; i++){
             Task tempTask = this.getTask(i);
-            System.out.print((i+1) + ") ");
-            System.out.print("[" + tempTask.getStatusIcon() + "] ");
-            System.out.println(tempTask.description);
+            String taskType = tempTask.getTaskType();
+            if (taskType == "T"){
+                tempTask = (ToDo)tempTask;
+                System.out.print((i+1) + ") ");
+                System.out.print("[" + tempTask.getTaskType() + "]");
+                System.out.print("[" + tempTask.getStatusIcon() + "] ");
+                System.out.println(tempTask.description);   
+            } else if (taskType == "D"){
+                tempTask = (Deadline) tempTask;
+                System.out.print((i+1) + ") ");
+                System.out.print("[" + tempTask.getTaskType() + "]");
+                System.out.print("[" + tempTask.getStatusIcon() + "] ");
+                System.out.print(tempTask.description);
+                System.out.println(" (by: " + tempTask.getDueDate() + ")");   
+            } else if (taskType == "E"){
+                tempTask = (Event) tempTask;
+                System.out.print((i+1) + ") ");
+                System.out.print("[" + tempTask.getTaskType() + "]");
+                System.out.print("[" + tempTask.getStatusIcon() + "] ");
+                System.out.print(tempTask.description);
+                System.out.println(" (by: " + tempTask.getDateTime() + ")"); 
+            }
         }
     }
 
@@ -32,4 +63,8 @@ public Task searchTask(String task_description){
         }
         return null;
     }
+
+    public int getSize(){
+        return size;
+    }
 }

src/main/java/ToDo.java

@@ -0,0 +1,9 @@
+public class ToDo extends Task {
+
+    public ToDo(String description){
+        this.description = description;
+        this.isDone = false;
+        this.taskType = "T";
+    }
+
+}