Add Speaker datetime and color fields with RGBA admin interface

Features added:
- Added created/updated datetime fields to Speaker model with API filters
- Added fill_color and border_color fields for Google Maps polygon styling
- Created advanced RGBA color picker in admin with alpha transparency
- Real-time color preview and map shape updates in admin interface
- Updated API filters to support created__gte/lte and updated__gte/lte
- Fixed Django warnings and floppyforms compatibility issues
- Added comprehensive tests for new model fields and API functionality

Technical changes:
- Speaker model: created, updated, fill_color, border_color fields
- SpeakerFilterSet: datetime range filters
- SpeakerAdmin: enhanced form with color picker widgets
- Custom JavaScript/CSS for RGBA color interface with map integration
- Migration: 0041_add_speaker_datetime_and_color_fields
- Tests: updated for new fields and API endpoints

Author: hburgund

roundware/api2/filters.py

@@ -245,11 +245,15 @@ class SpeakerFilterSet(django_filters.FilterSet):
     parent_ids_or = IntegerListFilter(field_name='parents', lookup_expr='in') # performs OR filtering
     parent_ids = IntegerListAndFilter(field_name='parents__id') # performs AND filtering
     children_ids_or = IntegerListFilter(field_name='children', lookup_expr='in') # performs OR filtering
-    children_ids = IntegerListAndFilter(field_name='children__id') # performs AND filtering 
+    children_ids = IntegerListAndFilter(field_name='children__id') # performs AND filtering
+    created__lte = django_filters.DateTimeFilter(field_name='created', lookup_expr='lte')
+    created__gte = django_filters.DateTimeFilter(field_name='created', lookup_expr='gte')
+    updated__lte = django_filters.DateTimeFilter(field_name='updated', lookup_expr='lte')
+    updated__gte = django_filters.DateTimeFilter(field_name='updated', lookup_expr='gte')
 
     class Meta:
         model = Speaker
-        fields = ["activeyn", "project_id", "parents", "children"]
+        fields = ["activeyn", "project_id", "parents", "children", "created", "updated"]
 
 
 class TagFilterSet(django_filters.FilterSet):

roundware/api2/tests/test_views.py

@@ -24,6 +24,7 @@
 from django.db import models
 from django.test.utils import override_settings
 from django.test.testcases import TransactionTestCase
+from django.urls import reverse
 
 # Test fixtures
 @pytest.fixture
@@ -2278,4 +2279,60 @@ def get_exception_handler(self):
     # Should keep custom status code and add auth header
     assert response.status_code == status.HTTP_429_TOO_MANY_REQUESTS
     assert response['WWW-Authenticate'] == 'Bearer realm="api"'
-    assert response.exception is True
+    assert response.exception is True
+
+# Add this test to the existing SpeakerViewSet tests
+def test_speaker_datetime_fields_in_api_response(self):
+    """Test that created and updated fields are included in API responses"""
+    speaker = baker.make('rw.Speaker', project=self.project)
+    
+    # Test GET endpoint includes datetime fields
+    url = reverse('speaker-detail', args=[speaker.id])
+    response = self.client.get(url)
+    
+    self.assertEqual(response.status_code, status.HTTP_200_OK)
+    data = response.json()
+    
+    self.assertIn('created', data)
+    self.assertIn('updated', data)
+    self.assertIsNotNone(data['created'])
+    self.assertIsNotNone(data['updated'])
+
+def test_speaker_color_fields_in_api_response(self):
+    """Test that color fields are included in API responses"""
+    speaker = baker.make('rw.Speaker', project=self.project)
+    
+    # Test GET endpoint includes color fields
+    url = reverse('speaker-detail', args=[speaker.id])
+    response = self.client.get(url)
+    
+    self.assertEqual(response.status_code, status.HTTP_200_OK)
+    data = response.json()
+    
+    self.assertIn('fill_color', data)
+    self.assertIn('border_color', data)
+    self.assertEqual(data['fill_color'], '#0000FF80')
+    self.assertEqual(data['border_color'], '#0000FF')
+
+def test_speaker_color_fields_can_be_updated(self):
+    """Test that color fields can be updated via PATCH"""
+    speaker = baker.make('rw.Speaker', project=self.project)
+    
+    # Test PATCH endpoint can update color fields
+    url = reverse('speaker-detail', args=[speaker.id])
+    patch_data = {
+        'fill_color': '#FF000080',
+        'border_color': '#FF0000'
+    }
+    response = self.client.patch(url, patch_data, content_type='application/json')
+    
+    self.assertEqual(response.status_code, status.HTTP_200_OK)
+    data = response.json()
+    
+    self.assertEqual(data['fill_color'], '#FF000080')
+    self.assertEqual(data['border_color'], '#FF0000')
+    
+    # Verify database was updated
+    speaker.refresh_from_db()
+    self.assertEqual(speaker.fill_color, '#FF000080')
+    self.assertEqual(speaker.border_color, '#FF0000')

roundware/rw/admin.py

@@ -12,6 +12,8 @@
 
 from leaflet.admin import LeafletGeoAdmin
 
+from roundware.rw.forms import SpeakerForm
+
 class VoteInline(admin.TabularInline):
     model = Vote
     extra = 1
@@ -490,32 +492,47 @@ class Media:
 
 
 class SpeakerAdmin(LeafletGeoAdmin, ProjectProtectedModelAdmin):
-    list_display = ('id', 'activeyn', 'code', 'project', 'maxvolume', 'minvolume', 'shape', 'uri')
-    list_filter = ('project', 'activeyn')
+    form = SpeakerForm
+    list_display = ('id', 'activeyn', 'code', 'project', 'maxvolume', 'minvolume', 'shape', 'uri', 'created', 'updated')
+    list_filter = ('project', 'activeyn', 'created')
     list_editable = ('activeyn', 'maxvolume', 'minvolume', 'shape')
     filter_horizontal = ('parents', )
     ordering = ['id']
     save_as = True
     save_on_top = True
     map_width = "400px"
+    readonly_fields = ('created', 'updated')
 
     fieldsets = (
         (None, {
             'fields': ('activeyn', 'code', 'project', 'maxvolume', 'minvolume', 'uri', 'parents' )
         }),
         ('Geographical Data', {
             'fields': ('shape', 'attenuation_distance'),
+        }),
+        ('Map Display Colors', {
+            'fields': (
+                ('fill_color_rgb', 'fill_color_alpha'),
+                ('border_color_rgb', 'border_color_alpha'),
+                ('fill_color', 'border_color'),  # Hidden fields for storage
+            ),
+            'description': 'Set colors for this speaker\'s polygon on the map. Use RGB color pickers and sliders to control transparency (alpha).',
+        }),
+        ('Timestamps', {
+            'fields': ('created', 'updated'),
+            'classes': ('collapse',)
         })
     )
 
     class Media:
         css = {
             "all": (
                 "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css",
-                "rw/css/speaker_admin.css"
+                "rw/css/speaker_admin.css",
+                "rw/css/speaker_color_admin.css"
             )
         }
-        js = []
+        js = ['rw/js/speaker_color_admin.js']
 
 
 class ListeningHistoryItemAdmin(ProjectProtectedThroughAssetModelAdmin):

roundware/rw/forms.py

@@ -3,14 +3,15 @@
 
 from __future__ import unicode_literals
 from django.forms.models import BaseModelFormSet
+from django import forms as django_forms
 
 import floppyforms as forms
 from crispy_forms.helper import FormHelper
 from guardian.shortcuts import get_objects_for_user
 
 from django.conf import settings
 
-from roundware.rw.models import Tag, UIGroup, UIItem
+from roundware.rw.models import Tag, UIGroup, UIItem, Speaker
 from roundware.rw import fields
 from roundware.rw.widgets import (NonAdminRelatedFieldWidgetWrapper,
                                   DummyWidgetWrapper,
@@ -221,3 +222,121 @@ class Meta:
             'index': 'Ordering',
             'header_text_loc': "Localized Header Text",
         }
