From 255d9e266f05d915c68cb2530f2c9e14ddc3851b Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 30 Jun 2021 17:00:12 +0200 Subject: [PATCH] change "attribute" to "recruitment attribute" in UI --- .../execution/templates/execution/participation_detail.html | 2 +- castellum/execution/templates/execution/study_base.html | 2 +- .../recruitment/management/commands/attribute_export.py | 2 +- .../recruitment/templates/recruitment/attributes_form.html | 2 +- castellum/recruitment/templates/recruitment/contact.html | 4 ++-- .../studies/migrations/0026_study_exportable_attributes.py | 2 +- castellum/studies/models.py | 2 +- castellum/studies/templates/studies/filtergroup.html | 2 +- castellum/subjects/migrations/0022_verbose_names.py | 2 +- castellum/subjects/models.py | 2 +- .../subjects/templates/subjects/maintenance_attributes.html | 6 +++--- castellum/subjects/templates/subjects/maintenance_base.html | 2 +- castellum/subjects/templates/subjects/subject_base.html | 2 +- castellum/subjects/templates/subjects/subject_detail.html | 2 +- castellum/subjects/templates/subjects/subject_search.html | 2 +- ...amic_attributes.md => dynamic_recruitment_attributes.md} | 6 +++--- 16 files changed, 21 insertions(+), 21 deletions(-) rename docs/{dynamic_attributes.md => dynamic_recruitment_attributes.md} (93%) diff --git a/castellum/execution/templates/execution/participation_detail.html b/castellum/execution/templates/execution/participation_detail.html index 0253f753a..674d2a4f2 100644 --- a/castellum/execution/templates/execution/participation_detail.html +++ b/castellum/execution/templates/execution/participation_detail.html @@ -30,7 +30,7 @@ {% endif %} {% translate 'Edit contact data' %} - {% translate 'Edit attributes' %} + {% translate 'Edit recruitment attributes' %} {% if subject.consent.document.is_deprecated or subject.has_consent_from_before_full_age %} {% icon 'exclamation-triangle' label=_('Missing values') %} diff --git a/castellum/execution/templates/execution/study_base.html b/castellum/execution/templates/execution/study_base.html index cfc6fffa8..584127e2f 100644 --- a/castellum/execution/templates/execution/study_base.html +++ b/castellum/execution/templates/execution/study_base.html @@ -8,7 +8,7 @@

{{ study }}

