Implement board member details as snippet

docker-compose.yml

@@ -64,7 +64,6 @@ services:
         condition: service_healthy
     environment:
       DATABASE_URL: 'postgis://postgres:postgres@postgres/lametro'
-      SHARED_DB: "True"
       OCD_DIVISION_CSV: '/app/lametro_divisions.csv'
     command: sh -c 'pupa update --rpm=600 lametro people && pupa update --rpm=600 lametro bills window=7 && pupa update --rpm=600 lametro events window=7'
     volumes:

lametro/apps.py

@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+
+class LAMetroCouncilmaticConfig(AppConfig):
+    name = "lametro"
+    verbose_name = "LA Metro Councilmatic"
+
+    def ready(self):
+        import lametro.signals.handlers  # noqa

lametro/forms.py

@@ -10,7 +10,6 @@
 from haystack.query import EmptySearchQuerySet
 
 from councilmatic_core.views import CouncilmaticSearchForm
-from lametro.models import LAMetroPerson
 
 
 class LAMetroCouncilmaticSearchForm(CouncilmaticSearchForm):
@@ -151,33 +150,3 @@ def clean_agenda(self):
             return agenda_pdf
         else:
             raise forms.ValidationError("File type not supported. Please submit a PDF.")
-
-
-class PersonHeadshotForm(forms.ModelForm):
-    headshot_form = forms.BooleanField(widget=forms.HiddenInput, initial=True)
-
-    def __init__(self, *args, **kwargs):
-        super(PersonHeadshotForm, self).__init__(*args, **kwargs)
-        self.fields["headshot"].widget.attrs.update(
-            {
-                "required": "True",
-            }
-        )
-
-    class Meta:
-        model = LAMetroPerson
-        fields = ["headshot"]
-
-
-class PersonBioForm(forms.ModelForm):
-    bio_form = forms.BooleanField(widget=forms.HiddenInput, initial=True)
-
-    def __init__(self, *args, **kwargs):
-        super(PersonBioForm, self).__init__(*args, **kwargs)
-        self.fields["councilmatic_biography"].widget.attrs.update(
-            {"rows": "5", "required": "True"}
-        )
-
-    class Meta:
-        model = LAMetroPerson
-        fields = ["councilmatic_biography"]

lametro/migrations/0018_boardmemberdetails.py

@@ -0,0 +1,132 @@
+# Generated by Django 3.2.25 on 2024-12-20 15:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.fields
+import wagtail.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
+        ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
+        ("lametro", "0017_alter_alert_description"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="BoardMemberDetails",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "live",
+                    models.BooleanField(
+                        default=True, editable=False, verbose_name="live"
+                    ),
+                ),
+                (
+                    "has_unpublished_changes",
+                    models.BooleanField(
+                        default=False,
+                        editable=False,
+                        verbose_name="has unpublished changes",
+                    ),
+                ),
+                (
+                    "first_published_at",
+                    models.DateTimeField(
+                        blank=True,
+                        db_index=True,
+                        null=True,
+                        verbose_name="first published at",
+                    ),
+                ),
+                (
+                    "last_published_at",
+                    models.DateTimeField(
+                        editable=False, null=True, verbose_name="last published at"
+                    ),
+                ),
+                (
+                    "go_live_at",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="go live date/time"
+                    ),
+                ),
+                (
+                    "expire_at",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="expiry date/time"
+                    ),
+                ),
+                (
+                    "expired",
+                    models.BooleanField(
+                        default=False, editable=False, verbose_name="expired"
+                    ),
+                ),
+                (
+                    "headshot_source",
+                    models.CharField(
+                        blank=True, default="Metro", max_length=256, null=True
+                    ),
+                ),
+                ("bio", wagtail.fields.RichTextField(blank=True, null=True)),
+                (
+                    "headshot",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="wagtailimages.image",
+                    ),
+                ),
+                (
+                    "latest_revision",
+                    models.ForeignKey(
+                        blank=True,
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="wagtailcore.revision",
+                        verbose_name="latest revision",
+                    ),
+                ),
+                (
+                    "live_revision",
+                    models.ForeignKey(
+                        blank=True,
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="wagtailcore.revision",
+                        verbose_name="live revision",
+                    ),
+                ),
+                (
+                    "person",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="details",
+                        to="lametro.lametroperson",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "Board Member Details",
+            },
+            bases=(wagtail.models.PreviewableMixin, models.Model),
+        ),
+    ]

lametro/models/cms.py

@@ -1,7 +1,9 @@
+from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
+from django.urls import reverse
 from django.utils.html import format_html, strip_tags
 
-from wagtail.models import Page
+from wagtail.models import Page, PreviewableMixin, DraftStateMixin, RevisionMixin
 from wagtail.fields import StreamField, RichTextField
 from wagtail.admin.panels import FieldPanel
 from wagtail.rich_text import expand_db_html
@@ -24,6 +26,64 @@ class AboutPage(Page):
     ]
 
 
