Updated to show all future events for country pages

Avanade · Jan 18, 2024 · ef1feab · ef1feab
1 parent 3397499
commit ef1feab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/TechCommunityCalendar.Solution/TechCommunityCalendar.Concretions/TechEventCalendar.cs b/src/TechCommunityCalendar.Solution/TechCommunityCalendar.Concretions/TechEventCalendar.cs
@@ -25,6 +25,12 @@ public static IEnumerable<ITechEvent> GetUpcomingEvents(IEnumerable<ITechEvent>
                     .OrderBy(x => x.StartDate);
         }
 
+        public static IEnumerable<ITechEvent> GetFutureEvents(IEnumerable<ITechEvent> events)
+        {
+            return events.Where(x => x.StartDate.Date > DateTime.Now.Date)  // Future events                
+                    .OrderBy(x => x.StartDate);
+        }
+
         public static IEnumerable<ITechEvent> GetRecentEvents(IEnumerable<ITechEvent> events, int totalDays = 30)
         {
             return events.Where(x => DateTime.Now.Date > x.EndDate

diff --git a/...lendar.Solution/TechCommunityCalendar.CoreWebApplication/Controllers/CountryController.cs b/...lendar.Solution/TechCommunityCalendar.CoreWebApplication/Controllers/CountryController.cs
@@ -26,7 +26,7 @@ public async Task<IActionResult> Country(string country)
             model.Country = ToTitleCase(country);
             model.Events = events;
             model.CurrentEvents = TechEventCalendar.GetCurrentEvents(events);
-            model.UpcomingEvents = TechEventCalendar.GetUpcomingEvents(events);
+            model.UpcomingEvents = TechEventCalendar.GetFutureEvents(events);
             model.RecentEvents = TechEventCalendar.GetRecentEvents(events);
 
             ViewBag.Title = $"Tech Community Events in {model.Country}";

diff --git a/...tyCalendar.Solution/TechCommunityCalendar.CoreWebApplication/Views/Country/Country.cshtml b/...tyCalendar.Solution/TechCommunityCalendar.CoreWebApplication/Views/Country/Country.cshtml
@@ -26,7 +26,7 @@
     }
     <br />
 
-    <h4>@Model.UpcomingEventsCount Upcoming Events</h4>
+    <h4>@Model.UpcomingEventsCount Future Events</h4>
     @if (Model.UpcomingEvents.Any())
     {
         @await Html.PartialAsync("_EventsImages", Model.UpcomingEvents)