meh

bartfeenstra · Dec 29, 2023 · 0d6d557 · 0d6d557
1 parent 1cda52e
commit 0d6d557
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/betty/extension/cotton_candy/assets/templates/entity/meta--person.html.j2 b/betty/extension/cotton_candy/assets/templates/entity/meta--person.html.j2
@@ -14,15 +14,17 @@
             <span class="aka">{%- trans names=alternative_names | map(_embedded_person_name_label if embedded else person_macros.name_label) | list | join(', ') -%}Also known as {{ names }}{%- endtrans -%}</span>
         {%- endif -%}
         {%- set formatted_start -%}
-            {%- if entity.start and entity.start is public and entity.start.event -%}
-                {%- with event=entity.start.event -%}
+            {% set start_of_life_events = entity.presences | map(attribute='event') | reject('none') | rejectattr('date', 'none') | select('public') | select('start_of_life_event') | list %}
+            {%- if start_of_life_events | length -%}
+                {%- with event=start_of_life_events | list | sort | first -%}
                     {%- include 'event-dimensions.html.j2' -%}
                 {%- endwith -%}
             {%- endif -%}
         {%- endset -%}
         {%- set formatted_end -%}
-            {%- if entity.end and entity.end is public and entity.end.event -%}
-                {%- with event=entity.end.event -%}
+            {% set end_of_life_events = entity.presences | map(attribute='event') | reject('none') | rejectattr('date', 'none') | select('public') | select('end_of_life_event') | list %}
+            {%- if end_of_life_events | length -%}
+                {%- with event=end_of_life_events | list | sort | reverse | first -%}
                     {%- include 'event-dimensions.html.j2' -%}
                 {%- endwith -%}
             {%- endif -%}

diff --git a/betty/jinja2.py b/betty/jinja2.py
@@ -315,8 +315,8 @@ def _test_entity_type(x: Any) -> bool:
         self.tests['witness_role'] = lambda x: isinstance(x, Witness)
         self.tests['date_range'] = lambda x: isinstance(x, DateRange)
         # @todo Are we using these?
-        self.tests['start_of_life_event'] = lambda event: issubclass(event, StartOfLifeEventType)
-        self.tests['end_of_life_event'] = lambda event: issubclass(event, EndOfLifeEventType)
+        self.tests['start_of_life_event'] = lambda event: issubclass(event.event_type, StartOfLifeEventType)
+        self.tests['end_of_life_event'] = lambda event: issubclass(event.event_type, EndOfLifeEventType)
 
     def _init_extensions(self) -> None:
         for extension in self.app.extensions.flatten():

diff --git a/betty/tests/extension/cotton_candy/assets/templates/entity/test_meta_person_html_j2.py b/betty/tests/extension/cotton_candy/assets/templates/entity/test_meta_person_html_j2.py
@@ -70,7 +70,7 @@ async def test_with_multiple_alternative_names(self) -> None:
         }) as (actual, _):
             assert expected == actual
 
-    async def test_with_start(self) -> None:
+    async def test_with_start_of_life_event(self) -> None:
         person = Person(id='P0')
         Presence(person, Subject(), Event(
             event_type=Birth,
@@ -82,7 +82,7 @@ async def test_with_start(self) -> None:
         }) as (actual, _):
             assert expected == actual
 
-    async def test_with_end(self) -> None:
+    async def test_with_end_of_life_event(self) -> None:
         person = Person(id='P0')
         Presence(person, Subject(), Event(
             event_type=Death,