From 05c5e26e9991fb3e753759c50bc1f29e3592704e Mon Sep 17 00:00:00 2001
From: Sam Wenham <sam@wenhams.co.uk>
Date: Tue, 2 Apr 2019 02:04:38 +0100
Subject: [PATCH] Sort people by notability Better errors and tidy Nicer date
 formats

---
 parsers/logbooks.py         | 2 +-
 parsers/surveys.py          | 3 ---
 templates/expedition.html   | 2 +-
 templates/logbookentry.html | 4 ++--
 templates/personindex.html  | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index cecbdb3..2d1875a 100644
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -78,7 +78,7 @@ def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_
     """ saves a logbook entry and related persontrips """
     trippersons, author = GetTripPersons(trippeople, expedition, logtime_underground)
     if not author:
-        print("   - Skipping logentry: " + title + " no author for entry")
+        print("   - Skipping logentry: " + title + " - no author for entry")
         return
 
     #tripCave = GetTripCave(place)
diff --git a/parsers/surveys.py b/parsers/surveys.py
index 29070e8..efab536 100644
--- a/parsers/surveys.py
+++ b/parsers/surveys.py
@@ -174,9 +174,6 @@ def GetListDir(sdir):
                 ff = os.path.join(sdir, f)
                 res.append((f, ff, os.path.isdir(ff)))
     return res
-        
-        
-        
 
 
 def LoadListScansFile(survexscansfolder):
diff --git a/templates/expedition.html b/templates/expedition.html
index 7c0ecd5..0b0d360 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -69,7 +69,7 @@ an "S" for a survey trip.  The colours are the same for people on the same trip.
 {% regroup dateditems|dictsort:"date" by date as dates %}
 {% for date in dates %}
 <tr>
-<td>{{date.grouper}}</td>
+<td>{{date.grouper|date:"D d M Y"}}</td>
 <td>{% for item in date.list %}
         {% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
     {% endfor %}</td>
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 0534de9..5c8c341 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -7,7 +7,7 @@
 
 {% block related %}{% endblock %}
 {% block nav %}{% endblock %}
-<h2>{{logbookentry.title}}</h2>
+<h2>{{logbookentry.title|safe}}</h2>
 
 <div id="related">
 <p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>
@@ -66,7 +66,7 @@
 
 <div id="col1">
   <div class="logbookentry">
-    <b>{{logbookentry.date}}</b>
+    <b>{{logbookentry.date|date:"D d M Y"}}</b>
     {% if logbookentry.entry_type == "html" %}
       <p>{{logbookentry.text|safe}}</p>
     {% else %}
diff --git a/templates/personindex.html b/templates/personindex.html
index 1f21b2b..56e97d9 100644
--- a/templates/personindex.html
+++ b/templates/personindex.html
@@ -8,12 +8,12 @@
 <h2>Notable expoers</h2>
 <table class="searchable">
 <tr><th>Person</th><th>First</th><th>Last</th><th>Notability</th></tr>
-{% for person in notablepersons %}
+{% for person in notablepersons|dictsortreversed:"notability" %}
 <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.notability}}</td>
+  <td>{{person.notability|floatformat:2}}</td>
 </tr>
 {% endfor %}
 </table>