Change events to have a start date and end date

ME-MarvinE · ME-MarvinE · commit 17b8b054204b · 2024-03-10T22:43:12.000Z
diff --git a/XCalendar.Core/Interfaces/IEvent.cs b/XCalendar.Core/Interfaces/IEvent.cs
@@ -6,6 +6,7 @@ public interface IEvent
     {
         string Title { get; set; }
         string Description { get; set; }
-        DateTime DateTime { get; set; }
+        DateTime StartDate { get; set; }
+        DateTime? EndDate { get; set; }
     }
 }
diff --git a/XCalendar.Core/Models/Calendar.cs b/XCalendar.Core/Models/Calendar.cs
@@ -803,15 +803,7 @@ public virtual void UpdateDays(DateTime navigationDate)
         }
         public virtual void UpdateDayEvents(T day)
         {
-            //It is known that the only thing that the events of the day depend on is the DateTime of the day, and that all events will have the same date.
-            //So, only update the events if the existing ones' DateTime does not match the day's DateTime.
-            //If the day has no events, there is no way to tell if it's because the day hasn't been updated before or if there are no events with that date, so update it either way.
-            if (day.Events.Count > 0 && day.DateTime.Date == day.Events[0].DateTime.Date)
-            {
-                return;
-            }
-
-            IEnumerable<TEvent> events = Events.Where(x => x.DateTime.Date == day.DateTime.Date);
+            IEnumerable<TEvent> events = Events.Where(x => day.DateTime.Date >= x.StartDate && (x.EndDate == null || day.DateTime.Date < x.EndDate));
 
             //No use in replacing the collection if the source and target are both empty.
             if (day.Events.Count == 0 && !events.Any())
@@ -820,7 +812,7 @@ public virtual void UpdateDayEvents(T day)
             }
 
             //SequenceEqual could be omitted to improve performance but in the vast majority of cases there won't even be more than 5 events in one day, so impact on performance should be negligible
-            //compared to always changing the collection and updating the binding.
+            //compared to always changing the collection.
             if (day.Events.SequenceEqual(events))
             {
                 return;
diff --git a/XCalendar.Core/Models/Event.cs b/XCalendar.Core/Models/Event.cs
@@ -10,7 +10,8 @@ public class Event : IEvent, INotifyPropertyChanged
         #region Fields
         private string _title;
         private string _description;
-        private DateTime _dateTime = DateTime.Today;
+        private DateTime _startDate = DateTime.Today;
+        private DateTime? _endDate = DateTime.Today;
         #endregion
 
         #region Properties
@@ -44,17 +45,32 @@ public string Description
                 }
             }
         }
