Merge pull request AY1920S1-CS2113-T14-2#24 from x3chillax/B-ViewSche…

…dules

B-ViewSchedules

.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Sep 18 16:29:59 SGT 2019
+gradle.version=5.5.1

data/tasks.txt

@@ -1,4 +0,0 @@
-T|0|read book
-D|0|return book |tmr
-E|0|meeting |2019-09-09
-[P][✘] pain (from: TODO to: TODO

README.md → src/main/README.md

@@ -24,14 +24,14 @@
 
 Duke Increment | Tutorial
 ---------------|---------------
-`A-Gradle` | [Gradle Tutorial](tutorials/gradleTutorial.md)
-`A-TextUiTesting` | [Text UI Testing Tutorial](tutorials/textUiTestingTutorial.md)
+`A-Gradle` | [Gradle Tutorial](../../tutorials/gradleTutorial.md)
+`A-TextUiTesting` | [Text UI Testing Tutorial](../../tutorials/textUiTestingTutorial.md)
 `Level-10` | JavaFX tutorials:<br>→ [Part 1: Introduction to JavaFX][fx1]<br>→ [Part 2: Creating a GUI for Duke][fx2]<br>→ [Part 3: Interacting with the user][fx3]<br>→ [Part 4: Introduction to FXML][fx4]
 
-[fx1]: <tutorials/javaFxTutorialPart1.md>
-[fx2]: <tutorials/javaFxTutorialPart2.md>
-[fx3]: <tutorials/javaFxTutorialPart3.md>
-[fx4]: <tutorials/javaFxTutorialPart4.md>
+[fx1]: <../../tutorials/javaFxTutorialPart1.md>
+[fx2]: <../../tutorials/javaFxTutorialPart2.md>
+[fx3]: <../../tutorials/javaFxTutorialPart3.md>
+[fx4]: <../../tutorials/javaFxTutorialPart4.md>
 
 # Feedback, Bug Reports
 

src/main/java/duke/command/FindCommand.java

@@ -33,4 +33,4 @@ public void execute(TaskList taskList, Ui ui, Storage storage) {
         sb.setLength(sb.length() - 1);// to remove the last new line
         System.out.println(sb.toString());
     }
-}
+}

src/main/java/duke/command/ViewCommand.java

@@ -0,0 +1,47 @@
+package duke.command;
+
+import duke.storage.Storage;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.ui.Ui;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+
+/**
+ * Represents a specific {@link Command} used to find a String occurring in the {@link TaskList}
+ */
+public class ViewCommand extends Command {
+
+    private final Date Date = new Date();
+    private Date toView;
+
+    public ViewCommand(Date toView) {
+        this.toView = toView;
+    }
+
+    @Override
+    public void execute(TaskList taskList, Ui ui, Storage storage) {
+        StringBuilder sb = new StringBuilder();
+        int i = 1;
+        try {
+            for (Task task : taskList.getAllTasks()) {
+                //task.setNewDate();
+                if ((task.getCurrentDate()).equals(toView)) {
+                    //needs work on this part. comparing of time use Date always takes into account time 0000
+                    sb.append("\t ").append(i++).append(".").append(task.toString());
+                    sb.append(System.lineSeparator());
+                }
+            }
+        if (sb.length() == 0) {
+            System.out.println("No matching date found! ");
+        } else
+            System.out.println("\t Here are the tasks in the requested date:");
+        sb.setLength(sb.length() - 1);// to remove the last new line
+        System.out.println(sb.toString());
+        }catch(Exception e)  {
+
+        }
+    }
+}

src/main/java/duke/parser/Parser.java

@@ -71,16 +71,22 @@ public static Command parse(String fullCommand) throws DukeException {
                     int taskNb = Integer.parseInt(splitted[1]);
                     return new DeleteCommand(taskNb - 1);
                 } else throw new DukeException("Need a task number after done!");
-
             case "snooze":
                 if ((splitted.length == 1) || splitted[1].isBlank())
                     throw new DukeException("The description of a snooze cannot be empty.");
                 String[] getUntil = splitted[1].split("/until ", 2);
                 if (getUntil.length < 2)
                     throw new DukeException("The description of a snooze must contain /until date!");
+                //return new Snooze(getUntil[0], getUntil[1]);
+            case "view":
+                if ((splitted.length == 1) || splitted[1].isBlank()) {
+                    throw new DukeException("The description of a view must contain date!");
+                }
+                else{
+                    Date splittedDate = Parser.getDate(splitted[1]);
+                    return new ViewCommand(splittedDate);
+                }
                 return new Snooze(getUntil[0], getUntil[1]);
-
-
             case "period":
                 if ((splitted.length == 1) || splitted[1].isEmpty())
                     throw new DukeException("The description of a period cannot be empty.");
@@ -96,7 +102,6 @@ public static Command parse(String fullCommand) throws DukeException {
                 catch(Exception e){
                     throw new DukeException("NO");
                 }
-
             default:
                 throw new DukeException("I'm sorry, but I don't know what that means :-(");
         }

src/main/java/duke/task/Deadline.java

@@ -51,6 +51,7 @@ public Date getDate() {
      * @return String used to print the {@link Task } in the text file
      */
     public String printInFile() {
-        return this.isDone() ? "D|1|" + this.getDescription() + "|" + Parser.getDateString(date, by) : "D|0|" + this.getDescription() + "|" + Parser.getDateString(date, by);
+        //return this.isDone() ? "D|1|" + this.getDescription() + "|" + Parser.getDateString(date, by) : "D|0|" + this.getDescription() + "|" + Parser.getDateString(date, by);
+        return this.isDone() ? "D|1|" + this.getDescription() + "|" + by : "D|0|" + this.getDescription() + "|" + by;
     }
 }

src/main/java/duke/task/Event.java

@@ -35,12 +35,11 @@ public Date getCurrentDate() {
     public String toString() {
         return "[E]" + super.toString() + "(at: " + Parser.getDateString(date, at) + ")";
     }
-     /**
+    /**
      * Returns the String representation of the {@link Event} in format compatible to be easily read and written in a text file on the hard disc
      * @return String used to print the {@link Task } in the text file
      */
     public String printInFile() {
-        return this.isDone() ? "E|1|" + getDescription() + "|" + Parser.getDateString(date, at) : "E|0|" + this.getDescription() + "|" + Parser.getDateString(date, at);
+        return this.isDone() ? "E|1|" + getDescription() + "|" + at : "E|0|" + this.getDescription() + "|" + at;
     }
-
 }

src/main/java/duke/task/Task.java

@@ -37,6 +37,7 @@ public String getDescription() {
         return description;
     }
 
+
     /**
      * Used to mark the {@link Task} as finished
      */

src/main/java/duke/task/ViewSchedules.java

@@ -0,0 +1,22 @@
+package duke.task;
+
+import duke.parser.Parser;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+//import static duke.task.Task.getDate;
+
+public class ViewSchedules extends TaskList
+{
+    private Date when;
+    public ViewSchedules(String when) {
+        this.when = Parser.getDate(when);
+    }
+
+    public Date getCurrentDate() {
+        return when;
+    }
+}

src/test/test.iml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="main" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>