From 07a7b40fb3fd77a83eae4cc902398f855706a26f Mon Sep 17 00:00:00 2001
From: Thibaut Born <thibaut.born@kuleuven.be>
Date: Wed, 19 Jun 2024 16:54:48 +0200
Subject: [PATCH 1/3] convert values for event_listing to datetime

context: the start and end values are later checked against datetime
objects in the expand_events,which broke due to the passed
DateTime and String formats (depending on the query)
---
 plone/app/event/browser/event_listing.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/plone/app/event/browser/event_listing.py b/plone/app/event/browser/event_listing.py
index 55c0f2e1..735eb0ab 100644
--- a/plone/app/event/browser/event_listing.py
+++ b/plone/app/event/browser/event_listing.py
@@ -1,6 +1,8 @@
 from calendar import monthrange
 from datetime import date
+from datetime import datetime
 from datetime import timedelta
+from DateTime import DateTime
 from plone.app.contenttypes.behaviors.collection import ISyndicatableCollection
 from plone.app.event import _
 from plone.app.event.base import _prepare_range
@@ -238,7 +240,20 @@ def _expand_events_start_end(self, start, end):
             r = end.get("range")
             if r == "min":
                 se["start"] = q
+        se = self.convert_values_to_datetime(se)
         return se["start"], se["end"]
+    
+    def convert_values_to_datetime(self, se):
+        # needed to make the comparisons possible between dates in the expand_events method 
+        for key, time in se.items():
+            if isinstance(time, DateTime):
+                se[key] = time.asdatetime()
+            if isinstance(time, str):
+                tz = self.now.tzinfo
+                naive_time = datetime.fromisoformat(time)
+                aware_time=  naive_time.replace(tzinfo=tz)
+                se[key] = aware_time
+        return se
 
     def formatted_date(self, occ):
         provider = getMultiAdapter(

From bcb489b4237f4d8c7c1f1886b79e7f922b6d33ce Mon Sep 17 00:00:00 2001
From: Thibaut Born <thibaut.born@kuleuven.be>
Date: Thu, 20 Jun 2024 13:12:35 +0200
Subject: [PATCH 2/3] make event_listing act consistent

context: event_listing didn't always show the results from the collection.
---
 plone/app/event/browser/event_listing.py | 32 ++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/plone/app/event/browser/event_listing.py b/plone/app/event/browser/event_listing.py
index 735eb0ab..033aa5a7 100644
--- a/plone/app/event/browser/event_listing.py
+++ b/plone/app/event/browser/event_listing.py
@@ -68,20 +68,30 @@ def __init__(self, context, request):
             ).isoformat()
 
         if self.mode is None:
-            self.mode = "day" if self._date else "future"
+            if self._date:
+                self.mode = "day"
+            elif self.is_start_or_end_in_query():
+                self.mode = "all"
+            else:
+                self.mode = "future"
 
         self.uid = None  # Used to get all occurrences from a single event. Overrides all other settings  # noqa
 
-    @property
-    def show_filter(self):
-        ret = True
+    def is_start_or_end_in_query(self): 
         if self.is_collection:
             ctx = self.default_context
             query = queryparser.parseFormquery(ctx, ctx.query)
             if "start" in query or "end" in query:
-                # Don't show the date filter, if a date is given in the
-                # collection's query
-                ret = False
+                return True
+        return False
+
+    @property
+    def show_filter(self):
+        ret = True
+        if self.is_start_or_end_in_query():
+            # Don't show the date filter, if a date is given in the
+            # collection's query
+            ret = False
         return ret
 
     @property
@@ -152,12 +162,14 @@ def events(self, ret_mode=RET_MODE_ACCESSORS, expand=True, batch=True):
                 ctx, ctx.query, sort_on=sort_on, sort_order=sort_order
             )
             custom_query = self.request.get("contentFilter", {})
