Merge pull request #130 from UCL-ARC/amanda/small-tweaks

small updates following async discussion

Author: acholyn

dashboard.py

@@ -86,6 +86,7 @@ def init_with_context(self, context):
                             "mod_app.models.support_models.OtherLink",
                             "mod_app.models.support_models.Tag",
                             "mod_app.models.feedback_model.Feedback",
+                            "mod_app.models.visual_written_influences_model.VisualWrittenInfluences",
                         ),
                     ),
                 ],

mod_app/admin/note_admin.py

@@ -3,7 +3,7 @@
 from django.utils.html import format_html
 
 
-from mod_app.models import ProjectNote, Feedback
+from mod_app.models import ProjectNote, Feedback, VisualWrittenInfluences
 
 
 @admin.register(ProjectNote)
@@ -40,3 +40,21 @@ def safe_content(self, obj):
 
     safe_content.allow_tags = True
     safe_content.short_description = "Content"
+
+
+@admin.register(VisualWrittenInfluences)
+class VWIAdmin(admin.ModelAdmin):
+    class Media:
+        js = ("admin/js/mentionsPluginConfig.js",)
+
+    search_fields = ["title"]
+    list_display = ["title", "safe_content"]
+    readonly_fields = ("bibliography",)
+
+    def safe_content(self, obj):
+        truncated_content = truncatechars_html(obj.content, 200)
+        modified_content = truncated_content.replace("{", "(").replace("}", ")")
+        return format_html(modified_content)
+
+    safe_content.allow_tags = True
+    safe_content.short_description = "Content"

mod_app/migrations/0026_alter_feedback_options_alter_projectnote_options.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.5 on 2024-11-11 11:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mod_app", "0025_increase_url_length_make_sources_m2m"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="feedback",
+            options={
+                "verbose_name": "Feedback on non-academic Activities",
+                "verbose_name_plural": "Feedbacks on non-academic Activities",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="projectnote",
+            options={"verbose_name": "Research Framework"},
+        ),
+    ]

mod_app/migrations/0027_film_bfi_identifier.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2024-11-11 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mod_app", "0026_alter_feedback_options_alter_projectnote_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="film",
+            name="bfi_identifier",
+            field=models.CharField(blank=True, max_length=7, null=True),
+        ),
+    ]

mod_app/migrations/0028_visualwritteninfluences.py

@@ -0,0 +1,54 @@
+# Generated by Django 4.2.5 on 2024-11-12 09:52
+
+import ckeditor_uploader.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mod_app", "0027_film_bfi_identifier"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="VisualWrittenInfluences",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=255)),
+                (
+                    "content",
+                    ckeditor_uploader.fields.RichTextUploadingField(
+                        blank=True, help_text="Mentions are available here.", null=True
+                    ),
+                ),
+                (
+                    "bibliography",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="This field updates on save, and some items may not be visible immediately",
+                        related_name="vwis",
+                        to="mod_app.bibliographyitem",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Visual and Written Influences",
+                "verbose_name_plural": "Visual and Written Influences",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="feedback",
+            options={
+                "verbose_name": "Feedback on non-academic Activities",
+                "verbose_name_plural": "Feedback on non-academic Activities",
+            },
+        ),
+    ]

mod_app/models/__init__.py

@@ -23,6 +23,7 @@
     Analysis,
     TeachingResources,
 )
+from .visual_written_influences_model import VisualWrittenInfluences
 
 __all__ = [
     "Analysis",
@@ -46,4 +47,5 @@
     "Video",
     "ProjectNote",
     "Feedback",
+    "VisualWrittenInfluences",
 ]

mod_app/models/feedback_model.py

@@ -7,7 +7,8 @@
 
 class Feedback(models.Model):
     class Meta:
-        verbose_name = "Feedback"
+        verbose_name = "Feedback on non-academic Activities"
+        verbose_name_plural = "Feedback on non-academic Activities"
 
     def __str__(self):
         return self.title

mod_app/models/film_model.py

@@ -72,6 +72,8 @@ def get_absolute_url(self):
         max_length=100, blank=True, null=True
     )  # can use choices if preset
 
+    bfi_identifier = models.CharField(max_length=7, blank=True, null=True)
+
     cast = models.TextField(
         blank=True,
         null=True,

mod_app/models/project_note_model.py

@@ -7,7 +7,7 @@
 
 class ProjectNote(models.Model):
     class Meta:
-        verbose_name = "Introduction"
+        verbose_name = "Research Framework"
 
     def __str__(self):
         return self.title

mod_app/models/visual_written_influences_model.py

@@ -0,0 +1,34 @@
+from ckeditor_uploader.fields import RichTextUploadingField
+from django.db import models
+
+from mod_app.models import BibliographyItem
+from ..utils.extract_citations import update_bibliography
+
+
+class VisualWrittenInfluences(models.Model):
+    class Meta:
+        verbose_name = "Visual and Written Influences"
+        verbose_name_plural = "Visual and Written Influences"
+
+    def __str__(self):
+        return self.title
+
+    title = models.CharField(max_length=255, null=False)
+
+    content = RichTextUploadingField(
+        null=True,
+        blank=True,
+        help_text="Mentions are available here.",
+    )
+
+    bibliography = models.ManyToManyField(
+        BibliographyItem,
+        blank=True,
+        related_name="vwis",
+        help_text="This field updates on save, and some items may not be visible immediately",
+    )
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+
+        update_bibliography(self, [self.content])

mod_app/templates/base.html

@@ -117,6 +117,8 @@ <h1 class="title__text--construction">{% trans "NOTICE: This site is currently u
 
                         Further information on the project and its activities can be found, for now, at:<a href=https://www.ucl.ac.uk/classics/research/research-projects/museum-dream-worlds> Museum of Dreamworlds at UCL</a>
                     </p>
+                    <p>If you'd like to get in touch, send us an email at <a href="mailto:[email protected]">[email protected]</a>
+                    </p>
                 </div>
             {% endif %}
         {% endblock %}