xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Inherit *team to anonymous survex blocks

Browse Source
This commit is contained in:
Philip Sargent
2023-01-29 01:30:10 +00:00
parent 03fa5f5548
commit 071f68080c
2 changed files with 104 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/views/logbooks.py
View File

@@ -148,9 +148,7 @@ def person(request, first_name='', last_name='', ):
def get_person_chronology(personexpedition):
'''Horrible bug here when there is more than one survex block per day, it duplicates the entry but gets it wrong
Fortunately this is just the display on this page which is wroing, no bad calculations get into the database.
'''
This is just a nasty convoluted way of trying the make the template do more work than it is sensible to ask it to do.
Rewrite more simply with the login in the python, not in Django template language (you bastard Curtis).
'''
@@ -160,8 +158,9 @@ def get_person_chronology(personexpedition):
a.setdefault("persontrips", [ ]).append(persontrip)
for personrole in personexpedition.survexpersonrole_set.all():
a = res.setdefault(personrole.survexblock.date, { })
a.setdefault("personroles", [ ]).append(personrole.survexblock)
if personrole.survexblock.date: # avoid bad data from another bug
a = res.setdefault(personrole.survexblock.date, { })
a.setdefault("personroles", [ ]).append(personrole.survexblock)
# build up the tables
rdates = sorted(list(res.keys()))