[janelleenqi] iP

src/main/java/ActionType.java

@@ -0,0 +1,3 @@
+public enum ActionType {
+    LIST, MARK, UNMARK, TODO, DEADLINE, EVENT
+}

src/main/java/Deadline.java

@@ -0,0 +1,31 @@
+public class Deadline extends Todo {
+    protected String byDate;
+
+    public Deadline(String description, String date) {
+        super(description);
+        setByDate(date);
+    }
+
+    public String getByDate() {
+        return byDate;
+    }
+
+    public void setByDate(String date) {
+        int spaceCut = date.indexOf(" ");
+        byDate = date.substring(spaceCut + 1);
+    }
+
+    @Override
+    public String toString() {
+        //super.toString();
+        String isDoneString;
+
+        if (isDone()) {
+            isDoneString = "[X]";
+        } else {
+            isDoneString = "[ ]";
+        }
+
+        return "\t[D]" + isDoneString + getDescription() + "(do by: " + getByDate() + ")";
+    }
+}

src/main/java/Duke.java

@@ -1,10 +1,94 @@
+import java.util.Scanner;
+
 public class Duke {
+    private static final String BYE_COMMAND = "bye";
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
+        String logo = "\t _           _\n"
+                + "\t| |    _   _| | _____\n"
+                + "\t| |   | | | | |/ / _ \\\n"
+                + "\t| |___| |_| |   <  __/\n"
+                + "\t|_____|\\__,_|_|\\_\\___|\n";
+        System.out.println("\t" + "Hello! I'm\n" + logo);
+        System.out.println("\t" + "What can I do for you?");
+
+        Task[] taskList = new Task[100];
+        Scanner userInput = new Scanner(System.in);
+        int counter = 0;
+
+        String echo = userInput.nextLine();
+        int taskNumber;
+        String taskDescription;
+        int slashCut;
+
+        while (!echo.equals(BYE_COMMAND)) {
+            String[] words = echo.split(" "); //to identify usage of features "mark" & "unmark"
+            ActionType action = ActionType.valueOf(words[0].toUpperCase());
+
+            switch (action) {
+                case LIST:
+                    System.out.println("\tHere are the tasks in your list:");
+                    for (int i = 0; i < counter; i += 1) {
+                        System.out.println("\t" + (i + 1) + "." + taskList[i]);
+                    }
+                    break;
+                case MARK:
+                    taskNumber = Integer.parseInt(words[1]) - 1;
+                    System.out.println("\tWoohoo! You have accomplished:");
+                    taskList[taskNumber].setDone(true);
+                    System.out.println(taskList[taskNumber]);
+                    break;
+                case UNMARK:
+                    taskNumber = Integer.parseInt(words[1]) - 1;
+                    System.out.println("\tHA! You still have to complete:");
+                    taskList[taskNumber].setDone(false);
+                    System.out.println(taskList[taskNumber]);
+                    break;
+
+                case TODO:
+                    //int spaceCut = echo.indexOf(" ");
+                    taskDescription = echo.substring(4);
+                    taskList[counter] = new Todo(taskDescription);
+                    System.out.println("\tGot it. I've added this task:" + "\n" + taskList[counter]);
+                    counter += 1;
+                    System.out.println("\tNow you have " + counter + " tasks in the list.");
+                    break;
+
+
+                case DEADLINE:
+                    taskDescription = echo.substring(8);
+                    slashCut = taskDescription.indexOf("/");
+
+                    String taskDeadline = taskDescription.substring(slashCut + 1);
+                    taskDescription = taskDescription.substring(0, slashCut);
+
+                    taskList[counter] = new Deadline(taskDescription, taskDeadline);
+                    System.out.println("\tGot it. I've added this task:" + "\n" + taskList[counter]);
+                    counter += 1;
+                    System.out.println("\tNow you have " + counter + " tasks in the list.");
+                    break;
+
+
+                case EVENT:
+                    taskDescription = echo.substring(5);
+                    slashCut = taskDescription.indexOf("/");
+
+                    String taskDuration = taskDescription.substring(slashCut);
+                    taskDescription = taskDescription.substring(0, slashCut);
+
+                    taskList[counter] = new Event(taskDescription, taskDuration);
+                    System.out.println("\tGot it. I've added this task:" + "\n" + taskList[counter]);
+                    counter += 1;
+                    System.out.println("\tNow you have " + counter + " tasks in the list.");
+                    break;
+
+                default:
+                    break;
+            }
+            echo = userInput.nextLine();
+        }
+
+        System.out.println("\tBye. Hope to see you again soon!");
+
+        userInput.close();
     }
 }

src/main/java/Event.java