+class BoardMemberDetails(
+    DraftStateMixin, RevisionMixin, PreviewableMixin, models.Model
+):
+    include_in_dump = True
+
+    class Meta:
+        verbose_name_plural = "Board Member Details"
+
+    person = models.OneToOneField(
+        "lametro.LAMetroPerson", on_delete=models.CASCADE, related_name="details"
+    )
+    headshot = models.ForeignKey(
+        "wagtailimages.Image",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="+",
+    )
+    headshot_source = models.CharField(
+        max_length=256, blank=True, null=True, default="Metro"
+    )
+    bio = RichTextField(blank=True, null=True)
+    _revisions = GenericRelation(
+        "wagtailcore.Revision", related_query_name="member_details"
+    )
+
+    @property
+    def revisions(self):
+        return self._revisions
+
+    def get_url(self):
+        return reverse("lametro:person", kwargs={"slug": self.person.slug})
+
+    def __str__(self):
+        loaded_obj = (
+            type(self)
+            .objects.select_related("person")
+            .prefetch_related("person__memberships")
+            .get(id=self.id)
+        )
+        return f"{loaded_obj.person.name}{' (current)' if loaded_obj.person.current_memberships.exists() else ''}"
+
+    def get_preview_context(self, request, mode_name):
+        context = super().get_preview_context(request, mode_name)
+        context["person"] = self.person
+        context["person_details"] = self
+
+        council_post = self.person.latest_council_membership.post
+        context["qualifying_post"] = council_post.acting_label
+
+        context["preview"] = True
+
+        return context
+
+    def get_preview_template(self, request, mode_name):
+        return "person/person.html"
+
+
 class Alert(models.Model):
     include_in_dump = True
 

lametro/models/legislative.py

@@ -2,8 +2,6 @@
 from dateutil.relativedelta import relativedelta
 import json
 import logging
-import os
-from pathlib import Path
 import pytz
 
 import requests
@@ -17,7 +15,6 @@
 
 from django.db.models import Prefetch, Case, When, Value, Q, F, Subquery, OuterRef
 from django.db.models.functions import Now, Cast
-from django.templatetags.static import static
 from opencivicdata.legislative.models import (
     EventMedia,
     EventAgendaItem,
@@ -467,27 +464,6 @@ def ceo(cls):
 
         return ceo
 
-    @property
-    def headshot_url(self):
-        if self.headshot:
-            return self.headshot.url
-
-        file_directory = os.path.dirname(__file__)
-        absolute_file_directory = os.path.abspath(file_directory)
-
-        filename = self.slug_name + ".jpg"
-
-        manual_headshot = os.path.join(
-            absolute_file_directory, "static", "images", "manual-headshots", filename
-        )
-
-        if Path(manual_headshot).exists():
-            image_url = f"images/manual-headshots/{filename}"
-        else:
-            image_url = "images/headshot_placeholder.png"
-
-        return static(image_url)
-
     @property
     def current_bio(self):
         if self.councilmatic_biography:

lametro/signals/handlers.py

@@ -0,0 +1,12 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from lametro.models import LAMetroPerson, BoardMemberDetails
+
+
+@receiver(post_save, sender=LAMetroPerson)
+def create_member_details(sender, instance, created, **kwargs):
+    details_exist = BoardMemberDetails.objects.filter(person=instance).exists()
+
+    if not details_exist:
+        BoardMemberDetails.objects.create(person=instance)

lametro/static/css/city_custom.css

@@ -367,10 +367,6 @@ hr .events-line {
     .current-meeting-img {
         max-width: 75%;
     }
-
-    #person-detail-headshot {
-        max-height: none;
-    }
 }
 
 @media only screen and (max-width : 415px) {
@@ -818,3 +814,8 @@ caption {
 .alert p:last-of-type {
     margin: unset;
 }
+
+.thumbnail-square {
+    width: 75px;
+    height: 75px;
+}

lametro/templates/board_members/_council_member_table.html

@@ -14,7 +14,9 @@
             <tr id="polygon-{{ membership.post.label | slugify }}-{{ membership.person.name | slugify}}" data-name="{{ membership.person.name | slugify}}" data-polygon="polygon-{{ membership.post.label | slugify }}">
                 <td>
                     <div class="thumbnail-square">
-                        <img src='{{ membership.person.headshot_url }}' alt='{{ membership.person.name }}' title='{{ membership.person.name }}' class='img-thumbnail' />
+                        {% with person=membership.person %}
+                            {% include 'common/headshot.html' %}
+                        {% endwith %}
                     </div>
                 </td>
 

lametro/templates/board_members/board_members.html

@@ -197,12 +197,6 @@ <h3 class="h4"><i class='fa fa-fw fa-calendar-o' aria-hidden="true"></i> Board o
                     'html': true,
                     'container': 'body'
             });
-
-            $('.thumbnail-square img').each(function() {
-              if ($(this).width() > $(this).height()) {
-                $(this).addClass('landscape');
-              }
-            });
         });