-            if "start" not in query or "end" not in query:
-                # ... else don't show the navigation bar
+            # only use custom end or start dates, if none are used by the collection
+            if "start" not in query and "end" not in query:
                 start, end = self._start_end
                 start, end = _prepare_range(ctx, start, end)
                 custom_query.update(start_end_query(start, end))
-            res = ctx.results(batch=False, brains=True, custom_query=custom_query)
+                res = ctx.results(batch=False, brains=True, custom_query=custom_query)
+            else:
+                res = ctx.results(batch=False, brains=True)
             if expand:
                 # get start and end values from the query to ensure limited
                 # listing for occurrences

From 6e2468934f4906a6ecec693436e0192d06b6dd91 Mon Sep 17 00:00:00 2001
From: Thibaut Born <thibaut.born@kuleuven.be>
Date: Mon, 24 Jun 2024 17:29:43 +0200
Subject: [PATCH 3/3] restucture code event_listing

context: make code more readable by seperating usecases
---
 plone/app/event/browser/configure.zcml   |  20 ++
 plone/app/event/browser/event_listing.py | 222 ++++++++++++++++++++---
 2 files changed, 216 insertions(+), 26 deletions(-)

diff --git a/plone/app/event/browser/configure.zcml b/plone/app/event/browser/configure.zcml
index ea49f92b..3d86ffc2 100644
--- a/plone/app/event/browser/configure.zcml
+++ b/plone/app/event/browser/configure.zcml
@@ -23,6 +23,26 @@
       menu="plone_displayviews"
       title="Event listing"
       />
+    <browser:page
+      name="event_listing"
+      for="plone.app.contenttypes.interfaces.ICollection"
+      class=".event_listing.CollectionEventListing"
+      template="event_listing.pt"
+      permission="zope2.View"
+      layer="..interfaces.IBrowserLayer"
+      menu="plone_displayviews"
+      title="Event listing"
+      />
+    <browser:page
+      name="event_listing"
+      for="plone.app.contenttypes.interfaces.IFolder"
+      class=".event_listing.FolderEventListing"
+      template="event_listing.pt"
+      permission="zope2.View"
+      layer="..interfaces.IBrowserLayer"
+      menu="plone_displayviews"
+      title="Event listing"
+      />
   <browser:page
       name="event_listing"
       for="*"
diff --git a/plone/app/event/browser/event_listing.py b/plone/app/event/browser/event_listing.py
index 033aa5a7..acb955a9 100644
--- a/plone/app/event/browser/event_listing.py
+++ b/plone/app/event/browser/event_listing.py
@@ -1,11 +1,12 @@
 from calendar import monthrange
 from datetime import date
 from datetime import datetime
-from datetime import timedelta
 from DateTime import DateTime
+from datetime import timedelta
 from plone.app.contenttypes.behaviors.collection import ISyndicatableCollection
 from plone.app.event import _
 from plone.app.event.base import _prepare_range
+from plone.app.event.base import default_timezone
 from plone.app.event.base import expand_events
 from plone.app.event.base import get_events
 from plone.app.event.base import guess_date_from
@@ -68,30 +69,20 @@ def __init__(self, context, request):
             ).isoformat()
 
         if self.mode is None:
-            if self._date:
-                self.mode = "day"
-            elif self.is_start_or_end_in_query():
-                self.mode = "all"
-            else:
-                self.mode = "future"
+            self.mode = "day" if self._date else "future"
 
         self.uid = None  # Used to get all occurrences from a single event. Overrides all other settings  # noqa
 
-    def is_start_or_end_in_query(self): 
+    @property
+    def show_filter(self):
+        ret = True
         if self.is_collection:
             ctx = self.default_context
             query = queryparser.parseFormquery(ctx, ctx.query)
             if "start" in query or "end" in query:
-                return True
-        return False
-
-    @property
-    def show_filter(self):
-        ret = True
-        if self.is_start_or_end_in_query():
-            # Don't show the date filter, if a date is given in the
-            # collection's query
-            ret = False
+                # Don't show the date filter, if a date is given in the
+                # collection's query
+                ret = False
         return ret
 
     @property
