From 19306b0e99ed8db8bbf6e6d32eeaac31d34eed8c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Dec 2024 15:36:29 +0000 Subject: [PATCH] Perspective videos for NME #1409 --- .../templates/dictionary/gloss_detail.html | 13 +++++++++++++ .../0014_glossvideonme_perspective.py | 18 ++++++++++++++++++ signbank/video/models.py | 11 +++++------ signbank/video/views.py | 1 + 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 signbank/video/migrations/0014_glossvideonme_perspective.py diff --git a/signbank/dictionary/templates/dictionary/gloss_detail.html b/signbank/dictionary/templates/dictionary/gloss_detail.html index 3b880c852..bf0a32e69 100755 --- a/signbank/dictionary/templates/dictionary/gloss_detail.html +++ b/signbank/dictionary/templates/dictionary/gloss_detail.html @@ -1826,10 +1826,13 @@

{% trans "Delete NME Video" %}

{% endfor %} {% endwith %} + Perspective {{videonme.perspective}} {% trans "Index" %} {{videonme.offset}} + + @@ -1882,6 +1885,16 @@

{% trans "Upload New NME Video" %}

{% endfor %} + + {% trans "Perspective" %} + + + +

diff --git a/signbank/video/migrations/0014_glossvideonme_perspective.py b/signbank/video/migrations/0014_glossvideonme_perspective.py new file mode 100644 index 000000000..4b891f398 --- /dev/null +++ b/signbank/video/migrations/0014_glossvideonme_perspective.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.17 on 2024-12-13 14:34 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('video', '0013_annotatedvideo_url'), + ] + + operations = [ + migrations.AddField( + model_name='glossvideonme', + name='perspective', + field=models.CharField(choices=[('left', 'Left'), ('right', 'Right')], default='center', max_length=20), + ), + ] diff --git a/signbank/video/models.py b/signbank/video/models.py index 6a2b330e1..e3e1be9c9 100755 --- a/signbank/video/models.py +++ b/signbank/video/models.py @@ -36,6 +36,10 @@ def get_two_letter_dir(idgloss): return foldername +PERSPECTIVE_CHOICES = (('left', 'Left'), + ('right', 'Right') + ) + class GlossVideoStorage(FileSystemStorage): """Implement our shadowing video storage system""" @@ -886,6 +890,7 @@ def __str__(self): class GlossVideoNME(GlossVideo): offset = models.IntegerField(default=1) + perspective = models.CharField(max_length=20, choices=PERSPECTIVE_CHOICES, default='center') class Meta: verbose_name = gettext("NME Gloss Video") @@ -975,12 +980,6 @@ def reversion(self, revert=False): self.delete_files() self.delete() - -PERSPECTIVE_CHOICES = (('left', 'Left'), - ('right', 'Right') - ) - - class GlossVideoPerspective(GlossVideo): perspective = models.CharField(max_length=20, choices=PERSPECTIVE_CHOICES) diff --git a/signbank/video/views.py b/signbank/video/views.py index ac604e571..dc436be28 100755 --- a/signbank/video/views.py +++ b/signbank/video/views.py @@ -69,6 +69,7 @@ def addvideo(request): form_value = form.cleaned_data[form_field] descriptions[language.language_code_2char] = form_value.strip() nmevideo.add_descriptions(descriptions) + nmevideo.perspective = form.cleaned_data['perspective'] #This is incorrect elif object_type == 'morpheme_video': morpheme = Morpheme.objects.filter(id=object_id).first() if not morpheme: