Merge branch 'master' into Jingxi-Calendar_update

Author: Brian030601

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

@@ -1,23 +1,9 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
 import java.time.LocalDateTime;
 
 public class Calendar {
-    EventStorage eventStorage;
-
-    public Calendar() {
-        eventStorage = new EventStorage();
-    }
-
-    public void addEvent(String name, LocalDateTime from, LocalDateTime to) {
-        eventStorage.addEvent(name, from, to);
-    }
-
-    public void delEvent(String eventName) {
-        eventStorage.delEvent(eventName);
-    }
-
-    public void listEvents() {
-        System.out.println(eventStorage);
-    }
+    EventList eventList;
 }

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

@@ -1,3 +1,5 @@
+//@@author kherlenbayasgalan
+
 package seedu.duke.calendar;
 
 import seedu.duke.calendar.command.AddEventCommand;

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

@@ -1,12 +1,13 @@
+//@@author @@kherlenbayasgalan & @@ Jingxizhu
+
 package seedu.duke.calendar;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public class Event {
-    String name;
-    LocalDateTime from;
-    LocalDateTime to;
+    private String name;
+    private LocalDateTime from;
+    private LocalDateTime to;
 
     public Event(String name, LocalDateTime from, LocalDateTime to) {
         this.name = name;

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

@@ -0,0 +1,38 @@
+package seedu.duke.calendar;
+
+import seedu.duke.flashcard.Flashcard;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+
+public class EventList {
+    private ArrayList<Event> eventList;
+
+    public EventList(ArrayList<Event> eventList) {
+        this.eventList = eventList;
+    }
+
+    public void addEvent(Event event) {
+        eventList.add(event);
+    }
+
+    public ArrayList<Event> getEvent() {
+        return eventList;
+    }
+
+    public boolean deleteEvent(String name) {
+        for(Event event : eventList) {
+            if (event.getName().equals(name)) {
+                eventList.remove(event);
+                return true;
+            }
+        }
+        return false;
+    }
+    @Override
+    public String toString() {
+        return "EventStorage{" +
+                "events=" + eventList +
+                '}';
+    }
+}

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

@@ -1,21 +1,26 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar.command;
 
-import seedu.duke.calendar.Calendar;
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.EventList;
 
-import java.time.LocalDateTime;
 import java.util.Scanner;
+import java.time.LocalDateTime;
 
 public class AddEventCommand extends EventCommand{
-    public void execute(Scanner scanner, Calendar calendar) {
-        System.out.print("Enter the event name: ");
+    public void execute(Scanner scanner, EventList eventList) {
+        System.out.println("What's the event?: ");
         String eventName = scanner.nextLine();
-        System.out.print("Enter the event from date (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
-        LocalDateTime eventFrom = LocalDateTime.parse(scanner.nextLine());
-        System.out.print("Enter the event to date (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
-        LocalDateTime eventTo = LocalDateTime.parse(scanner.nextLine());
+        System.out.println("When does it start? (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
+        LocalDateTime startTime = LocalDateTime.parse(scanner.nextLine());
+        System.out.println("When does it end? (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
+        LocalDateTime endTime = LocalDateTime.parse(scanner.nextLine());
+
+        Event event = new Event(eventName, startTime, endTime);
 
-        calendar.addEvent(eventName, eventFrom, eventTo);
+        eventList.addEvent(event);
 
-        System.out.println("Success! Event has been added to your Calendar!");
+        System.out.println("The event has been added to you calendar");
     }
 }

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

@@ -1,6 +1,6 @@
-package seedu.duke.calendar.command;
+//@@ kherlenbayasgalan & jingxizhu
 
-import seedu.duke.calendar.Calendar;
+package seedu.duke.calendar.command;
 
 import java.time.LocalDateTime;
 import java.util.Scanner;

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

@@ -1,5 +1,11 @@
+//@@author kherlenbayasgalan
+
 package seedu.duke.calendar.command;
 
-public abstract class EventCommand {
+import seedu.duke.calendar.EventList;
 
+import java.util.Scanner;
+
+public abstract class EventCommand {
+    //public abstract void execute(Scanner scanner, EventList eventList);
 }

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

@@ -1,11 +1,20 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar.command;
 
-import seedu.duke.calendar.Calendar;
+import seedu.duke.calendar.Event;
+import seedu.duke.calendar.EventList;
 
 import java.util.Scanner;
 
 public class ListCalendarEventsCommand extends EventCommand{
-    public void execute(Scanner scanner, Calendar calendar) {
-        calendar.listEvents();
+    public void execute(Scanner scanner, EventList flashcardList) {
+        System.out.println("Here is a list of all your events: ");
+
+        System.out.println("-".repeat(80));
+        for (Flashcard flashcard : flashcardList.getFlashcards()) {
+            System.out.print(flashcard);
+            System.out.println("-".repeat(80));
+        }
     }
 }

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

@@ -1,11 +1,13 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar.command;
 
-import seedu.duke.calendar.Calendar;
+import seedu.duke.calendar.EventList;
 
 import java.util.Scanner;
 
 public class UnknownCommand extends EventCommand{
-    public void execute(Scanner scanner, Calendar calendar) {
-        System.out.println("Unknown command!");
+    public void execute(Scanner scanner, EventList eventList) {
+        System.out.println("Unknown command! Please enter a valid command.");
     }
 }