From f21cddb2d04bcdfbb8aa5e93501902460087dee0 Mon Sep 17 00:00:00 2001 From: goatchurch Date: Fri, 11 Sep 2009 09:04:59 +0100 Subject: modelviz added --- core/views_logbooks.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'core/views_logbooks.py') diff --git a/core/views_logbooks.py b/core/views_logbooks.py index 1ce158e..17c88fd 100644 --- a/core/views_logbooks.py +++ b/core/views_logbooks.py @@ -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]))) -- cgit v1.2.3