@@ -162,14 +153,12 @@ def events(self, ret_mode=RET_MODE_ACCESSORS, expand=True, batch=True):
                 ctx, ctx.query, sort_on=sort_on, sort_order=sort_order
             )
             custom_query = self.request.get("contentFilter", {})
-            # only use custom end or start dates, if none are used by the collection
-            if "start" not in query and "end" not in query:
+            if "start" not in query or "end" not in query:
+                # ... else don't show the navigation bar
                 start, end = self._start_end
                 start, end = _prepare_range(ctx, start, end)
                 custom_query.update(start_end_query(start, end))
-                res = ctx.results(batch=False, brains=True, custom_query=custom_query)
-            else:
-                res = ctx.results(batch=False, brains=True)
+            res = ctx.results(batch=False, brains=True, custom_query=custom_query)
             if expand:
                 # get start and end values from the query to ensure limited
                 # listing for occurrences
@@ -254,7 +243,7 @@ def _expand_events_start_end(self, start, end):
                 se["start"] = q
         se = self.convert_values_to_datetime(se)
         return se["start"], se["end"]
-    
+
     def convert_values_to_datetime(self, se):
         # needed to make the comparisons possible between dates in the expand_events method 
         for key, time in se.items():
@@ -474,12 +463,193 @@ def __call__(self, *args, **kwargs):
         return self.ical
 
 
-class EventEventListing(EventListing):
+
+
+class BaseEventListing(EventListing):
+    def __init__(self, context, request):
+        super(BrowserView, self).__init__(context, request)
+
+        self.now = now = localized_now(context)
+
+        # Request parameter
+        req = self.request.form
+
+        self.b_size = int(req.get("b_size", 10))
+        self.b_start = int(req.get("b_start", 0))
+        self.orphan = int(req.get("orphan", 1))
+        self.mode = req.get("mode", None)
+        self._date = req.get("date", None)
+        self.tags = req.get("tags", None)
+        self.searchable_text = req.get("SearchableText", None)
+        self.path = req.get("path", None)
+
+        day = int(req.get("day", 0)) or None
+        month = int(req.get("month", 0)) or None
+        year = int(req.get("year", 0)) or None
+
+        if not self._date and day or month or year:
+            self._date = date(
+                year or now.year, month or now.month, day or now.day
+            ).isoformat()
+
+        if self.mode is None:
+            self.mode = "day" if self._date else "future"
+
+    @property
+    def show_filter(self):
+        return True
+    
+    @view.memoize
+    def events(self, ret_mode=RET_MODE_ACCESSORS, expand=True, batch=True):
+        res = self._get_events(ret_mode, expand=expand)
+        if batch:
+           res = Batch(res, size=self.b_size, start=self.b_start, orphan=self.orphan)
+        return res
+    
+    def get_query_keywords(self):
+        kw = {}
+        if self.path:
+            kw["path"] = self.path
+        else:
+            # Search current and subsequent folders
+            kw["path"] = "/".join(self.context.getPhysicalPath())
+
+        if self.tags:
+            kw["Subject"] = {"query": self.tags, "operator": "and"}
+
+        if self.searchable_text:
+            kw["SearchableText"] = self.searchable_text
+        return kw
+    
+    def _get_events(self, ret_mode=RET_MODE_ACCESSORS, expand=True):
+        kw = self.get_query_keywords()
+
+        start, end = self._start_end
+
+        sort = "start"
+        sort_reverse = False
+        if self.mode in ("past", "all"):
+            sort_reverse = True
+        return get_events(
+            self.context,
+            start=start,
+            end=end,
+            sort=sort,
+            sort_reverse=sort_reverse,
+            ret_mode=ret_mode,
+            expand=expand,
+            **kw,
+        )
+
+class EventEventListing(BaseEventListing):
     """This is an EventListing for an individual event, to list all
     occurrences batched and navigatable with all the features, the EventListing
     offers.
     """
 
