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

[svn]

Browse Source 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:35:29 +01:00
parent cda0a7a5e1
commit b950ee70f7
3 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
expo/admin.py
View File

@@ -18,6 +18,12 @@ class SurveyAdmin(admin.ModelAdmin):
class LogbookEntryAdmin(admin.ModelAdmin):
search_fields = ('title',)
class PersonAdmin(admin.ModelAdmin):
search_fields = ('first_name','last_name')
class PersonExpeditionAdmin(admin.ModelAdmin):
search_fields = ('person__first_name',)
admin.site.register(Photo)
admin.site.register(Cave)
admin.site.register(Area)
@@ -27,9 +33,9 @@ admin.site.register(SurveyStation)
admin.site.register(Entrance)
admin.site.register(SurvexBlock, SurvexBlockAdmin)
admin.site.register(Expedition)
admin.site.register(Person)
admin.site.register(Person,PersonAdmin)
admin.site.register(PersonRole)
admin.site.register(PersonExpedition)
admin.site.register(PersonExpedition,PersonExpeditionAdmin)
admin.site.register(Role)
admin.site.register(LogbookEntry, LogbookEntryAdmin)
admin.site.register(PersonTrip)

29
expo/models.py
View File

@@ -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)