me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 03:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move organisation latlng to answerset

Browse Source
This commit is contained in:
James Graham
2021-02-24 15:44:34 +00:00
parent c8a68d542a
commit 71e5352b6b
5 changed files with 121 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
people/models/person.py
View File

@@ -93,12 +93,6 @@ class Organisation(models.Model):
"""Organisation to which a :class:`Person` belongs."""
name = models.CharField(max_length=255, blank=False, null=False)
#: Latitude for displaying location on a map
latitude = models.FloatField(blank=True, null=True)
#: Longitude for displaying location on a map
longitude = models.FloatField(blank=True, null=True)
def __str__(self) -> str:
return self.name
@@ -119,6 +113,12 @@ class OrganisationAnswerSet(AnswerSet):
blank=False,
null=False)
#: Latitude for displaying location on a map
latitude = models.FloatField(blank=True, null=True)
#: Longitude for displaying location on a map
longitude = models.FloatField(blank=True, null=True)
#: Answers to :class:`OrganisationQuestion`s
question_answers = models.ManyToManyField(OrganisationQuestionChoice)
@@ -130,7 +130,7 @@ class OrganisationAnswerSet(AnswerSet):
"""Get the answers from this set as a dictionary for use in Form.initial."""
exclude_fields = {
'id',
'timestemp',
'timestamp',
'replaced_timestamp',
'organisation_id',
'question_answers',
@@ -298,7 +298,7 @@ class PersonAnswerSet(AnswerSet):
"""Get the answers from this set as a dictionary for use in Form.initial."""
exclude_fields = {
'id',
'timestemp',
'timestamp',
'replaced_timestamp',
'person_id',
'question_answers',