Merge pull request nus-cs2113-AY2324S1#33 from Brian030601/master

Fix Calendar Add/List/Delete Issues

Author: Brian030601

src/main/java/seedu/duke/Duke.java

@@ -1,8 +1,11 @@
+//@@author wendelinwemhoener & kherlenbayasgalan
+
 package seedu.duke;
 
 import seedu.duke.flashcard.Flashcard;
 import seedu.duke.flashcard.FlashcardComponent;
 import seedu.duke.calendar.CalendarManager;
+import seedu.duke.calendar.Event;
 
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -17,7 +20,7 @@ public static void main(String[] args) {
     private void runCalendar() {
         System.out.println("Enter your command: ");
 
-        CalendarManager manager = new CalendarManager();
+        CalendarManager manager = new CalendarManager(new ArrayList<Event>());
 
         Scanner scanner = new Scanner(System.in);
         String input;

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

@@ -4,18 +4,22 @@
 
 import seedu.duke.calendar.command.EventCommand;
 import seedu.duke.calendar.command.UnknownCommand;
+import seedu.duke.calendar.Event;
 
+import java.util.ArrayList;
 import java.util.Scanner;
 
 public class CalendarManager {
     Calendar calendar;
     CalendarUi calendarUi;
+    EventList eventList;
     CalendarCommandParser calendarCommandParser;
     Scanner scanner;
 
-    public CalendarManager() {
+    public CalendarManager(ArrayList<Event> events) {
+        eventList = new EventList(events);
         calendar = new Calendar();
-        calendarUi = new CalendarUi();
+        calendarUi = new CalendarUi(eventList);
         calendarCommandParser = new CalendarCommandParser();
         scanner = new Scanner(System.in);
     }
@@ -27,11 +31,11 @@ public boolean validCommand(String input) {
     }
 
     public void startCalendar(String input) {
-        calendarUi.begin();
         EventCommand command = calendarCommandParser.parseInput(input);
         assert !(command instanceof seedu.duke.calendar.command.UnknownCommand) :
                 "Command cannot be " + "unknown";
-        calendarCommandParser.parseInput(input);
+        calendarUi.executeCommand(command);
+        //calendarCommandParser.parseInput(command);
     }
 
 }

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

@@ -1,7 +1,19 @@
 package seedu.duke.calendar;
 
+import seedu.duke.calendar.command.EventCommand;
+
+import java.util.Scanner;
+
 public class CalendarUi {
-    public void begin() {
-        System.out.print("Enter User Command: ");
+    private Scanner scanner;
+    private EventList eventList;
+
+    public CalendarUi (EventList eventList) {
+        scanner = new Scanner(System.in);
+        this.eventList = eventList;
+    }
+
+    public void executeCommand(EventCommand command) {
+        command.execute(scanner, eventList);
     }
 }

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

@@ -10,17 +10,18 @@
 
 public class AddEventCommand extends EventCommand{
     public void execute(Scanner scanner, EventList eventList) {
-        System.out.println("What's the event?: ");
+        System.out.print("What's the event?: ");
         String eventName = scanner.nextLine();
-        System.out.println("When does it start? (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
+        System.out.print("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): ");
+        System.out.print("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);
 
         eventList.addEvent(event);
 
         System.out.println(event + " has been added to you calendar");
+        System.out.print("Enter your command: ");
     }
 }

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

@@ -13,5 +13,6 @@ public void execute(Scanner scanner, EventList eventList) {
 
         eventList.deleteEvent(eventName);
         System.out.println(eventName + " has been deleted from your Calendar!");
+        System.out.print("Enter your command: ");
     }
 }

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

@@ -13,9 +13,10 @@ public void execute(Scanner scanner, EventList eventList) {
         printLine();
 
         for (Event event : eventList.getEvent()) {
-            System.out.print(event);
+            System.out.println(event);
             printLine();
         }
+        System.out.print("Enter your command: ");
     }
 
     public void printLine() {