Allow for notices on all event pages #1185

xmedr · 2024-12-05T21:45:42Z

Overview

This branch replaces the hard coded public comment instructions with wagtail-editable objects from an EventNotice model. These objects will render according to conditions that Metro can select for each notice, and those condition options came from the conditions that were present within the event_header_*_public_comment templates. There are two sets of conditions: the status of the broadcast, and its public comment setting.

I've also updated the fixtures with a set of event notices that match what metro currently has on the site.

Closes Create pattern for editing content that appears across a set of detail pages #1177

Testing Instructions

** Note: This PR requires a database migration, the review app will not work and this will have to be tested locally.

Pull down this branch and run migrations
- You may instead run an event scrape if needed, and this would run migrations
To have a set of EventNotices ready, load in the cms content with the load_content management command
Create a super user if needed and log in to the cms localhost:8001/cms
- hannah's from the staging site is in the fixture
Head to Event Notices and confirm they have loaded correctly
- Also confirm that the About Us page content is still intact
Make some notices for events that exist for you.
- Confirm that they render as expected on event detail pages, conditions and all

xmedr · 2024-12-06T21:25:00Z

lametro/templates/event/_event_header_live_public_comment.html

@@ -1,5 +1,5 @@
 <section class="row">
-    {% if has_agenda and not event.has_passed %}
+    {% if has_agenda and event_notices %}


This branch is allowing for a notice to be posted even when an event has_passed (concluded). Because of this, the styling conditionals have been adjusted to allow space for notices if they exist at all.

Also something to note, any notice showing up is still contingent on the event having an agenda, to mimic the way public comment instructions only displayed if they had one as well. Lmk if we want to change this!

xmedr · 2024-12-12T14:22:36Z

lametro/templates/event/_event_header_live_public_comment.html

+                {% for notice in event_notices %}
+                    {% if "upcoming" in notice.broadcast_conditions and event.is_upcoming %}
+                        {{ notice.message|safe }}
+                    {% elif "ongoing" in notice.broadcast_conditions and event.is_ongoing %}
+                        {{ notice.message|safe }}


This pattern makes it so that notices only ever show if the event's broadcast status matches the notifications' conditions. This is repeated across the public_comment partials

xmedr · 2024-12-12T14:26:54Z

lametro/templates/event/_event_header_live_public_comment.html

@@ -1,5 +1,5 @@
 <section class="row">
-    {% if has_agenda and not event.has_passed %}
+    {% if has_agenda and event_notices %}


Also something to note, any notice showing up is still contingent on the event having an agenda, to mimic the way public comment instructions only displayed if they had one as well. Lmk if we want to change this!

xmedr · 2024-12-12T14:33:15Z

lametro/models/cms.py

+class CheckboxSelectMultipleList(forms.CheckboxSelectMultiple):
+    def format_value(self, value):
+        if isinstance(value, str):
+            return value.split(",")


This is helping to actually display our arrayfield choices in the create/edit views

xmedr · 2024-12-12T14:34:15Z

lametro/templates/event/_event_header_live_public_comment.html

+                        {% if USING_ECOMMENT %}
+                            <p>
+                                <strong>On the web:</strong>
+                                <a href="{{ event.ecomment_url }}" target="_blank" aria-label="Go to public comment - link opens in a new tab">
+                                    <i class="fa fa-fw fa-external-link" aria-hidden="true"></i>
+                                    Go to public comment
+                                </a>
+                            </p>
+                        {% endif %}


The ecomment portions of the partials have been kept for now.

xmedr · 2024-12-12T14:36:52Z

lametro/views.py

+        # Only provide notices for this event's public comment setting
+        if event.accepts_live_comment:
+            context["event_notices"] = EventNotice.objects.filter(
+                comment_conditions__contains=["accepts_live_comment"]
+            )


Deciding which notices to pass through based off of public comment status in the view to take some burden off of the template.

hancush

This is looking really snazzy! Left a few questions inline. How about also adding a link to edit the event notice to the Wagtail userbar? (See the hook that adds the manage alerts link.)

hancush · 2024-12-12T20:20:58Z