@@ -0,0 +1,43 @@
+public class Event extends Deadline {
+    protected String startDate;
+    protected String endDate;
+
+    public Event(String description, String dates) {
+        super(description, dates);
+        setDates(dates);
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setDates(String dates) {
+        int spaceCut = dates.indexOf(" ");
+        dates = dates.substring(spaceCut + 1);
+
+        int slashCut = dates.indexOf("/");
+        startDate = dates.substring(0, slashCut);
+        dates = dates.substring(slashCut + 1);
+
+        spaceCut = dates.indexOf(" ");
+        endDate = dates.substring(spaceCut + 1);
+    }
+
+    @Override
+    public String toString() {
+        //super.toString();
+        String isDoneString;
+
+        if (isDone()) {
+            isDoneString = "[X]";
+        } else {
+            isDoneString = "[ ]";
+        }
+
+        return "\t[E]" + isDoneString + getDescription() + "(from: " + getStartDate() + "to: " + getEndDate() + ")";
+    }
+}

src/main/java/Task.java

@@ -0,0 +1,28 @@
+public class Task {
+    protected String description;
+    protected boolean isDone;
+
+    public Task(String description) {
+        this.description = description;
+        isDone = false;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+
+    public boolean isDone() {
+        return isDone;
+    }
+
+    public void setDone(boolean done) {
+        isDone = done;
+    }
+
+    @Override
+    public String toString() {
+        return "";
+    }
+
+}

src/main/java/Todo.java

@@ -0,0 +1,22 @@
+public class Todo extends Task {
+    //protected boolean isDone;
+
+    public Todo(String description) {
+        super(description);
+        //isDone = false;
+    }
+
+    @Override
+    public String toString() {
+        //super.toString();
+        String isDoneString;
+
+        if (isDone()) {
+            isDoneString = "[X]";
+        } else {
+            isDoneString = "[ ]";
+        }
+
+        return "\t[T]" + isDoneString + getDescription();
+    }
+}

text-ui-test/EXPECTED.TXT

@@ -1,7 +1,27 @@
-Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
+Hello! I'm
+ _           _
+| |    _   _| | _____
+| |   | | | | |/ / _ \
+| |___| |_| |   <  __/
+|_____|\__,_|_|\_\___|
 
+What can I do for you?
+Got it. I've added this task:
+[T][ ] Liow Enqi Janelle Answer CS2113 tutorial questions
+Now you have 1 tasks in the list.
+Got it. I've added this task:
+[D][ ] weekly CS2113 quiz (do by: Monday 9pm)
+Now you have 2 tasks in the list.
+Here are the tasks in your list:
+1.[T][ ] Liow Enqi Janelle Answer CS2113 tutorial questions
+2.[D][ ] weekly CS2113 quiz (do by: Monday 9pm)
+Got it. I've added this task:
+[E][ ] CS2113 lecture (from: Friday 4 to: 6pm)
+Now you have 3 tasks in the list.
+Woohoo! You have accomplished:
+[T][X] Liow Enqi Janelle Answer CS2113 tutorial questions
+Here are the tasks in your list:
+1.[T][X] Liow Enqi Janelle Answer CS2113 tutorial questions
+2.[D][ ] weekly CS2113 quiz (do by: Monday 9pm)
+3.[E][ ] CS2113 lecture (from: Friday 4 to: 6pm)
+Bye. Hope to see you again soon!

text-ui-test/input.txt

@@ -0,0 +1,7 @@
+todo Liow Enqi Janelle Answer CS2113 tutorial questions
+deadline weekly CS2113 quiz /by Monday 9pm
+list
+event CS2113 lecture /from Friday 4 /to 6pm
+mark 1
+list
+bye

text-ui-test/runtest.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+
 # create bin directory if it doesn't exist
 if [ ! -d "../bin" ]
 then
@@ -13,7 +14,7 @@ then
 fi
 
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/*.java
+if ! javac -cp /Users/janelle/cs2113repo/ip/src/main/java -Xlint:none -d ../bin /Users/janelle/cs2113repo/ip/src/main/java/*.java
 then
     echo "********** BUILD FAILURE **********"
     exit 1
@@ -23,11 +24,11 @@ fi
 java -classpath ../bin Duke < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
-cp EXPECTED.TXT EXPECTED-UNIX.TXT
-dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT
+#cp EXPECTED.TXT EXPECTED-UNIX.TXT
+#dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT
 
 # compare the output to the expected output
-diff ACTUAL.TXT EXPECTED-UNIX.TXT
+diff ACTUAL.TXT EXPECTED.TXT
 if [ $? -eq 0 ]
 then
     echo "Test result: PASSED"