Merge pull request #121 from Cheezeblokz/master

Goal Event implementation

Author: Cheezeblokz

data/events/event.txt

@@ -1,2 +1,4 @@
 hello | 2023-12-20T12:30:30 | 2023-12-20T12:30:30 
 EC3333 | 2023-12-20T12:30:30 | 2023-12-20T12:30:40 
+Deadline | 2023-12-20T12:30:30 | 10 | 0 
+More Deadline | 2023-12-20T12:30:30 | 20 | 0 

src/main/java/seedu/duke/calendar/Calendar.java

@@ -7,6 +7,17 @@ public class Calendar {
      * The class is here for integrating Flashcard goals with the Calendar.
      * Any other features related to the Calendar can be added here in the future.
      */
-
     EventList eventList;
+
+    public Calendar(EventList eventList) {
+        this.eventList = eventList;
+    }
+
+    public void incrementFlashcardCount() {
+        for(Event event : eventList.getEvents()) {
+            if (event.getClass() == Goal.class) {
+                ((Goal) event).flashcardCompleted();
+            }
+        }
+    }
 }

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

@@ -2,13 +2,7 @@
 
 package seedu.duke.calendar;
 
-import seedu.duke.calendar.command.AddEventCommand;
-import seedu.duke.calendar.command.DeleteAllEventsCommand;
-import seedu.duke.calendar.command.DeleteEventCommand;
-import seedu.duke.calendar.command.EventCommand;
-import seedu.duke.calendar.command.UnknownCommand;
-import seedu.duke.calendar.command.FindEventCommand;
-import seedu.duke.calendar.command.ListCalendarEventsCommand;
+import seedu.duke.calendar.command.*;
 
 import seedu.duke.calendar.Exceptions.AddEventException;
 import seedu.duke.calendar.Exceptions.DeleteEventException;
