From b950ee70f77892463fac87fba2dd9d5ce964accf Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:35:29 +0100 Subject: [svn] Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM --- expo/models.py | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'expo/models.py') diff --git a/expo/models.py b/expo/models.py index e6ab637..26f6f91 100644 --- a/expo/models.py +++ b/expo/models.py @@ -19,12 +19,13 @@ class Expedition(models.Model): return self.year def ListDays(self): - dates=[] - date=self.start_date - while date <= self.end_date: - dates.append(date) - date+=datetime.timedelta(days=1) - return dates + if self.start_date and self.end_date: + res=[] + date=self.start_date + while date <= self.end_date: + res.append(date) + date+=datetime.timedelta(days=1) + return res def GetPersonExpedition(self, name): person_expeditions = PersonExpedition.objects.filter(expedition=self) @@ -67,6 +68,22 @@ class PersonExpedition(models.Model): res.append(self.nickname) return res + def ListDays(self): + if self.from_date and self.to_date: + res=[] + date=self.from_date + while date <= self.to_date: + res.append(date) + date+=datetime.timedelta(days=1) + return res + + def ListDaysTF(self): + if self.from_date and self.to_date: + res=[] + for date in self.expedition.ListDays(): + res.append(date in self.ListDays()) + return res + def __unicode__(self): return "%s: (%s)" % (self.person, self.expedition) -- cgit v1.2.3