diff options
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/models.py | 14 | ||||
| -rw-r--r-- | expo/views_logbooks.py | 8 | ||||
| -rw-r--r-- | expo/views_other.py | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/expo/models.py b/expo/models.py index b8885ea..50140aa 100644 --- a/expo/models.py +++ b/expo/models.py @@ -19,6 +19,9 @@ class Expedition(models.Model): def __unicode__(self):
return self.year
+ class Meta:
+ ordering = ('year',)
+
def GuessDateFrom(self):
try:
return self.logbookentry_set.order_by('date')[0].date
@@ -71,12 +74,20 @@ class Person(models.Model): class Meta:
verbose_name_plural = "People"
+ class Meta:
+ ordering = ('last_name', 'first_name')
def __unicode__(self):
if self.last_name:
return "%s %s" % (self.first_name, self.last_name)
return self.first_name
+ # these ought to be possible by piping through |min in the template, or getting the first of an ordered list
+ def Firstexpedition(self):
+ return self.personexpedition_set.order_by('expedition')[0]
+ def Lastexpedition(self):
+ return self.personexpedition_set.order_by('-expedition')[0]
+
class PersonExpedition(models.Model):
expedition = models.ForeignKey(Expedition)
@@ -96,6 +107,9 @@ class PersonExpedition(models.Model): print res
return res
+ class Meta:
+ ordering = ('expedition',)
+
def GetPersonChronology(self):
res = { }
for persontrip in self.persontrip_set.all():
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py index 7d18ba1..72c44e8 100644 --- a/expo/views_logbooks.py +++ b/expo/views_logbooks.py @@ -10,7 +10,13 @@ import re def personindex(request):
persons = Person.objects.all()
- return render_to_response('personindex.html', {'persons': persons, 'settings': settings})
+
+ personss = [ ]
+ ncols = 5
+ nc = (len(persons) + ncols - 1) / ncols
+ for i in range(ncols):
+ personss.append(persons[i * nc: (i + 1) * nc])
+ return render_to_response('personindex.html', {'persons': persons, 'personss':personss, 'settings': settings})
def expedition(request, expeditionname):
year = int(expeditionname)
diff --git a/expo/views_other.py b/expo/views_other.py index 7d5d655..7c5fc92 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -28,7 +28,7 @@ def frontPage(request): message = "Reloaded survexblocks"
#'randSent':randSent.randomLogbookSentence(),
- expeditions = Expedition.objects.all()
+ expeditions = Expedition.objects.order_by("-year")
return render_to_response('index.html', {'expeditions':expeditions, 'settings':settings, "message":message})
def calendar(request,year):
|