- {% trans 'Export attributes' %} + {% trans 'Export recruitment attributes' %} {% if study.consent %} {% translate 'Consent document' %} {% endif %} diff --git a/castellum/recruitment/management/commands/attribute_export.py b/castellum/recruitment/management/commands/attribute_export.py index 1ed9cc705..541831cbf 100644 --- a/castellum/recruitment/management/commands/attribute_export.py +++ b/castellum/recruitment/management/commands/attribute_export.py @@ -28,7 +28,7 @@ from castellum.subjects.models import Subject class Command(BaseCommand): - help = 'Export attributes for a single subject or the attribute schema.' + help = 'Export recruitment attributes for a single subject or the attribute schema.' def add_arguments(self, parser): parser.add_argument('subject_id', type=int, nargs='?') diff --git a/castellum/recruitment/templates/recruitment/attributes_form.html b/castellum/recruitment/templates/recruitment/attributes_form.html index 42d10693d..695430ca2 100644 --- a/castellum/recruitment/templates/recruitment/attributes_form.html +++ b/castellum/recruitment/templates/recruitment/attributes_form.html @@ -1,7 +1,7 @@ {% extends base_template|default:"recruitment/base.html" %} {% load static i18n bootstrap4 %} -{% block title %}{% translate "Edit attributes" %} · {{ block.super }}{% endblock %} +{% block title %}{% translate "Edit recruitment attributes" %} · {{ block.super }}{% endblock %} {% block content %}
diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html index a5b190fc7..affc14fdc 100644 --- a/castellum/recruitment/templates/recruitment/contact.html +++ b/castellum/recruitment/templates/recruitment/contact.html @@ -28,7 +28,7 @@ {% else %} {% if object.match == 'incomplete' %} {% endif %} {% if subject.contact.has_guardian and study.geo_filter %} @@ -82,7 +82,7 @@ {% endif %} {% translate 'Edit contact data' %} - {% translate 'Edit attributes' %} + {% translate 'Edit recruitment attributes' %} {% if subject.consent.document.is_deprecated or subject.has_consent_from_before_full_age %} {% icon 'exclamation-triangle' label=_('Missing values') %} diff --git a/castellum/studies/migrations/0026_study_exportable_attributes.py b/castellum/studies/migrations/0026_study_exportable_attributes.py index 6cf881478..844eae23d 100644 --- a/castellum/studies/migrations/0026_study_exportable_attributes.py +++ b/castellum/studies/migrations/0026_study_exportable_attributes.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='study', name='exportable_attributes', - field=models.ManyToManyField(blank=True, limit_choices_to={'privacy_level_read': 0}, related_name='_study_exportable_attributes_+', to='recruitment.AttributeDescription', verbose_name='Exportable attributes'), + field=models.ManyToManyField(blank=True, limit_choices_to={'privacy_level_read': 0}, related_name='_study_exportable_attributes_+', to='recruitment.AttributeDescription', verbose_name='Exportable recruitment attributes'), ), ] diff --git a/castellum/studies/models.py b/castellum/studies/models.py index 3acc1ce20..e9d31b8a4 100644 --- a/castellum/studies/models.py +++ b/castellum/studies/models.py @@ -195,7 +195,7 @@ class Study(models.Model): exportable_attributes = models.ManyToManyField( 'recruitment.AttributeDescription', - verbose_name=_('Exportable attributes'), + verbose_name=_('Exportable recruitment attributes'), related_name='+', blank=True, limit_choices_to={'privacy_level_read': 0}, diff --git a/castellum/studies/templates/studies/filtergroup.html b/castellum/studies/templates/studies/filtergroup.html index 95dc291d8..d355b8a53 100644 --- a/castellum/studies/templates/studies/filtergroup.html +++ b/castellum/studies/templates/studies/filtergroup.html @@ -10,7 +10,7 @@ {% if inaccessible %} {% endif %} diff --git a/castellum/subjects/migrations/0022_verbose_names.py b/castellum/subjects/migrations/0022_verbose_names.py index 2f91b7be3..a29419360 100644 --- a/castellum/subjects/migrations/0022_verbose_names.py +++ b/castellum/subjects/migrations/0022_verbose_names.py @@ -24,6 +24,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='subject', name='attributes', - field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Attributes'), + field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Recruitment attributes'), ), ] diff --git a/castellum/subjects/models.py b/castellum/subjects/models.py index 80727c95c..ef09b9942 100644 --- a/castellum/subjects/models.py +++ b/castellum/subjects/models.py @@ -59,7 +59,7 @@ class SubjectQuerySet(models.QuerySet): class Subject(TimeStampedModel): slug = models.CharField(_('Slug'), max_length=64, default=uuid_str, unique=True) - attributes = models.JSONField(_('Attributes'), encoder=DjangoJSONEncoder) + attributes = models.JSONField(_('Recruitment attributes'), encoder=DjangoJSONEncoder) onetime_invitation_disinterest = models.BooleanField( _('Does not want to participate in one time invitations'), default=False, diff --git a/castellum/subjects/templates/subjects/maintenance_attributes.html b/castellum/subjects/templates/subjects/maintenance_attributes.html index 6bc3929a5..34f1d78c0 100644 --- a/castellum/subjects/templates/subjects/maintenance_attributes.html +++ b/castellum/subjects/templates/subjects/maintenance_attributes.html @@ -1,10 +1,10 @@ {% extends "subjects/maintenance_base.html" %} {% load i18n bootstrap4 auth %} -{% block title %}{% translate "Attributes" %} · {{ block.super }}{% endblock %} +{% block title %}{% translate "Recruitment attributes" %} · {{ block.super }}{% endblock %} {% block content %} -

{% translate 'The following subjects have incomplete attributes:' %}

+

{% translate 'The following subjects have incomplete recruitment attributes:' %}