@@ -73,6 +67,8 @@ public EventCommand parseInput(String input) {
             manageException(input);
             if (input.startsWith("add event")) {
                 return new AddEventCommand();
+            } else if (input.startsWith("add goal event")) {
+                return new AddGoalEventCommand();
             } else if (input.startsWith("delete event")) {
                 return new DeleteEventCommand();
             } else if (input.startsWith("list events")) {

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -38,7 +38,7 @@ public CalendarManager(ArrayList<Event> events) {
             eventList = new EventList(events);
         }
 
-        calendar = new Calendar();
+        calendar = new Calendar(eventList);
         calendarUi = new CalendarUi(eventList);
         calendarCommandParser = new CalendarCommandParser();
         scanner = new Scanner(System.in);
@@ -72,7 +72,7 @@ public boolean isResponsible(String input) {
     public void processInput(String input) {
         startCalendar(input);
 
-        storage.saveEvents(eventList.getEvent());
+        storage.saveEvents(eventList.getEvents());
     }
 
     /**

src/main/java/seedu/duke/calendar/Event.java

@@ -27,8 +27,8 @@ public void setName(String name) {
     }
 
     // getFrom is used for getting the start time of an Event.
-    public LocalDateTime getFrom() {
-        return from;
+    public String getFrom() {
+        return from.toString();
     }
 
     // setFrom is used for setting the start time of an Event.
@@ -37,8 +37,8 @@ public void setFrom(LocalDateTime from) {
     }
 
     // getFrom is used for getting the end time of an Event.
-    public LocalDateTime getTo() {
-        return to;
+    public String getTo() {
+        return to.toString();
     }
 
     // setFrom is used for setting the end time of an Event.

src/main/java/seedu/duke/calendar/EventList.java

@@ -18,7 +18,7 @@ public void addEvent(Event event) {
     }
 
     // getEvent is used to get an event from the EventList.
-    public ArrayList<Event> getEvent() {
+    public ArrayList<Event> getEvents() {
         return eventList;
     }
 

src/main/java/seedu/duke/calendar/EventStorage.java

@@ -39,13 +39,18 @@ public boolean isStorageAvailable(){
      */
     private Event loadEvent(String[] tokens){
 
-        assert tokens.length == 3: "Token length should be 3";
-
+        assert tokens.length == 3 || tokens.length == 4: "Token length should be 3 or 4";
+        if(tokens.length == 3) {
+            String name = tokens[0].trim();
+            LocalDateTime from = LocalDateTime.parse(tokens[1].trim());
+            LocalDateTime to = LocalDateTime.parse(tokens[2].trim());
+            return new Event(name, from, to);
+        }
         String name = tokens[0].trim();
-        LocalDateTime from = LocalDateTime.parse(tokens[1].trim());
-        LocalDateTime to = LocalDateTime.parse(tokens[2].trim());
-
-        return new Event(name, from, to);
+        LocalDateTime by = LocalDateTime.parse(tokens[1].trim());
+        int goal = Integer.parseInt(tokens[2].trim());
+        int completed = Integer.parseInt(tokens[3].trim());
+        return new Goal(name, by, goal, completed);
     }
 
     /**
@@ -83,8 +88,13 @@ public void saveEvents(ArrayList<Event> eventList) {
             FileWriter fw = new FileWriter(path);
 
             for (Event event : eventList) {
-                fw.write(String.format("%s | %s | %s \r\n",
-                        event.getName(), event.getFrom(), event.getTo()));
+                if (event.getClass() == Goal.class) {
+                    fw.write(String.format("%s | %s | %s | %s \r\n",
+                            event.getName(), event.getTo(), ((Goal) event).getGoal(), ((Goal) event).getCompleted()));
+                } else {
+                    fw.write(String.format("%s | %s | %s \r\n",
+                            event.getName(), event.getFrom(), event.getTo()));
+                }
             }
             fw.close();
         } catch (IOException e){

src/main/java/seedu/duke/calendar/Goal.java

@@ -0,0 +1,44 @@
+package seedu.duke.calendar;
+
+import java.time.LocalDateTime;
+
+public class Goal extends Event{
+
+    private String name;
+    private LocalDateTime to;
+    private int goal;
+    private int completed;
+
+    public Goal(String name, LocalDateTime to, int goal, int completed) {
+        super(name, null, to);
+        this.name = name;
+        this.to = to;
+        this.goal = goal;
+        this.completed = completed;
+    }
+
+    public int getGoal() {
+        return goal;
+    }
+
+    public Object getCompleted() {
+        return completed;
+    }
+
+    public void flashcardCompleted() {
+        if (LocalDateTime.now().isBefore(to)) {
+            completed += 1;
+        }
+    }
+
+    @Override
+    public String getFrom() {
+        return "null";
+    }
+
+    @Override
+    public String toString() {
+        return "Goal '" + name + '\'' + " review " + goal + " flashcards by: " + to + " (Reviewed: " + completed + ")";
+    }
+
+}

src/main/java/seedu/duke/calendar/command/AddEventCommand.java

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan
+//@@author kherlenbayasgalan
 
 package seedu.duke.calendar.command;
 
@@ -58,7 +58,7 @@ private LocalDateTime parseDateTimeInput(Scanner scanner, String prompt) {
             String userInput = scanner.nextLine();
             try {
                 // checks if the acceptable format is given by the user to prevent program crash
-                return LocalDateTime.parse(userInput, DateTimeFormatter.ofPattern("yyyy-MM-ddTHH:mm:ss"));
+                return LocalDateTime.parse(userInput);
             } catch (DateTimeParseException e) {
                 System.out.println("    Invalid date and time format. Please try again.");
             }

src/main/java/seedu/duke/calendar/command/AddGoalEventCommand.java

@@ -0,0 +1,78 @@
+package seedu.duke.calendar.command;
+
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.EventList;
+import seedu.duke.calendar.Goal;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Scanner;
+
+public class AddGoalEventCommand extends EventCommand{
+
+    //@@author kherlenbayasgalan-reused
+
+    /**
+     * The execute method is used to add an event goal to the calendar. It has two parameters (Scanner, EventList).
+     * The EventList is used to add an event to the list. The scanner is used to get the user's event name input.
+     * The method first takes the event name, then through parseDateTimeInput, it gets an acceptable date/time
+     * from the user. If the user inserts acceptable inputs, the event goal will be added. If the user doesn't,
+     * either one of DateTimeParseException or Invalid input exception.
+     * @param scanner is used to get user's event name.
+     * @param eventList is used to add an event to the list.
+     */
+
+    public void execute(Scanner scanner, EventList eventList) {
+        System.out.print("What's the goal event name?: ");
+        String eventName = scanner.nextLine();
+
+        // checks if the acceptable format is given by the user to prevent program crash
+        LocalDateTime endTime = parseDateTimeInput(scanner, "When does it end? (yyyy-MM-ddTHH:mm:ss) (e.g., 2023-12-20T12:30:30): ");
+        int goal = parseIntegerInput(scanner, "How many flashcard to review by then?: ");
+
+        Event event = new Goal(eventName, endTime, goal, 0);
+        eventList.addEvent(event);
+        System.out.println(event + " has been added to your Calendar");
+    }
+
+    //@@author Cheezeblokz
+
+    private int parseIntegerInput(Scanner scanner, String prompt) {
+        while (true) {
+            System.out.print(prompt);
+            String userInput = scanner.nextLine();
+            try {
+                // checks if the acceptable format is given by the user to prevent program crash
+                return Integer.parseInt(userInput);
+            } catch (NumberFormatException e) {
+                System.out.println("    Invalid integer input. Please try again.");
+            }
+        }
+    }
+
+    //@@author kherlenbayasgalan-reused
+
+    /**
+     * The parseDateTimeInput takes two parameters (Scanner , String) and through those parameters
+     * the method gets user's input. Using exception handling of LocalDateTime, the user checks if the
+     * input is in correct date/time format. If it is not in the specified "yyyy-MM-ddTHH:mm:ss" format
+     * the method will throw DateTimeParseException. If it is in right format, the method will return
+     * the input when it is called.
+     * @param scanner is used to get user's date/time input.
+     * @param prompt is given to instruct the user on an acceptable date/time format.
+     * @return returns an acceptable time/date input.
+     */
+    private LocalDateTime parseDateTimeInput(Scanner scanner, String prompt) {
+        while (true) {
+            System.out.print(prompt);
+            String userInput = scanner.nextLine();
+            try {
+                // checks if the acceptable format is given by the user to prevent program crash
+                return LocalDateTime.parse(userInput);
+            } catch (DateTimeParseException e) {
+                System.out.println("    Invalid date and time format. Please try again.");
+            }
+        }
+    }
+}