Merge pull request nus-cs2113-AY2324S1#21 from Cheezeblokz/Jingxi-Calendar_update

Jingxi calendar update

Author: Brian030601

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

@@ -1,5 +1,9 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
+import java.time.LocalDateTime;
+
 public class Calendar {
     EventList eventList;
 }

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

@@ -1,18 +1,24 @@
 package seedu.duke.calendar;
 
+import java.util.Scanner;
+
 public class CalendarManager {
     Calendar calendar;
     CalendarUi calendarUi;
     CalendarCommandParser calendarCommandParser;
+    Scanner scanner;
 
     public CalendarManager() {
         calendar = new Calendar();
         calendarUi = new CalendarUi();
         calendarCommandParser = new CalendarCommandParser();
+        scanner = new Scanner(System.in);
     }
 
     public void start() {
-
+        calendarUi.begin();
+        String userCommand = scanner.nextLine();
+        calendarCommandParser.parseInput(userCommand);
     }
 
 }

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

@@ -1,4 +1,7 @@
 package seedu.duke.calendar;
 
 public class CalendarUi {
+    public void begin() {
+        System.out.print("Enter User Command: ");
+    }
 }

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

@@ -1,8 +1,7 @@
 package seedu.duke.calendar;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.TreeMap;
 
 public class EventStorage {
     ArrayList<Event> events;
@@ -11,7 +10,7 @@ public EventStorage() {
         events = new ArrayList<>();
     }
 
-    public void addEvent(String name, LocalDate from, LocalDate to) {
+    public void addEvent(String name, LocalDateTime from, LocalDateTime to) {
         events.add(new Event(name, from, to));
     }
 
@@ -26,8 +25,6 @@ public boolean delEvent(String name) {
     }
     @Override
     public String toString() {
-        return "EventStorage{" +
-                "events=" + events +
-                '}';
+        return "events=" + events;
     }
 }

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

@@ -1,4 +1,4 @@
-//@@ kherlenbayasgalan
+//@@ kherlenbayasgalan & jingxizhu
 
 package seedu.duke.calendar.command;
 
@@ -12,9 +12,9 @@ public class AddEventCommand extends EventCommand{
     public void execute(Scanner scanner, EventList eventList) {
         System.out.println("What's the event?: ");
         String eventName = scanner.nextLine();
-        System.out.println("When does it start?: ");
+        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?: ");
+        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);

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

@@ -1,5 +1,17 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar.command;
 
+import java.time.LocalDateTime;
+import java.util.Scanner;
+
 public class DeleteEventCommand extends EventCommand{
+    public void execute(Scanner scanner, Calendar calendar) {
+        System.out.print("Enter the event name: ");
+        String eventName = scanner.nextLine();
+
+        calendar.delEvent(eventName);
 
+        System.out.println("Event has been deleted from your Calendar!");
+    }
 }

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

@@ -1,4 +1,4 @@
-//@@author kherlenbayasgalan
+//@@ kherlenbayasgalan & jingxizhu
 
 package seedu.duke.calendar.command;
 

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

@@ -1,4 +1,4 @@
-//@@author kherlenbayasgalan
+//@@ kherlenbayasgalan & jingxizhu
 
 package seedu.duke.calendar.command;