lametro/models/cms.py

+    COMMENT_CONDITION_CHOICES = [
+        ("accepts_live_comment", "Events that accept live public comments"),
+        ("accepts_comment", "Events that accept public comments when not live"),
+        ("accepts_no_comment", "Events that do not accept public comments at all"),
+    ]


Hm, I'm a little confused by the comment conditions. I think all events accept comment?

Ah okay, I was basing this off of the below section in the event template. Is this is a holdover from a time when not all events accepted comment, or maybe I'm just misinterpreting the below conditions?

la-metro-councilmatic/lametro/templates/event/event.html

Lines 109 to 116 in 431a943



{% if not event.accepts_public_comment %}

{% include 'event/_event_header_no_public_comment.html' %}

{% elif event.accepts_live_comment %}

{% include 'event/_event_header_live_public_comment.html' %}

{% else %}

{% include 'event/_event_header_no_live_public_comment.html' %}

{% endif %}

Looks like some committee meetings don't accept comments: https://github.com/Metro-Records/la-metro-councilmatic/pull/823/files

But that's determined on the back end – this logic shouldn't be exposed in the CMS!

Gotcha, I've removed it from the cms!

In that case, what do you think about me bringing back the public comment instructions in the template then? Since it says different things depending on which template is being rendered, and the same "upcoming" notice would render across all those templates regardless of whether the event accepted comment or not.

Otherwise we can keep it out and leave it up to them to decide on language that would make sense for all those public comment conditions.

Hmmm.................................. maybe you were right to include the comment conditions after all. Can we change the labels to:

Events that accept public comment before and during the meeting

Events that accept public comment before but not during the meeting

Events that do not accept public comment

Sorry for the run around!

No worries! It's an easy adjustment and I could've explained myself more haha.

hancush · 2024-12-12T20:24:57Z

lametro/templates/event/_event_header_live_public_comment.html

@@ -53,78 +53,41 @@
        {% endif %}
    </section>

-    {% if has_agenda and not event.has_passed %}
+    {% if has_agenda and event_notices %}


I'm wondering now if it would be easier to get the appropriate notice/s in the view so we can simplify the templates?

I think it would be easier once we figure out how to get those template variables to work within these notices. As of now, the conditionals that are left within these three comment templates have event specific variables in them that we wouldn't currently be able to render in the editable notice. Unless you had something else in mind!

Got it, ok. Let's put a pin in this.

hancush · 2024-12-12T20:25:56Z

lametro/templates/base.html

@@ -109,7 +109,7 @@
            <ul class="nav col-md-6 justify-content-around justify-content-md-end list-unstyled">
                <li class="ms-3"><a href="{% url 'lametro:contact' %}">Contact Us</a></li>
                <li class="ms-3"><a href="{% slugurl 'about' %}">About Us</a></li>
-                <li class="ms-3"><a href="{% url 'metro_login' %}">Metro Login</a></li>
+                <li class="ms-3"><a href="{% url 'wagtailadmin_home' %}">Metro Login</a></li>


hancush · 2024-12-12T20:28:39Z

P.s., I pushed an updated fixture omitting the OCD models – it should only contain content managed by the CMS!

This reverts commit dc80761.

xmedr · 2024-12-18T21:03:33Z

@hancush public comment changes reverted and notices added to userbar!

hancush · 2024-12-20T17:58:10Z

I want to look at this with fresh eyes in January, but for now, it looks great, @xmedr!

get editable EventNotices in wagtail

f9239da

fgregg temporarily deployed to la-metro-cou-feat-edit--0wub1h December 5, 2024 21:49 Inactive

display notices and account for live/non-live public comment events

0f557db

xmedr commented Dec 6, 2024

View reviewed changes

Xavier Medrano added 3 commits December 10, 2024 14:44

add custom ecomment link feature to richtext editor

b1b6bc2

format display values in wagtail eventnotice list view

a9ca98c

use wagtail login as main login link

c0a53e4

Base automatically changed from hcg/alerts to hcg/wagtail December 11, 2024 14:30

Xavier Medrano added 3 commits December 11, 2024 12:31