+
+
+class SpeakerForm(django_forms.ModelForm):
+    """
+    Custom form for Speaker model with color picker widgets that support alpha channel
+    """
+    # Virtual fields for the color picker UI
+    fill_color_rgb = django_forms.CharField(
+        required=False,
+        widget=django_forms.TextInput(attrs={
+            'type': 'color',
+            'title': 'Choose fill color (RGB)',
+            'style': 'width: 60px; height: 30px; margin-right: 10px;'
+        }),
+        help_text="RGB color component"
+    )
+    
+    fill_color_alpha = django_forms.IntegerField(
+        required=False,
+        min_value=0,
+        max_value=255,
+        initial=128,
+        widget=django_forms.NumberInput(attrs={
+            'type': 'range',
+            'min': '0',
+            'max': '255',
+            'step': '1',
+            'style': 'width: 100px; margin-right: 10px;',
+            'oninput': 'updateAlphaDisplay(this, "fill_alpha_display")'
+        }),
+        help_text="Alpha (transparency): 0=transparent, 255=opaque"
+    )
+    
+    border_color_rgb = django_forms.CharField(
+        required=False,
+        widget=django_forms.TextInput(attrs={
+            'type': 'color',
+            'title': 'Choose border color (RGB)',
+            'style': 'width: 60px; height: 30px; margin-right: 10px;'
+        }),
+        help_text="RGB color component"
+    )
+    
+    border_color_alpha = django_forms.IntegerField(
+        required=False,
+        min_value=0,
+        max_value=255,
+        initial=255,
+        widget=django_forms.NumberInput(attrs={
+            'type': 'range',
+            'min': '0',
+            'max': '255',
+            'step': '1',
+            'style': 'width: 100px; margin-right: 10px;',
+            'oninput': 'updateAlphaDisplay(this, "border_alpha_display")'
+        }),
+        help_text="Alpha (transparency): 0=transparent, 255=opaque"
+    )
+    
+    class Meta:
+        model = Speaker
+        fields = '__all__'
+        widgets = {
+            # Hide the actual hex fields since we use the RGB + alpha fields above
+            'fill_color': django_forms.HiddenInput(),
+            'border_color': django_forms.HiddenInput(),
+        }
+
+    def __init__(self, *args, **kwargs):
+        super(SpeakerForm, self).__init__(*args, **kwargs)
+        
+        # Parse existing hex values into RGB + alpha components
+        if self.instance and self.instance.pk:
+            # Parse fill_color (e.g., "#FF0000AA" -> RGB="#FF0000", Alpha=170)
+            if self.instance.fill_color:
+                fill_hex = self.instance.fill_color
+                if len(fill_hex) == 9:  # #RRGGBBAA
+                    self.fields['fill_color_rgb'].initial = fill_hex[:7]  # #RRGGBB
+                    self.fields['fill_color_alpha'].initial = int(fill_hex[7:9], 16)  # AA
+                elif len(fill_hex) == 7:  # #RRGGBB
+                    self.fields['fill_color_rgb'].initial = fill_hex
+                    self.fields['fill_color_alpha'].initial = 255
+                    
+            # Parse border_color
+            if self.instance.border_color:
+                border_hex = self.instance.border_color
+                if len(border_hex) == 9:  # #RRGGBBAA
+                    self.fields['border_color_rgb'].initial = border_hex[:7]  # #RRGGBB
+                    self.fields['border_color_alpha'].initial = int(border_hex[7:9], 16)  # AA
+                elif len(border_hex) == 7:  # #RRGGBB
+                    self.fields['border_color_rgb'].initial = border_hex
+                    self.fields['border_color_alpha'].initial = 255
+
+    def clean(self):
+        cleaned_data = super().clean()
+        
+        # Combine RGB + alpha into 8-digit hex values
+        fill_rgb = cleaned_data.get('fill_color_rgb', '#0000FF')
+        fill_alpha = cleaned_data.get('fill_color_alpha', 128)
+        if fill_rgb and fill_alpha is not None:
+            # Convert alpha (0-255) to hex (00-FF)
+            alpha_hex = format(fill_alpha, '02X')
+            cleaned_data['fill_color'] = f"{fill_rgb}{alpha_hex}"
+            
+        border_rgb = cleaned_data.get('border_color_rgb', '#0000FF')
+        border_alpha = cleaned_data.get('border_color_alpha', 255)
+        if border_rgb and border_alpha is not None:
+            # Convert alpha (0-255) to hex (00-FF)
+            alpha_hex = format(border_alpha, '02X')
+            cleaned_data['border_color'] = f"{border_rgb}{alpha_hex}"
+            
+        return cleaned_data
+
+    class Media:
+        js = ('rw/js/speaker_color_admin.js',)
+        css = {
+            'all': ('rw/css/speaker_color_admin.css',)
+        }

roundware/rw/migrations/0041_add_speaker_datetime_and_color_fields.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.2.23 on 2024-01-01 00:00
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rw', '0040_speaker_parents'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='speaker',
+            name='created',
+            field=models.DateTimeField(default=datetime.datetime.now),
+        ),
+        migrations.AddField(
+            model_name='speaker',
+            name='updated',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='speaker',
+            name='fill_color',
+            field=models.CharField(
+                default='#0000FF80', 
+                help_text='Hex color for polygon fill (supports alpha: #RRGGBBAA)', 
+                max_length=9
+            ),
+        ),
+        migrations.AddField(
+            model_name='speaker',
+            name='border_color',
+            field=models.CharField(
+                default='#0000FF', 
+                help_text='Hex color for polygon border (supports alpha: #RRGGBBAA)', 
+                max_length=9
+            ),
+        ),
+        migrations.RunSQL(
+            # Set initial created and updated times for existing speakers
+            "UPDATE rw_speaker SET created=NOW(), updated=NOW() WHERE created IS NULL OR updated IS NULL;",
+            reverse_sql="-- No reverse operation needed"
+        ),
+    ] 

roundware/rw/models.py

@@ -548,6 +548,22 @@ def __init__(self, *args, **kwargs):
 
     parents = models.ManyToManyField('Speaker', related_name='children', symmetrical=False, blank=True)
 
+    # Datetime tracking fields (like Asset model)
+    created = models.DateTimeField(default=datetime.now)
+    updated = models.DateTimeField(auto_now=True)
+
+    # Map display styling fields
+    fill_color = models.CharField(
+        max_length=9, 
+        default='#0000FF80',  # Semi-transparent blue
+        help_text='Hex color for polygon fill (supports alpha: #RRGGBBAA)'
+    )
+    border_color = models.CharField(
+        max_length=9, 
+        default='#0000FF',  # Solid blue
+        help_text='Hex color for polygon border (supports alpha: #RRGGBBAA)'
+    )
+
     objects = GeoManager()
 
     def __str__(self):
@@ -613,8 +629,9 @@ class Tag(models.Model):
     location = models.MultiPolygonField(geography=True, null=True, blank=True)
 
     # DEPRECATED: Used in API/1; could be generated from API/2 data
+    # Note: removed related_name since it has no effect on symmetrical relationships
     relationships_old = models.ManyToManyField(
-        'self', symmetrical=True, related_name='related_to', blank=True)
+        'self', symmetrical=True, blank=True)
 
     @mark_safe
     def get_loc(self):