Fix bugs with sort feature

georgetayqy · Sep 22, 2023 · ecde3b5 · ecde3b5
1 parent f45836b
commit ecde3b5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/data/tasks.txt b/data/tasks.txt
@@ -1,12 +1,12 @@
-T|T|100000
-T|F|bitch
-E|F|bruh|2020-10-01T00:00|2022-10-05T00:00
-T|F|bruh
-T|F|bruh
+E|F|this|2029-01-01T00:00|2099-01-01T00:00
 D|T|deadline task|2023-04-29T00:00
-D|F|event|2001-01-01T00:00
 E|F|idk|2019-02-01T00:00|2023-02-01T00:00
-T|T|naur
-T|F|task
-E|F|this|2029-01-01T00:00|2099-01-01T00:00
+E|F|bruh|2020-10-01T00:00|2022-10-05T00:00
+D|F|event|2001-01-01T00:00
 T|F|this
+T|F|task
+T|T|naur
+T|F|bruh
+T|F|bruh
+T|F|bitch
+T|T|100000
diff --git a/docs/README.md b/docs/README.md
@@ -413,14 +413,14 @@ sort [SORT ORDER] [SORT BY]
 > **ℹ️ Note**  
 > The values that `[SORT BY]` can take are:
 > * `d` OR `des` OR `descript` OR `description`: Sorts the list by task description
-> * `s` OR `st` OR `start` OR `start date`: Sorts the list by start date
-> * `e` OR `en` OR `end` OR `end date`: Sorts the list by end date
+> * `s` OR `st` OR `start`: Sorts the list by start date
+> * `e` OR `en` OR `end`: Sorts the list by end date
 > * `d` OR `dead` OR `deadln` OR `deadline`: Sorts the list by deadline
 
 #### Examples
 
 * `sort d d`
-* `sort asc start date`
+* `sort asc start`
 * `sort ascend description`
 
 #### Expected Outcome

diff --git a/src/main/java/juke/commands/JukeCommand.java b/src/main/java/juke/commands/JukeCommand.java
@@ -320,8 +320,8 @@ private static JukeSortListCommand sort(String[] args, TaskList taskList) {
                                                                   + "d/desc/descend/descending] "
                                                                   + "[d/des/descript/description | "
                                                                   + "dl/dead/deadln/deadline | "
-                                                                  + "s/st/start/start date | "
-                                                                  + "e/en/end/end date]");
+                                                                  + "s/st/start | "
+                                                                  + "e/en/end]");
         }
 
         try {
@@ -339,8 +339,8 @@ private static JukeSortListCommand sort(String[] args, TaskList taskList) {
                                                                   + "d/desc/descend/descending] "
                                                                   + "[d/des/descript/description | "
                                                                   + "dl/dead/deadln/deadline | "
-                                                                  + "s/st/start/start date | "
-                                                                  + "e/en/end/end date]");
+                                                                  + "s/st/start | "
+                                                                  + "e/en/end]");
         }
     }
 

diff --git a/src/main/java/juke/commons/enums/SortTypeEnum.java b/src/main/java/juke/commons/enums/SortTypeEnum.java
@@ -38,12 +38,10 @@ public static SortTypeEnum ofType(String type) {
         case "s":
         case "st":
         case "start":
-        case "start date":
             return SortTypeEnum.START_DATE;
         case "e":
         case "en":
         case "end":
-        case "end date":
             return SortTypeEnum.END_DATE;
         case "dl":
         case "dead":

diff --git a/src/main/java/juke/tasks/JukeTodo.java b/src/main/java/juke/tasks/JukeTodo.java
@@ -67,8 +67,6 @@ public int sortBy(JukeTask task, SortTypeEnum sortType) {
         }
     }
 
-
-
     /**
      * Compares the start date between this {@code JukeTodo} object with the input {@code JukeTask} object.
      *