Merge pull request #150 from UCL-ARC/sm-feature/buttons-fields

Adding new fields

Author: acholyn

mod_app/admin/film_admin.py

@@ -6,12 +6,14 @@
 import html
 
 from mod_app.admin.link_admin import (
+    CardImageInline,
     DrawingInline,
     OtherLinkInline,
     PostcardInline,
     PosterInline,
     PressBookInline,
     ProgrammeInline,
+    PublicVisualInfluenceInline,
     PublicityInline,
     ScriptInline,
     SourceInline,
@@ -85,6 +87,8 @@ class Media:
         PostcardInline,
         PosterInline,
         DrawingInline,
+        CardImageInline,
+        PublicVisualInfluenceInline,
     ]
     list_display = [
         "title",
@@ -174,6 +178,7 @@ def preview_video(self, obj):
         ),
         (None, {"classes": ("placeholder Source_film-group",), "fields": ()}),
         (None, {"classes": ("placeholder videos-group",), "fields": ()}),
+        (None, {"classes": ("placeholder cardimages-group",), "fields": ()}),
         (
             "Technical Section",
             {
@@ -216,6 +221,10 @@ def preview_video(self, obj):
             "Visual & Written Influences",
             {"fields": []},
         ),
+        (
+            None,
+            {"classes": ("placeholder publicvisualinfluences-group",), "fields": ()},
+        ),
         (
             None,
             {

mod_app/admin/link_admin.py

@@ -106,6 +106,30 @@ class DrawingInline(PreviewMixin, s3BrowserButtonMixin, admin.TabularInline):
     ]
 
 
+class CardImageInline(PreviewMixin, s3BrowserButtonMixin, admin.TabularInline):
+    model = CardImage
+    extra = 1
+    max_num = 1
+    classes = [
+        "inline-inline",
+        "grp-collapse",
+        "grp-closed",
+    ]
+    verbose_name_plural = "Card Image"
+
+
+class PublicVisualInfluenceInline(
+    PreviewMixin, s3BrowserButtonMixin, admin.TabularInline
+):
+    model = PublicVisualInfluence
+    extra = 1
+    classes = [
+        "inline-inline",
+        "grp-collapse",
+        "grp-closed",
+    ]
+
+
 class OtherLinkInline(PreviewMixin, admin.TabularInline):
     model = OtherLink
     extra = 1
@@ -189,6 +213,18 @@ class DrawingAdmin(PreviewMixin, s3BrowserButtonMixin, admin.ModelAdmin):
     list_display = ["description", "film", "file", "url", "preview"]
 
 
+@admin.register(CardImage)
+class CardImageAdmin(PreviewMixin, s3BrowserButtonMixin, admin.ModelAdmin):
+    search_fields = ["description", "url"]
+    list_display = ["description", "film", "file", "url", "preview"]
+
+
+@admin.register(PublicVisualInfluence)
+class PublicVisualInfluenceAdmin(PreviewMixin, s3BrowserButtonMixin, admin.ModelAdmin):
+    search_fields = ["description", "url"]
+    list_display = ["description", "film", "file", "url", "preview"]
+
+
 @admin.register(Tag)
 class TagAdmin(admin.ModelAdmin):
     search_fields = ["name"]

mod_app/migrations/0032_publicvisualinfluence_cardimage.py

@@ -0,0 +1,116 @@
+# Generated by Django 4.2.5 on 2025-03-03 15:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+import mod_app.models.support_models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mod_app", "0031_splitting_vwis"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PublicVisualInfluence",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "url",
+                    models.URLField(
+                        blank=True,
+                        help_text="url to the item you'd like to link",
+                        max_length=500,
+                    ),
+                ),
+                (
+                    "description",
+                    models.CharField(
+                        help_text="short description, required", max_length=250
+                    ),
+                ),
+                (
+                    "file",
+                    models.FileField(
+                        blank=True,
+                        null=True,
+                        upload_to=mod_app.models.support_models.FileLink.upload_to,
+                        validators=[
+                            mod_app.models.support_models.FileLink.validate_max_size
+                        ],
+                    ),
+                ),
+                (
+                    "film",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)ss",
+                        to="mod_app.film",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Public Visual Influence",
+            },
+        ),
+        migrations.CreateModel(
+            name="CardImage",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "url",
+                    models.URLField(
+                        blank=True,
+                        help_text="url to the item you'd like to link",
+                        max_length=500,
+                    ),
+                ),
+                (
+                    "description",
+                    models.CharField(
+                        help_text="short description, required", max_length=250
+                    ),
+                ),
+                (
+                    "file",
+                    models.FileField(
+                        blank=True,
+                        null=True,
+                        upload_to=mod_app.models.support_models.FileLink.upload_to,
+                        validators=[
+                            mod_app.models.support_models.FileLink.validate_max_size
+                        ],
+                    ),
+                ),
+                (
+                    "film",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="%(class)ss",
+                        to="mod_app.film",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Card Image",
+            },
+        ),
+    ]

mod_app/models/__init__.py

@@ -18,6 +18,8 @@
     Drawing,
     OtherLink,
     Video,
+    CardImage,
+    PublicVisualInfluence,
 )
 from .teaching_analysis_models import (
     Analysis,
@@ -49,4 +51,6 @@
     "Feedback",
     "VisualInfluences",
     "WrittenInfluences",
+    "CardImage",
+    "PublicVisualInfluence",
 ]

mod_app/models/support_models.py

@@ -118,6 +118,16 @@ class Meta:
         verbose_name = "Drawing"
 
 
+class CardImage(FileLink):
+    class Meta:
+        verbose_name = "Card Image"
+
+
+class PublicVisualInfluence(FileLink):
+    class Meta:
+        verbose_name = "Public Visual Influence"
+
+
 class Location(models.Model):
     def __str__(self):
         return f"{self.address}"

mod_app/static/admin/css/custom.css

@@ -11,3 +11,13 @@ th.column-safe_alt_titles,
 .field-safe_alt_titles {
   max-width: 10rem;
 }
+
+a.grp-change-related[title="Change selected analysis"] {
+  width: 8rem;
+  padding-left: 2rem;
+  &::before {
+    content: "Edit Analysis";
+    position: absolute;
+    top: 15%;
+  }
+}