+    def get_query_keywords(self):
+        kw = {}
+        kw["UID"] = IUUID(self.context)
+        return kw
+
+class CollectionEventListing(BaseEventListing):
     def __init__(self, context, request):
         super().__init__(context, request)
-        self.uid = IUUID(self.context)
+        b_size = int(request.get("b_size", 0))
+        if not b_size:
+            collection_behavior = ISyndicatableCollection(context)
+            b_size = getattr(collection_behavior, "item_count", 0)
+        self.b_size = b_size or 10
+
+    @property
+    def show_filter(self):
+        ctx = self.context
+        query = queryparser.parseFormquery(ctx, ctx.query)
+        if "start" in query or "end" in query:
+            # Don't show the date filter, if a date is given in the
+            # collection's query
+            return False
+        return True
+    
+    @view.memoize
+    def events(self, ret_mode=RET_MODE_ACCESSORS, expand=True, batch=True):
+        ctx = self.context
+        # Whatever sorting is defined, we're overriding it.
+        sort_on = "start"
+        sort_order = None
+        if self.mode in ("past", "all"):
+            sort_order = "reverse"
+        query = queryparser.parseFormquery(
+            ctx, ctx.query, sort_on=sort_on, sort_order=sort_order
+        )
+        if "start" in query:
+            tzinfo = default_timezone(context=self.context, as_tzinfo=True)
+            query["start"] = convert_to_datetime(query["start"], tzinfo)
+        if "end" in query:
+            tzinfo = default_timezone(context=self.context, as_tzinfo=True)
+            query["end"] = convert_to_datetime(query["end"], tzinfo)
+
+        custom_query = self.request.get("contentFilter", {})
+        if "start" not in query or "end" not in query:
+            # ... else don't show the navigation bar
+            start, end = self._start_end
+            start, end = _prepare_range(ctx, start, end)
+            custom_query.update(start_end_query(start, end))
+        res = ctx.results(batch=False, brains=True, custom_query=custom_query)
+        if expand:
+            # get start and end values from the query to ensure limited
+            # listing for occurrences
+            start, end = self._expand_events_start_end(
+                query.get("start") or custom_query.get("start"),
+                query.get("end") or custom_query.get("end"),
+            )
+            res = expand_events(
+                res,
+                ret_mode,
+                start=start,
+                end=end,
+                sort=sort_on,
+                sort_reverse=True if sort_order else False,
+            )
+        if batch:
+            res = Batch(res, size=self.b_size, start=self.b_start, orphan=self.orphan)
+        return res
+
+    # COLLECTION daterange start/end determination
+    def _expand_events_start_end(self, start, end):
+        # make sane start and end values for expand_events from
+        # Collection start/end criterions.
+        # if end/min is given, it overrides start/min settings to make sure,
+        # ongoing events are shown in the listing!
+        # XXX: This actually fits most needs, but not all. Maybe someone
+        # wants to come up with some edgecases!
+        se = dict(start=None, end=None)
+        if start:
+            q = start.get("query")
+            r = start.get("range")
+            if r == "min":
+                se["start"] = q
+            elif r == "max":
+                se["end"] = q
+            elif r in ("minmax", "min:max"):
+                list(q).sort()
+                se["start"] = q[0]
+                se["end"] = q[1]
+        if end:
+            q = end.get("query")
+            r = end.get("range")
+            if r == "min":
+                se["start"] = q
+        return se["start"], se["end"]
+
+def convert_to_datetime(time, tzinfo):
+    if isinstance(time, DateTime):
+        return time.asdatetime()
+    elif isinstance(time, str):
+        naive_time = datetime.fromisoformat(time)
+        aware_time=  naive_time.replace(tzinfo=tzinfo)
+        return aware_time
+    return time
+
+class FolderEventListing(BaseEventListing):
+    pass 
\ No newline at end of file