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

modelviz added

Browse Source
This commit is contained in:
goatchurch
2009-09-11 09:04:59 +01:00
parent 735b729a41
commit f21cddb2d0
9 changed files with 248 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/views_logbooks.py
View File

@@ -78,15 +78,9 @@ def GetPersonChronology(personexpedition):
a = res.setdefault(persontrip.date, { })
a.setdefault("persontrips", [ ]).append(persontrip)
for personrole in personexpedition.personrole_set.all():
for personrole in personexpedition.survexpersonrole_set.all():
a = res.setdefault(personrole.survexblock.date, { })
b = a.setdefault("personroles", { })
survexpath = personrole.survexblock.survexpath
if b.get(survexpath):
b[survexpath] += ", " + str(personrole.nrole)
else:
b[survexpath] = str(personrole.nrole)
a.setdefault("personroles", [ ]).append(personrole.survexblock)
# build up the tables
rdates = res.keys()
@@ -96,7 +90,7 @@ def GetPersonChronology(personexpedition):
res2 = [ ]
for rdate in rdates:
persontrips = res[rdate].get("persontrips", [])
personroles = list(res[rdate].get("personroles", {}).items())
personroles = res[rdate].get("personroles", [])
for n in range(max(len(persontrips), len(personroles))):
res2.append(((n == 0 and rdate or "--"), (n < len(persontrips) and persontrips[n]), (n < len(personroles) and personroles[n])))