Fix people list

Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit

core/models.py

@@ -151,9 +151,15 @@ class Person(TroggleModel):
     
     def notability(self):
         notability = Decimal(0)
+        max_expo_val = 0
+
+        max_expo_year = Expedition.objects.all().aggregate(Max('year'))
+        max_expo_val = int(max_expo_year['year__max']) + 1
+
         for personexpedition in self.personexpedition_set.all():
              if not personexpedition.is_guest:
-                notability += Decimal(1) / (2012 - int(personexpedition.expedition.year))
+                print(personexpedition.expedition.year)
+                notability += Decimal(1) / (max_expo_val - int(personexpedition.expedition.year))
         return notability
 
     def bisnotable(self):

core/views_logbooks.py

@@ -267,4 +267,3 @@ def get_people(request, expeditionslug):
 def get_logbook_entries(request, expeditionslug):
     exp = Expedition.objects.get(year = expeditionslug)
     return render_with_context(request,'options.html', {"items": [(le.slug, "%s - %s" % (le.date, le.title)) for le in exp.logbookentry_set.all()]})
-    

parsers/logbooks.py

@@ -304,7 +304,7 @@ def LoadLogbookForExpedition(expedition):
             parsefunc = settings.DEFAULT_LOGBOOK_PARSER
         except (IOError):
             logbook_parseable = False
-            print("Couldn't open default logbook file and nothing set for expo " + expo.year)
+            print("Couldn't open default logbook file and nothing set for expo " + expedition.year)
 
     if logbook_parseable:
         parser = globals()[parsefunc]

templates/personindex.html

@@ -31,8 +31,8 @@
 <tr>
   <td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
   <td><a href="{{ person.first.get_absolute_url }}">{{person.first.expedition.year}}</a></td> 
-  <td><a href="{{ person.last.get_absolute_url }}">{{person.last.expedition.year}}</a></td> 
-  <td>{{ person.surveyedleglength }}</td>
+  <td><a href="{{ person.last.get_absolute_url }}">{{person.last.expedition.year}}</a></td>
+  <td></td>
 </tr>
 {% endfor %}
 </table>

urls.py

@@ -40,7 +40,7 @@ actualurlpatterns = patterns('',
     
     url(r'^expedition/(\d+)$',  views_logbooks.expedition,  name="expedition"),
     url(r'^expeditions/?$',  views_logbooks.ExpeditionListView.as_view(), name="expeditions"),
-    url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),
+    url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-zA-Z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),
     url(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', views_logbooks.logbookentry,name="logbookentry"),
     url(r'^newlogbookentry/(?P<expeditionyear>.*)$', views_logbooks.newLogbookEntry,     name="newLogBookEntry"),
     url(r'^editlogbookentry/(?P<expeditionyear>[^/]*)/(?P<pdate>[^/]*)/(?P<pslug>[^/]*)/$', views_logbooks.newLogbookEntry,     name="editLogBookEntry"),