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: views to handled ended relationships

Browse Source 
Add ending of organisation relationships
This commit is contained in:
James Graham
2021-03-19 12:41:36 +00:00
parent 42d95beb5a
commit 74fffb0cac
8 changed files with 156 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
people/models/relationship.py
View File

@@ -61,9 +61,14 @@ class Relationship(models.Model):
@property
def current_answers(self) -> typing.Optional['RelationshipAnswerSet']:
answer_set = self.answer_sets.latest()
if answer_set.is_current:
return answer_set
try:
answer_set = self.answer_sets.latest()
if answer_set.is_current:
return answer_set
except RelationshipAnswerSet.DoesNotExist:
# No AnswerSet created yet
pass
return None
@@ -145,9 +150,14 @@ class OrganisationRelationship(models.Model):
@property
def current_answers(self) -> typing.Optional['OrganisationRelationshipAnswerSet']:
answer_set = self.answer_sets.latest()
if answer_set.is_current:
return answer_set
try:
answer_set = self.answer_sets.latest()
if answer_set.is_current:
return answer_set
except OrganisationRelationshipAnswerSet.DoesNotExist:
# No AnswerSet created yet
pass
return None