Merge pull request #202 from ChenKangg/master

update location + help command
AY2324S2-CS2113-T12-4 · Apr 8, 2024 · cbbdbdc · cbbdbdc
2 parents 4a4c025 + 9eb038c
commit cbbdbdc
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 6 deletions.
diff --git a/src/main/java/seedu/omnitravel/parser/Parser.java b/src/main/java/seedu/omnitravel/parser/Parser.java
@@ -377,10 +377,11 @@ public static void currencyExchangeCommand(String line) throws OmniException{
     public static void locationCommand(String line, TravelActivityList list) throws OmniException {
         String[] command = line.split(" ");
         if (command.length >= 3 && CheckParameters.isNumeric(command[1])){
-            String index = command[1];
-            String[] locationSplit = line.split(index);
-            String location = locationSplit[1].trim();
-            int listNumber = Integer.parseInt(index);
+            int listNumber = Integer.parseInt(command[1]);
+            // Extract location starting from the third element onwards
+            String[] locationArray = Arrays.copyOfRange(command, 2, command.length);
+            // Join the location into a single string
+            String location = String.join(" ", locationArray);
             list.locationActivity(listNumber, location);
         } else if (command.length == 2) {
             throw new OmniException("Please specify a location");

diff --git a/src/main/java/seedu/omnitravel/storage/FileSave.java b/src/main/java/seedu/omnitravel/storage/FileSave.java
@@ -81,6 +81,7 @@ public void saveActivityList(TravelActivityList list) throws IOException {
                     + " / " + travelActivity.getDuration()
                     + " / " + travelActivity.getTag()
                     + " / " + travelActivity.getExpense()
+                    + " / " + travelActivity.getLocation()
                     + System.lineSeparator());
         }
         fw.close();

diff --git a/src/main/java/seedu/omnitravel/ui/Ui.java b/src/main/java/seedu/omnitravel/ui/Ui.java
@@ -62,26 +62,75 @@ public static void helpCommand(){
         printLine();
         System.out.println("These are the available commands!");
         System.out.println("");
-        System.out.println("1. list: List out the current list\n" +
+        System.out.println(
+                "1. list: List out the current list\n" +
+                "Format: `list`\n" +
+
                 "2. help: Get all commands for the chatbot\n" +
+                "Format: `help`\n" +
+
                 "3. bye: Exit the chatbot\n" +
+                "Format: `bye`\n" +
+
                 "4. add <travel activity> <date> <duration> <tag>\n" +
+                "Format: `add DESCRIPTION /date YYYY-MM-DD /duration DURATION [/tag TAG]`\n" +
+
                 "5. accommodation <travel activity> <date> <duration> <tag>\n" +
+                "Format: `accommodation DESCRIPTION /date YYYY-MM-DD /duration DURATION [/tag TAG]`\n" +
+
                 "6. food <travel activity> <date> <duration> <tag>\n" +
+                "Format: `food DESCRIPTION /date YYYY-MM-DD /duration DURATION [/tag TAG]`\n" +
+
                 "7. landmark <travel activity> <date> <duration> <tag>\n" +
+                "Format: `landmark DESCRIPTION /date YYYY-MM-DD /duration DURATION [/tag TAG]`\n" +
+
                 "8. delete <activity number>\n" +
+                "Format: `delete INDEX`\n" +
+
                 "9. find <keyword>\n" +
+                "Format: `find DESCRIPTION`\n" +
+
                 "10. check <activity number>\n" +
+                "Format: `check INDEX`\n" +
+
                 "11. uncheck <activity number>\n" +
+                "Format: `uncheck INDEX`\n" +
+
                 "12. tag <activity number> <tag name>\n" +
+                "Format: `tag INDEX TAGNAME`\n" +
+
                 "13. untag <activity number>\n" +
+                "Format: `untag INDEX`\n" +
+
                 "14. update <update> <date> <duration> <tag>\n" +
+                "Format: `update INDEX /date YYYY-MM-DD /duration DURATION [/tag TAG]`\n" +
+
                 "15. findtag <tag name>\n" +
+                "Format: `findtag TAG`\n" +
+
                 "16. findtype <type>\n" +
+                "Format: `findtype TYPE`\n" +
+
                 "17. expense <activity number> <expense amount>\n" +
+                "Format: `expense INDEX EXPENSE`\n" +
+
                 "18. removeexpense <activity number>\n" +
+                "Format: `removeexpense INDEX`\n" +
+
                 "19. totalexpense <type>\n" +
-                "20. change <amount> /from <current currency> /to <changed currency> ");
+                "Format: `totalexpense [/type TYPE]`\n" +
+
+                "20. change <amount> /from <current currency> /to <changed currency>\n" +
+                "Format: `change AMOUNT /from CODE /to CODE`\n" +
+
+                "21. location <activity number> <location>\n" +
+                "Format: `location INDEX LOCATION`\n" +
+
+                "22. removelocation <activity number>\n" +
+                "Format: `removelocation INDEX`\n" +
+
+                "23. findlocation <location>\n" +
+                "Format: `findlocation LOCATION`\n");
         printLine();
     }