mirror of
https://github.com/Southampton-RSG/breccia-mapper.git
synced 2026-03-03 11:27:09 +00:00
fix: undo previous change
This commit is contained in:
@@ -165,7 +165,6 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
|
|||||||
'organisation_started_date',
|
'organisation_started_date',
|
||||||
'project_started_date',
|
'project_started_date',
|
||||||
'job_title',
|
'job_title',
|
||||||
'external_organisations',
|
|
||||||
'latitude',
|
'latitude',
|
||||||
'longitude',
|
'longitude',
|
||||||
]
|
]
|
||||||
@@ -180,18 +179,12 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
|
|||||||
labels = {
|
labels = {
|
||||||
'project_started_date':
|
'project_started_date':
|
||||||
f'Date started on the {settings.PARENT_PROJECT_NAME} project',
|
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 = {
|
help_texts = {
|
||||||
'organisation_started_date':
|
'organisation_started_date':
|
||||||
'If you don\'t know the exact date, an approximate date is okay.',
|
'If you don\'t know the exact date, an approximate date is okay.',
|
||||||
'project_started_date':
|
'project_started_date':
|
||||||
'If you don\'t know the exact date, an approximate date is okay.',
|
'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
|
question_model = models.PersonQuestion
|
||||||
|
|||||||
@@ -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',
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -169,11 +169,6 @@ class PersonAnswerSet(AnswerSet):
|
|||||||
blank=True,
|
blank=True,
|
||||||
null=False)
|
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 for displaying location on a map
|
||||||
latitude = models.FloatField(blank=True, null=True)
|
latitude = models.FloatField(blank=True, null=True)
|
||||||
|
|
||||||
|
|||||||
@@ -31,10 +31,6 @@
|
|||||||
<tr><td>Job Title</td><td>{{ answer_set.job_title }}</td></tr>
|
<tr><td>Job Title</td><td>{{ answer_set.job_title }}</td></tr>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if answer_set.external_organisations %}
|
|
||||||
<tr><td>External Organisations Worked With</td><td>{{ answer_set.external_organisations }}</td></tr>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% for answer in answer_set.question_answers.all %}
|
{% for answer in answer_set.question_answers.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ answer.question }}</td>
|
<td>{{ answer.question }}</td>
|
||||||
|
|||||||
Reference in New Issue
Block a user