diff --git a/people/forms.py b/people/forms.py index c82d0bf..44d7078 100644 --- a/people/forms.py +++ b/people/forms.py @@ -165,7 +165,6 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase): 'organisation_started_date', 'project_started_date', 'job_title', - 'external_organisations', 'latitude', 'longitude', ] @@ -180,18 +179,12 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase): labels = { 'project_started_date': f'Date started on the {settings.PARENT_PROJECT_NAME} project', - 'external_organisations': - (f'Please list the main organisations external to {settings.PARENT_PROJECT_NAME} ' - 'work that you have been working with since 1st January 2019 that are ' - 'involved in food/water security in African dryland regions'), } help_texts = { 'organisation_started_date': 'If you don\'t know the exact date, an approximate date is okay.', 'project_started_date': 'If you don\'t know the exact date, an approximate date is okay.', - 'external_organisations': - 'Please use commas to separate organisation names.', } question_model = models.PersonQuestion diff --git a/people/migrations/0047_remove_personanswerset_external_organisations.py b/people/migrations/0047_remove_personanswerset_external_organisations.py new file mode 100644 index 0000000..ce47535 --- /dev/null +++ b/people/migrations/0047_remove_personanswerset_external_organisations.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.10 on 2021-03-10 10:45 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('people', '0046_personanswerset_external_organisations'), + ] + + operations = [ + migrations.RemoveField( + model_name='personanswerset', + name='external_organisations', + ), + ] diff --git a/people/models/person.py b/people/models/person.py index cf78065..e683127 100644 --- a/people/models/person.py +++ b/people/models/person.py @@ -169,11 +169,6 @@ class PersonAnswerSet(AnswerSet): blank=True, null=False) - #: External organisations this person has worked with - external_organisations = models.CharField(max_length=1023, - blank=True, - null=False) - #: Latitude for displaying location on a map latitude = models.FloatField(blank=True, null=True) diff --git a/people/templates/people/person/includes/answer_set_full.html b/people/templates/people/person/includes/answer_set_full.html index accb48e..6b2c90d 100644 --- a/people/templates/people/person/includes/answer_set_full.html +++ b/people/templates/people/person/includes/answer_set_full.html @@ -31,10 +31,6 @@ Job Title{{ answer_set.job_title }} {% endif %} - {% if answer_set.external_organisations %} - External Organisations Worked With{{ answer_set.external_organisations }} - {% endif %} - {% for answer in answer_set.question_answers.all %} {{ answer.question }}