diff --git a/backend/core/models.py b/backend/core/models.py index b1b9959a..11093af8 100644 --- a/backend/core/models.py +++ b/backend/core/models.py @@ -121,6 +121,7 @@ class Meta: class SourceMention(models.TextChoices): DIRECT = "direct", "directly mentioned" IMPLIED = "implied", "implied" + UP_FOR_DEBATE = "up_for_debate", "up for debate" class EntityDescription(Named, models.Model): diff --git a/backend/event/migrations/0028_alter_episode_source_mention_and_more.py b/backend/event/migrations/0028_alter_episode_source_mention_and_more.py new file mode 100644 index 00000000..c015f771 --- /dev/null +++ b/backend/event/migrations/0028_alter_episode_source_mention_and_more.py @@ -0,0 +1,38 @@ +# Generated by Django 4.2.7 on 2024-10-23 12:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('event', '0027_alter_episode_agents_alter_episode_gifts_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='episode', + name='source_mention', + field=models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], help_text='How is this entity presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='episodeagent', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='episodegift', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='episodeletter', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='episodespace', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + ] diff --git a/backend/letter/migrations/0021_alter_giftdescription_source_mention_and_more.py b/backend/letter/migrations/0021_alter_giftdescription_source_mention_and_more.py new file mode 100644 index 00000000..45206f06 --- /dev/null +++ b/backend/letter/migrations/0021_alter_giftdescription_source_mention_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 4.2.7 on 2024-10-23 12:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('letter', '0020_remove_giftdescription_designators_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='giftdescription', + name='source_mention', + field=models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], help_text='How is this entity presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='giftdescriptioncategory', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='letterdescription', + name='source_mention', + field=models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], help_text='How is this entity presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='letterdescriptioncategory', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + ] diff --git a/backend/person/migrations/0024_alter_agentdescription_source_mention_and_more.py b/backend/person/migrations/0024_alter_agentdescription_source_mention_and_more.py new file mode 100644 index 00000000..6175bf23 --- /dev/null +++ b/backend/person/migrations/0024_alter_agentdescription_source_mention_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.7 on 2024-10-23 12:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('person', '0023_remove_agentdescription_designators'), + ] + + operations = [ + migrations.AlterField( + model_name='agentdescription', + name='source_mention', + field=models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], help_text='How is this entity presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='agentdescriptiongender', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='agentdescriptionlocation', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + ] diff --git a/backend/space/migrations/0021_alter_regionfield_source_mention_and_more.py b/backend/space/migrations/0021_alter_regionfield_source_mention_and_more.py new file mode 100644 index 00000000..295a1930 --- /dev/null +++ b/backend/space/migrations/0021_alter_regionfield_source_mention_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 4.2.7 on 2024-10-23 12:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('space', '0020_remove_spacedescription_designators'), + ] + + operations = [ + migrations.AlterField( + model_name='regionfield', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='settlementfield', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='spacedescription', + name='source_mention', + field=models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], help_text='How is this entity presented in the text?', max_length=32), + ), + migrations.AlterField( + model_name='structurefield', + name='source_mention', + field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied'), ('up_for_debate', 'up for debate')], default='direct', help_text='How is this information presented in the text?', max_length=32), + ), + ] diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts index e210f4d7..ed149043 100644 --- a/frontend/generated/graphql.ts +++ b/frontend/generated/graphql.ts @@ -296,7 +296,9 @@ export enum EventEpisodeSourceMentionChoices { /** directly mentioned */ Direct = 'DIRECT', /** implied */ - Implied = 'IMPLIED' + Implied = 'IMPLIED', + /** up for debate */ + UpForDebate = 'UP_FOR_DEBATE' } /** An enumeration. */ @@ -419,7 +421,9 @@ export enum LetterGiftDescriptionSourceMentionChoices { /** directly mentioned */ Direct = 'DIRECT', /** implied */ - Implied = 'IMPLIED' + Implied = 'IMPLIED', + /** up for debate */ + UpForDebate = 'UP_FOR_DEBATE' } /** An enumeration. */ @@ -427,7 +431,9 @@ export enum LetterLetterDescriptionSourceMentionChoices { /** directly mentioned */ Direct = 'DIRECT', /** implied */ - Implied = 'IMPLIED' + Implied = 'IMPLIED', + /** up for debate */ + UpForDebate = 'UP_FOR_DEBATE' } /** A simple wrapper around Graphene-Django's ErrorType with a constructor. */ @@ -580,7 +586,9 @@ export enum PersonAgentDescriptionSourceMentionChoices { /** directly mentioned */ Direct = 'DIRECT', /** implied */ - Implied = 'IMPLIED' + Implied = 'IMPLIED', + /** up for debate */ + UpForDebate = 'UP_FOR_DEBATE' } export type PersonDateOfBirthType = { @@ -784,7 +792,8 @@ export type SourceContentsDateType = { /** An enumeration. */ export enum SourceMention { Direct = 'DIRECT', - Implied = 'IMPLIED' + Implied = 'IMPLIED', + UpForDebate = 'UP_FOR_DEBATE' } export type SourceType = { @@ -865,7 +874,9 @@ export enum SpaceSpaceDescriptionSourceMentionChoices { /** directly mentioned */ Direct = 'DIRECT', /** implied */ - Implied = 'IMPLIED' + Implied = 'IMPLIED', + /** up for debate */ + UpForDebate = 'UP_FOR_DEBATE' } /** An enumeration. */ diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql index 49f128b0..ff9dea8d 100644 --- a/frontend/generated/schema.graphql +++ b/frontend/generated/schema.graphql @@ -276,6 +276,9 @@ enum EventEpisodeSourceMentionChoices { """implied""" IMPLIED + + """up for debate""" + UP_FOR_DEBATE } """An enumeration.""" @@ -406,6 +409,9 @@ enum LetterGiftDescriptionSourceMentionChoices { """implied""" IMPLIED + + """up for debate""" + UP_FOR_DEBATE } """An enumeration.""" @@ -415,6 +421,9 @@ enum LetterLetterDescriptionSourceMentionChoices { """implied""" IMPLIED + + """up for debate""" + UP_FOR_DEBATE } """ @@ -457,6 +466,9 @@ enum PersonAgentDescriptionSourceMentionChoices { """implied""" IMPLIED + + """up for debate""" + UP_FOR_DEBATE } type PersonDateOfBirthType { @@ -613,6 +625,7 @@ type SourceContentsDateType { enum SourceMention { DIRECT IMPLIED + UP_FOR_DEBATE } type SourceType { @@ -709,6 +722,9 @@ enum SpaceSpaceDescriptionSourceMentionChoices { """implied""" IMPLIED + + """up for debate""" + UP_FOR_DEBATE } """An enumeration.""" diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html index 369cbab3..1a6b4fce 100644 --- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html +++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html @@ -13,6 +13,8 @@ Designators

What (latin) terminology is used to describe the actions in the passage? + List key nouns and verbs in nominative or infinitive form (e.g. epistula, + missus, dirigere).

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html index 571f84fe..f215e962 100644 --- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html +++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html @@ -32,6 +32,8 @@

Designators

What terminology is used in the episode to refer to this {{entityName}}? + Only include terms that are unusual, or significantly add to the + understanding of the episode.

diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts index 1c6fb014..12218e26 100644 --- a/frontend/src/app/data-entry/shared/utils.ts +++ b/frontend/src/app/data-entry/shared/utils.ts @@ -4,7 +4,8 @@ import { BehaviorSubject } from "rxjs"; export const sourceMentionSelectOptions = (): SelectOptions => [ { value: SourceMention.Direct, label: 'Directly mentioned' }, - { value: SourceMention.Implied, label: 'Implied' } + { value: SourceMention.Implied, label: 'Implied' }, + { value: SourceMention.UpForDebate, label: 'Up for debate' }, ]; export const formStatusSubject = () => new BehaviorSubject('idle');