-        public DateTime DateTime
+        public DateTime StartDate
         {
             get
             {
-                return _dateTime;
+                return _startDate;
             }
             set
             {
-                if (_dateTime != value)
+                if (_startDate != value)
                 {
-                    _dateTime = value;
+                    _startDate = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        public DateTime? EndDate
+        {
+            get
+            {
+                return _endDate;
+            }
+            set
+            {
+                if (_endDate != value)
+                {
+                    _endDate = value;
                     OnPropertyChanged();
                 }
             }
diff --git a/XCalendarFormsSample/XCalendarFormsSample/ViewModels/EventCalendarExampleViewModel.cs b/XCalendarFormsSample/XCalendarFormsSample/ViewModels/EventCalendarExampleViewModel.cs
@@ -81,7 +81,18 @@ public EventCalendarExampleViewModel()
 
             foreach (var @event in events)
             {
-                @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.EndDate = @event.StartDate.AddDays(_random.Next(1, 4)).AddHours(_random.Next(17));
+
+                if (_random.NextDouble() < 0.025)
+                {
+                    @event.EndDate = @event.EndDate.Value.AddYears(_random.Next(1, 4));
+                }
+                else if (_random.NextDouble() < 0.025)
+                {
+                    @event.EndDate = null;
+                }
+
                 @event.Color = EventColors[_random.Next(EventColors.Count)];
             }
 
@@ -93,7 +104,7 @@ public EventCalendarExampleViewModel()
         #region Methods
         private void SelectedDates_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => x.DateTime.Date == y.Date)).OrderByDescending(x => x.DateTime));
+            SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => y.Date >= x.StartDate && (x.EndDate == null || y.Date < x.EndDate))).OrderByDescending(x => x.StartDate));
         }
         public void NavigateCalendar(int amount)
         {
diff --git a/XCalendarFormsSample/XCalendarFormsSample/ViewModels/PlaygroundViewModel.cs b/XCalendarFormsSample/XCalendarFormsSample/ViewModels/PlaygroundViewModel.cs
@@ -171,7 +171,8 @@ public PlaygroundViewModel()
 
             foreach (var @event in events)
             {
-                @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.EndDate = @event.StartDate.AddDays(1);
                 @event.Color = EventColors[_random.Next(EventColors.Count)];
             }
 
diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml
@@ -95,9 +95,7 @@
 
                                     <xc:DayView.EventTemplate>
                                         <DataTemplate x:DataType="{x:Null}">
-                                            <Rectangle
-                                                    Fill="{Binding Color}"
-                                                    Style="{StaticResource DefaultEventIndicatorRectangleStyle}"/>
+                                            <Rectangle Fill="{Binding Color}" Style="{StaticResource DefaultEventIndicatorRectangleStyle}"/>
                                         </DataTemplate>
                                     </xc:DayView.EventTemplate>
 
@@ -171,12 +169,26 @@
                                     Padding="10"
                                     BackgroundColor="{StaticResource ContentBackgroundColor}"
                                     Spacing="0">
-                                    <Label
+                                    <StackLayout Orientation="Horizontal" Spacing="0">
+                                        <Label
+                                        FontAttributes="Bold"
+                                        FontSize="20"
+                                        Text="{Binding StartDate, StringFormat='{0:dd MMMM HH:mm}'}"
+                                        TextColor="{StaticResource ContentTextColor}"
+                                        VerticalTextAlignment="Center"/>
+                                        <Label
+                                        FontAttributes="Bold"
+                                        FontSize="20"
+                                        Text=" - "
+                                        TextColor="{StaticResource ContentTextColor}"
+                                        VerticalTextAlignment="Center"/>
+                                        <Label
                                         FontAttributes="Bold"
                                         FontSize="20"
-                                        Text="{Binding DateTime, StringFormat='{0: dd MMMM HH:mm}'}"
+                                        Text="{Binding EndDate, StringFormat='{0:dd MMMM HH:mm}', TargetNullValue='No End Date'}"
                                         TextColor="{StaticResource ContentTextColor}"
                                         VerticalTextAlignment="Center"/>
+                                    </StackLayout>
                                     <Label
                                         Margin="5,0,0,0"
                                         FontSize="16"
diff --git a/XCalendarMauiSample/ViewModels/EventCalendarExampleViewModel.cs b/XCalendarMauiSample/ViewModels/EventCalendarExampleViewModel.cs
@@ -77,7 +77,18 @@ public EventCalendarExampleViewModel()
 
             foreach (ColoredEvent @event in events)
             {
-                @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.EndDate = @event.StartDate.AddDays(_random.Next(1, 4)).AddHours(_random.Next(17));
+
+                if (_random.NextDouble() < 0.05)
+                {
+                    @event.EndDate = @event.EndDate.Value.AddYears(_random.Next(1, 4));
+                }
+                else if (_random.NextDouble() < 0.05)
+                {
+                    @event.EndDate = null;
+                }
+
                 @event.Color = EventColors[_random.Next(EventColors.Count)];
             }
 
@@ -89,7 +100,7 @@ public EventCalendarExampleViewModel()
         #region Methods
         private void SelectedDates_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => x.DateTime.Date == y.Date)).OrderByDescending(x => x.DateTime));
+            SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => y.Date >= x.StartDate && (x.EndDate == null || y.Date < x.EndDate))).OrderByDescending(x => x.StartDate));
         }
         public void NavigateCalendar(int amount)
         {
diff --git a/XCalendarMauiSample/ViewModels/PlaygroundViewModel.cs b/XCalendarMauiSample/ViewModels/PlaygroundViewModel.cs
@@ -167,7 +167,8 @@ public PlaygroundViewModel()
 
             foreach (var @event in events)
             {
-                @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());
+                @event.EndDate = @event.StartDate.AddDays(1);
                 @event.Color = EventColors[_random.Next(EventColors.Count)];
             }
 
diff --git a/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml b/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml
@@ -95,9 +95,7 @@
 
                                 <xc:DayView.EventTemplate>
                                     <DataTemplate x:DataType="{x:Null}">
-                                        <Rectangle
-                                                    Fill="{Binding Color}"
-                                                    Style="{StaticResource DefaultEventIndicatorRectangleStyle}"/>
+                                        <Rectangle Fill="{Binding Color}" Style="{StaticResource DefaultEventIndicatorRectangleStyle}"/>
                                     </DataTemplate>
                                 </xc:DayView.EventTemplate>
 
@@ -174,12 +172,29 @@
                                 Grid.Column="1"
                                 Padding="10"
                                 BackgroundColor="{StaticResource ContentBackgroundColor}">
-                                <Label
-                                    FontAttributes="Bold"
-                                    FontSize="20"
-                                    Text="{Binding DateTime, StringFormat='{0: dd MMMM HH:mm}'}"
-                                    TextColor="{StaticResource ContentTextColor}"
-                                    VerticalTextAlignment="Center"/>
+
+                                <HorizontalStackLayout>
+                                    <Label
+                                        FontAttributes="Bold"
+                                        FontSize="20"
+                                        Text="{Binding StartDate, StringFormat='{0:dd MMMM HH:mm}'}"
+                                        TextColor="{StaticResource ContentTextColor}"
+                                        VerticalTextAlignment="Center"/>
+                                    <Label
+                                        FontAttributes="Bold"
+                                        FontSize="20"
+                                        Text=" - "
+                                        TextColor="{StaticResource ContentTextColor}"
+                                        VerticalTextAlignment="Center"/>
+                                    <Label
+                                        FontAttributes="Bold"
+                                        FontSize="20"
+                                        Text="{Binding EndDate, StringFormat='{0:dd MMMM HH:mm}', TargetNullValue='No End Date'}"
+                                        TextColor="{StaticResource ContentTextColor}"
+                                        VerticalTextAlignment="Center"/>
+                                </HorizontalStackLayout>
+
+
                                 <Label
                                     Margin="5,0,0,0"
                                     FontSize="16"

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ public interface IEvent`
`6`	`6`	`{`
`7`	`7`	`string Title { get; set; }`
`8`	`8`	`string Description { get; set; }`
`9`		`- DateTime DateTime { get; set; }`
	`9`	`+ DateTime StartDate { get; set; }`
	`10`	`+ DateTime? EndDate { get; set; }`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -803,15 +803,7 @@ public virtual void UpdateDays(DateTime navigationDate)`
`803`	`803`	`}`
`804`	`804`	`public virtual void UpdateDayEvents(T day)`
`805`	`805`	`{`
`806`		`- //It is known that the only thing that the events of the day depend on is the DateTime of the day, and that all events will have the same date.`
`807`		`- //So, only update the events if the existing ones' DateTime does not match the day's DateTime.`
`808`		`- //If the day has no events, there is no way to tell if it's because the day hasn't been updated before or if there are no events with that date, so update it either way.`
`809`		`- if (day.Events.Count > 0 && day.DateTime.Date == day.Events[0].DateTime.Date)`
`810`		`- {`
`811`		`- return;`
`812`		`- }`
`813`		`-`
`814`		`- IEnumerable<TEvent> events = Events.Where(x => x.DateTime.Date == day.DateTime.Date);`
	`806`	`+ IEnumerable<TEvent> events = Events.Where(x => day.DateTime.Date >= x.StartDate && (x.EndDate == null \|\| day.DateTime.Date < x.EndDate));`
`815`	`807`
`816`	`808`	`//No use in replacing the collection if the source and target are both empty.`
`817`	`809`	`if (day.Events.Count == 0 && !events.Any())`
`@@ -820,7 +812,7 @@ public virtual void UpdateDayEvents(T day)`
`820`	`812`	`}`
`821`	`813`
`822`	`814`	`//SequenceEqual could be omitted to improve performance but in the vast majority of cases there won't even be more than 5 events in one day, so impact on performance should be negligible`
`823`		`- //compared to always changing the collection and updating the binding.`
	`815`	`+ //compared to always changing the collection.`
`824`	`816`	`if (day.Events.SequenceEqual(events))`
`825`	`817`	`{`
`826`	`818`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ public class Event : IEvent, INotifyPropertyChanged`
`10`	`10`	`#region Fields`
`11`	`11`	`private string _title;`
`12`	`12`	`private string _description;`
`13`		`- private DateTime _dateTime = DateTime.Today;`
	`13`	`+ private DateTime _startDate = DateTime.Today;`
	`14`	`+ private DateTime? _endDate = DateTime.Today;`
`14`	`15`	`#endregion`
`15`	`16`
`16`	`17`	`#region Properties`
`@@ -44,17 +45,32 @@ public string Description`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`	`}`
`47`		`- public DateTime DateTime`
	`48`	`+ public DateTime StartDate`
`48`	`49`	`{`
`49`	`50`	`get`
`50`	`51`	`{`
`51`		`- return _dateTime;`
	`52`	`+ return _startDate;`
`52`	`53`	`}`
`53`	`54`	`set`
`54`	`55`	`{`
`55`		`- if (_dateTime != value)`
	`56`	`+ if (_startDate != value)`
`56`	`57`	`{`
`57`		`- _dateTime = value;`
	`58`	`+ _startDate = value;`
	`59`	`+ OnPropertyChanged();`
	`60`	`+ }`
	`61`	`+ }`
	`62`	`+ }`
	`63`	`+ public DateTime? EndDate`
	`64`	`+ {`
	`65`	`+ get`
	`66`	`+ {`
	`67`	`+ return _endDate;`
	`68`	`+ }`
	`69`	`+ set`
	`70`	`+ {`
	`71`	`+ if (_endDate != value)`
	`72`	`+ {`
	`73`	`+ _endDate = value;`
`58`	`74`	`OnPropertyChanged();`
`59`	`75`	`}`
`60`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,18 @@ public EventCalendarExampleViewModel()`
`81`	`81`
`82`	`82`	`foreach (var @event in events)`
`83`	`83`	`{`
`84`		`- @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`84`	`+ @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`85`	`+ @event.EndDate = @event.StartDate.AddDays(_random.Next(1, 4)).AddHours(_random.Next(17));`
	`86`	`+`
	`87`	`+ if (_random.NextDouble() < 0.025)`
	`88`	`+ {`
	`89`	`+ @event.EndDate = @event.EndDate.Value.AddYears(_random.Next(1, 4));`
	`90`	`+ }`
	`91`	`+ else if (_random.NextDouble() < 0.025)`
	`92`	`+ {`
	`93`	`+ @event.EndDate = null;`
	`94`	`+ }`
	`95`	`+`
`85`	`96`	`@event.Color = EventColors[_random.Next(EventColors.Count)];`
`86`	`97`	`}`
`87`	`98`
`@@ -93,7 +104,7 @@ public EventCalendarExampleViewModel()`
`93`	`104`	`#region Methods`
`94`	`105`	`private void SelectedDates_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)`
`95`	`106`	`{`
`96`		`- SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => x.DateTime.Date == y.Date)).OrderByDescending(x => x.DateTime));`
	`107`	`+ SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => y.Date >= x.StartDate && (x.EndDate == null \|\| y.Date < x.EndDate))).OrderByDescending(x => x.StartDate));`
`97`	`108`	`}`
`98`	`109`	`public void NavigateCalendar(int amount)`
`99`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,8 @@ public PlaygroundViewModel()`
`171`	`171`
`172`	`172`	`foreach (var @event in events)`
`173`	`173`	`{`
`174`		`- @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`174`	`+ @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`175`	`+ @event.EndDate = @event.StartDate.AddDays(1);`
`175`	`176`	`@event.Color = EventColors[_random.Next(EventColors.Count)];`
`176`	`177`	`}`
`177`	`178`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,18 @@ public EventCalendarExampleViewModel()`
`77`	`77`
`78`	`78`	`foreach (ColoredEvent @event in events)`
`79`	`79`	`{`
`80`		`- @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`80`	`+ @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`81`	`+ @event.EndDate = @event.StartDate.AddDays(_random.Next(1, 4)).AddHours(_random.Next(17));`
	`82`	`+`
	`83`	`+ if (_random.NextDouble() < 0.05)`
	`84`	`+ {`
	`85`	`+ @event.EndDate = @event.EndDate.Value.AddYears(_random.Next(1, 4));`
	`86`	`+ }`
	`87`	`+ else if (_random.NextDouble() < 0.05)`
	`88`	`+ {`
	`89`	`+ @event.EndDate = null;`
	`90`	`+ }`
	`91`	`+`
`81`	`92`	`@event.Color = EventColors[_random.Next(EventColors.Count)];`
`82`	`93`	`}`
`83`	`94`
`@@ -89,7 +100,7 @@ public EventCalendarExampleViewModel()`
`89`	`100`	`#region Methods`
`90`	`101`	`private void SelectedDates_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)`
`91`	`102`	`{`
`92`		`- SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => x.DateTime.Date == y.Date)).OrderByDescending(x => x.DateTime));`
	`103`	`+ SelectedEvents.ReplaceRange(EventCalendar.Events.Where(x => EventCalendar.SelectedDates.Any(y => y.Date >= x.StartDate && (x.EndDate == null \|\| y.Date < x.EndDate))).OrderByDescending(x => x.StartDate));`
`93`	`104`	`}`
`94`	`105`	`public void NavigateCalendar(int amount)`
`95`	`106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ public PlaygroundViewModel()`
`167`	`167`
`168`	`168`	`foreach (var @event in events)`
`169`	`169`	`{`
`170`		`- @event.DateTime = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`170`	`+ @event.StartDate = DateTime.Today.AddDays(_random.Next(-20, 21)).AddDays(_random.NextDouble());`
	`171`	`+ @event.EndDate = @event.StartDate.AddDays(1);`
`171`	`172`	`@event.Color = EventColors[_random.Next(EventColors.Count)];`
`172`	`173`	`}`
`173`	`174`