clean up some todos

88e3dfc

adjust comment test to account for new process

c7ee612

remove ecomment feature from richtext editor

e9d542a

xmedr changed the base branch from hcg/wagtail to main December 11, 2024 18:20

Merge branch 'main' into feat/edit-pub-comment

d6dc68c

fgregg temporarily deployed to la-metro-cou-feat-edit--6itkjs December 11, 2024 18:31 Inactive

Xavier Medrano added 2 commits December 11, 2024 15:32

bring no_public_comment template in line with others

31e48c3

fix logic that shows notices, and account for no comment events

b74143d

xmedr temporarily deployed to la-metro-cou-feat-edit--6itkjs December 11, 2024 21:48 Inactive

xmedr commented Dec 12, 2024

View reviewed changes

update fixture to include a set of eventnotices

5bcfc8f

xmedr temporarily deployed to la-metro-cou-feat-edit--6itkjs December 12, 2024 15:13 Inactive

change my user's name in fixture to xavier instead of admin

b13e2d0

xmedr temporarily deployed to la-metro-cou-feat-edit--6itkjs December 12, 2024 15:24 Inactive

xmedr marked this pull request as ready for review December 12, 2024 15:26

xmedr requested a review from hancush December 12, 2024 15:27

Omit OCD models from CMS fixture

ca164c9

hancush requested changes Dec 12, 2024

View reviewed changes

hancush temporarily deployed to la-metro-cou-feat-edit--6itkjs December 12, 2024 20:28 Inactive

Xavier Medrano added 2 commits December 17, 2024 11:47

remove references to comment conditions in cms

dc80761

add event notices to wagtail userbar

9d3339f

xmedr temporarily deployed to la-metro-cou-feat-edit--6itkjs December 17, 2024 16:58 Inactive

Xavier Medrano added 3 commits December 18, 2024 15:38

Revert "remove references to comment conditions in cms"

61a719a

This reverts commit dc80761.

exclude councilmatic and ocd models in mgmt cmd dump

71a58e9

add more context to public comment condition labels

255c684

xmedr deployed to la-metro-cou-feat-edit--6itkjs December 18, 2024 21:02 View deployment

hancush mentioned this pull request Dec 20, 2024

Implement board member details as snippet #1189

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow for notices on all event pages #1185

Allow for notices on all event pages #1185

xmedr commented Dec 5, 2024 •

edited

Loading

xmedr Dec 6, 2024 •

edited

Loading

xmedr Dec 12, 2024

xmedr Dec 12, 2024

xmedr Dec 12, 2024

xmedr Dec 12, 2024

xmedr Dec 12, 2024

xmedr Dec 12, 2024

hancush left a comment

hancush Dec 12, 2024

xmedr Dec 16, 2024

hancush Dec 16, 2024

xmedr Dec 17, 2024 •

edited

Loading

hancush Dec 18, 2024

hancush Dec 18, 2024

xmedr Dec 18, 2024

hancush Dec 12, 2024

xmedr Dec 18, 2024

hancush Dec 18, 2024

hancush Dec 12, 2024

hancush commented Dec 12, 2024

xmedr commented Dec 18, 2024

hancush commented Dec 20, 2024

	<!-- Details -->
	{% if not event.accepts_public_comment %}
	{% include 'event/_event_header_no_public_comment.html' %}
	{% elif event.accepts_live_comment %}
	{% include 'event/_event_header_live_public_comment.html' %}
	{% else %}
	{% include 'event/_event_header_no_live_public_comment.html' %}
	{% endif %}

Allow for notices on all event pages #1185

Are you sure you want to change the base?

Allow for notices on all event pages #1185

Conversation

xmedr commented Dec 5, 2024 • edited Loading

Overview

Testing Instructions

xmedr Dec 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hancush left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xmedr Dec 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hancush commented Dec 12, 2024

xmedr commented Dec 18, 2024

hancush commented Dec 20, 2024

xmedr commented Dec 5, 2024 •

edited

Loading

xmedr Dec 6, 2024 •

edited

Loading

xmedr Dec 17, 2024 •

edited

Loading