Merge pull request AY2324S1-CS2103-F13-4#63 from lihongguang00/branch…

…-Calendar-Updated

[Calendar] Improved Calendar UI

.codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "src/main/java/seedu/address/ui"

build.gradle

@@ -72,4 +72,5 @@ shadowJar {
 run {
     enableAssertions = true
 }
+
 defaultTasks 'clean', 'test'

src/main/java/seedu/address/Main.java

@@ -25,7 +25,6 @@ public class Main {
     private static Logger logger = LogsCenter.getLogger(Main.class);
 
     public static void main(String[] args) {
-
         // As per https://github.com/openjdk/jfx/blob/master/doc-files/release-notes-16.md
         // JavaFX 16 (or later) runtime logs a warning at startup if JavaFX classes are loaded from
         // the classpath instead of a module.

src/main/java/seedu/address/logic/Logic.java

@@ -8,6 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.calendar.ReadOnlyCalendar;
 import seedu.address.model.event.Event;
 import seedu.address.model.person.Person;
 
@@ -31,9 +32,19 @@ public interface Logic {
      */
     ReadOnlyAddressBook getAddressBook();
 
-    /** Returns an unmodifiable view of the filtered list of persons */
+    /**
+     * Returns the Calendar.
+     *
+     * @return the Calendar.
+     */
+    ReadOnlyCalendar getCalendar();
+
+    /** Returns an unmodifiable view of the filtered list of events */
     ObservableList<Event> getEventList();
 
+    /** Returns an unmodifiable view of the filtered list of events for the week */
+    ObservableList<Event> getCurrentWeekEventList();
+
     /** Returns an unmodifiable view of the filtered list of persons */
     ObservableList<Person> getFilteredPersonList();
 

src/main/java/seedu/address/logic/LogicManager.java

@@ -15,6 +15,7 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.calendar.ReadOnlyCalendar;
 import seedu.address.model.event.Event;
 import seedu.address.model.person.Person;
 import seedu.address.storage.Storage;
@@ -68,11 +69,21 @@ public ReadOnlyAddressBook getAddressBook() {
         return model.getAddressBook();
     }
 
+    @Override
+    public ReadOnlyCalendar getCalendar() {
+        return model.getCalendar();
+    }
+
     @Override
     public ObservableList<Event> getEventList() {
         return model.getEventList();
     }
 
+    @Override
+    public ObservableList<Event> getCurrentWeekEventList() {
+        return model.getCurrentWeekEventList();
+    }
+
     @Override
     public ObservableList<Person> getFilteredPersonList() {
         return model.getFilteredPersonList();

src/main/java/seedu/address/model/Model.java

@@ -133,6 +133,9 @@ public interface Model {
     /** Returns a view of the event list */
     ObservableList<Event> getEventList();
 
+    /** Returns a view of the event list for the current week */
+    ObservableList<Event> getCurrentWeekEventList();
+
     /** Returns an unmodifiable view of the filtered person list */
     ObservableList<Person> getFilteredPersonList();
 

src/main/java/seedu/address/model/ModelManager.java

@@ -155,6 +155,11 @@ public ObservableList<Event> getEventList() {
         return calendar.getEventList();
     }
 
+    @Override
+    public ObservableList<Event> getCurrentWeekEventList() {
+        return calendar.getCurrentWeekEventList();
+    }
+
     @Override
     public boolean canAddEvent(Event event) {
         return calendar.canAddEvent(event);

src/main/java/seedu/address/model/calendar/Calendar.java

@@ -2,7 +2,9 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -15,8 +17,14 @@
  * Represents a calendar that stores and manages events.
  */
 public class Calendar implements ReadOnlyCalendar {
+    private static final int DAYS_IN_WEEK = 7;
+    private static final LocalDate DATE_OF_START_OF_CURRENT_WEEK = LocalDate.now().minusDays(
+            LocalDate.now().getDayOfWeek().getValue() - 1);
+    private static final LocalDate DATE_OF_END_OF_CURRENT_WEEK = LocalDate.now().plusDays(
+            DAYS_IN_WEEK - LocalDate.now().getDayOfWeek().getValue());
     private final AllDaysEventListManager eventManager;
     private final ObservableList<Event> internalList = FXCollections.observableArrayList();
+    private final ObservableList<Event> internalListForCurrentWeek = FXCollections.observableArrayList();
 
     /**
      * Constructs a Calendar object with an empty event tree.
@@ -80,6 +88,8 @@ public void addEvent(Event event) {
         requireNonNull(event);
         eventManager.addEvent(event);
         internalList.setAll(eventManager.asUnmodifiableObservableList());
+        internalListForCurrentWeek.setAll(eventManager.asUnmodifiableObservableList(
+                DATE_OF_START_OF_CURRENT_WEEK, DATE_OF_END_OF_CURRENT_WEEK));
     }
 
     /**
@@ -90,6 +100,8 @@ public void deleteEventAt(LocalDateTime dateTime) {
         requireNonNull(dateTime);
         eventManager.deleteEventAt(dateTime);
         internalList.setAll(eventManager.asUnmodifiableObservableList());
+        internalListForCurrentWeek.setAll(eventManager.asUnmodifiableObservableList(
+                DATE_OF_START_OF_CURRENT_WEEK, DATE_OF_END_OF_CURRENT_WEEK));
     }
 
     /**
@@ -145,6 +157,21 @@ public ObservableList<Event> getEventList() {
         return internalList;
     }
 
+    @Override
+    public ObservableList<Event> getCurrentWeekEventList() {
+        return internalListForCurrentWeek;
+    }
+
+    @Override
+    public Optional<LocalTime> getEarliestEventStartTimeInCurrentWeek() {
+        return getCurrentWeekEventList().stream().min(Event::compareStartTime).map(Event::getStartTime);
+    }
+
+    @Override
+    public Optional<LocalTime> getLatestEventEndTimeInCurrentWeek() {
+        return getCurrentWeekEventList().stream().max(Event::compareEndTime).map(Event::getEndTime);
+    }
+
     @Override
     public boolean equals(Object other) {
         if (this == other) {

src/main/java/seedu/address/model/calendar/ReadOnlyCalendar.java

@@ -1,5 +1,8 @@
 package seedu.address.model.calendar;
 
+import java.time.LocalTime;
+import java.util.Optional;
+
 import javafx.collections.ObservableList;
 import seedu.address.model.event.Event;
 
@@ -13,4 +16,25 @@ public interface ReadOnlyCalendar {
      * @return unmodifiable view of event list.
      */
     ObservableList<Event> getEventList();
+
+    /**
+     * Generates an unmodifiable view of the event list for the current week.
+     *
+     * @return unmodifiable view of event list for the current week.
+     */
+    ObservableList<Event> getCurrentWeekEventList();
+
+    /**
+     * Retrieves the earliest starting time of any event for the current week in a LocalTime object.
+     *
+     * @return the earliest starting time of any event for the current week in a LocalTime object.
+     */
+    Optional<LocalTime> getEarliestEventStartTimeInCurrentWeek();
+
+    /**
+     * Retrieves the latest ending time of any event for the current week in a LocalTime object.
+     *
+     * @return the latest ending time of any event for the current week in a LocalTime object.
+     */
+    Optional<LocalTime> getLatestEventEndTimeInCurrentWeek();
 }

src/main/java/seedu/address/model/event/AllDaysEventListManager.java

@@ -49,7 +49,7 @@ public void addEvent(Event event) {
             if (!(dayToEventListMap.containsKey(date.toString()))) {
                 dayToEventListMap.put(date.toString(), new SingleDayEventList(date));
             }
-            dayToEventListMap.get(date.toString()).addEvent(event);
+            dayToEventListMap.get(date.toString()).addEvent(event.boundEventByDate(date));
         }
     }
 
@@ -137,6 +137,25 @@ public boolean isEmpty() {
     public ObservableList<Event> asUnmodifiableObservableList() {
         List<Event> list = dayToEventListMap.values().stream()
                 .flatMap(singleDayEventList -> singleDayEventList.getDayEventList().stream())
+                .map(Event::getParentEvent).distinct()
+                .collect(Collectors.toList());
+
+        return FXCollections.observableList(list);
+    }
+
+    /**
+     * Returns the event list storing events that occur between the start and end dates as an unmodifiable
+     * ObservableList.
+     *
+     * @param startDate start date.
+     * @param endDate end date.
+     * @return the event list storing events that occur between the start and end dates as an unmodifiable
+     *     ObservableList.
+     */
+    public ObservableList<Event> asUnmodifiableObservableList(LocalDate startDate, LocalDate endDate) {
+        List<Event> list = dayToEventListMap.values().stream()
+                .flatMap(singleDayEventList -> singleDayEventList.getDayEventList().stream())
+                .filter(event -> event.occursBetweenDates(startDate, endDate))
                 .collect(Collectors.toList());
 
         return FXCollections.observableList(list);