From b4296f1736a4ab464ef4bdc3662693b14a966443 Mon Sep 17 00:00:00 2001
From: Sam Wenham <sam@wenhams.co.uk>
Date: Sat, 9 Mar 2019 18:21:10 +0000
Subject: [PATCH] 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 | 8 +++++++-
core/views_logbooks.py | 1 -
parsers/logbooks.py | 2 +-
templates/personindex.html | 4 ++--
urls.py | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/core/models.py b/core/models.py
index 8cc91ea..1b2875a 100644
--- a/core/models.py
+++ b/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):
diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index 3ab55d6..0a90d7e 100644
--- a/core/views_logbooks.py
+++ b/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()]})
-
diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index 22674c6..ffd8e21 100644
--- a/parsers/logbooks.py
+++ b/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]
diff --git a/templates/personindex.html b/templates/personindex.html
index a6196a6..1f21b2b 100644
--- a/templates/personindex.html
+++ b/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>
diff --git a/urls.py b/urls.py
index 48eda7e..0dbd9a0 100644
--- a/urls.py
+++ b/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"),