Fix bug in Parser and Time. Added in Ui.png in docs

YiJiee · Sep 18, 2019 · 4b766fc · 4b766fc
1 parent 56e341c
commit 4b766fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/Ui.png b/docs/Ui.png
diff --git a/src/main/java/main/Parser.java b/src/main/java/main/Parser.java
@@ -54,7 +54,7 @@ public static Command parse(String fullCommand) throws DukeException {
             c = new AdminCommand(commandComponents[0]);
         } else if (commandComponents[0].equals("done")) {
             c = new AdminCommand(commandComponents[0], Integer.parseInt(commandComponents[1]));
-        } else if (commandComponents[0].equals("delete")) {
+        } else if (commandComponents[0].equals("delete") && commandComponents.length == 2) {
             c = new DeleteCommand(Integer.parseInt(commandComponents[1]));
         } else if (commandComponents[0].equals("bye")) {
             c = new ExitCommand();

diff --git a/src/main/java/task/Time.java b/src/main/java/task/Time.java
@@ -27,8 +27,9 @@ public Time(String time) {
      */
     public String toString() {
         int minutes = time % 100;
-        if (time > 1200) {
-            return ((time - 1200) / 100) + minutes + "pm";
+        if (time >= 1200) {
+            int t = time - 1200 == 0 ? 12 : (time - 1200)/ 100;
+            return t + minutes + "pm";
         } else {
             return (time / 100) + minutes + "am";
         }