[svn r8274] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things.

Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py
This commit is contained in:
aaron
2009-03-14 09:38:55 +01:00
parent a2057e63f5
commit 97c9772696
7 changed files with 42 additions and 36 deletions

View File

@@ -83,11 +83,11 @@ def LoadPersonsExpos():
person = models.Person(first_name=mname.group(1), last_name=(mname.group(2) or ""))
person.is_vfho = personline[header["VfHO member"]]
person.Sethref()
#person.Sethref()
#print "NNNN", person.href
is_guest = (personline[header["Guest"]] == "1") # this is really a per-expo catagory; not a permanent state
person.save()
#parseMugShotAndBlurb(personline=personline, header=header, person=person)
parseMugShotAndBlurb(personline=personline, header=header, person=person)
# make person expedition from table
for year, attended in zip(headers, personline)[5:]:
@@ -106,7 +106,7 @@ def LoadPersonsExpos():
persons = list(models.Person.objects.filter(first_name=firstname, last_name=lastname))
if not persons:
person = models.Person(first_name=firstname, last_name = lastname, is_vfho = False, mug_shot = "")
person.Sethref()
#person.Sethref()
person.save()
else:
person = persons[0]