Merge pull request #481 from geeksforsocialchange/show-future-events

fix: Show future events
geeksforsocialchange · Dec 17, 2024 · 2fe1679 · 2fe1679
2 parents d11d0ab + fbeb18d
commit 2fe1679
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Data/PlaceCal/Events.elm b/src/Data/PlaceCal/Events.elm
@@ -1,4 +1,4 @@
-module Data.PlaceCal.Events exposing (Event, EventPartner, afterDate, eventFromSlug, eventPartnerFromId, eventsData, eventsFromDate, eventsFromRegionId, eventsWithPartners, nextNEvents, onOrBeforeDate)
+module Data.PlaceCal.Events exposing (Event, EventPartner, afterDate, eventFromSlug, eventPartnerFromId, eventsData, eventsOnDate, eventsFromRegionId, eventsWithPartners, nextNEvents, onOrBeforeDate)
 
 import BackendTask
 import BackendTask.Custom
@@ -99,11 +99,11 @@ eventsFromRegionId eventList regionId =
         List.filter (\event -> event.partnershipTagId == regionId) eventList
 
 
-eventsFromDate : List Event -> Time.Posix -> List Event
-eventsFromDate eventList fromDate =
+eventsOnDate : List Event -> Time.Posix -> List Event
+eventsOnDate eventList onDate =
     List.filter
         (\event ->
-            TransDate.isSameDay event.startDatetime fromDate
+            TransDate.isSameDay event.startDatetime onDate
         )
         eventList
 

diff --git a/src/Theme/Page/Partner.elm b/src/Theme/Page/Partner.elm
@@ -81,8 +81,8 @@ viewPartnerEvents events localModel partner =
     in
     section [ id "events" ]
         (if List.length futureEvents > 0 then
-            -- If we have more than 20 future events paginate
-            if List.length futureEvents > 20 then
+            -- If we have more than 40 future events paginate
+            if List.length futureEvents > 40 then
                 [ eventAreaTitle
                 , Theme.Paginator.viewPagination localModel |> Html.Styled.map Theme.Page.Events.fromPaginatorMsg
                 , Theme.Page.Events.viewEventsList localModel events Nothing
@@ -91,7 +91,7 @@ viewPartnerEvents events localModel partner =
             else
                 -- Otherwise show them all
                 [ div []
-                    [ Theme.Page.Events.viewEventsList localModel futureEvents Nothing
+                    [ Theme.Page.Events.viewEventsList { localModel | filterByDate = Theme.Paginator.Future } events Nothing
                     ]
                 ]
 

diff --git a/src/Theme/Paginator.elm b/src/Theme/Paginator.elm
@@ -115,7 +115,7 @@ filterEvents : Time.Posix -> Filter -> List Data.PlaceCal.Events.Event -> List D
 filterEvents now filter eventList =
     case filter of
         Day time ->
-            Data.PlaceCal.Events.eventsFromDate eventList time
+            Data.PlaceCal.Events.eventsOnDate eventList time
 
         Past ->
             List.reverse (Data.PlaceCal.Events.onOrBeforeDate eventList now)