From ed993761a17841bb9295b5a468c9c5716ba4ffb2 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Thu, 5 Oct 2023 14:45:46 +0300
Subject: [PATCH] clean up small errors and debugging

---
 core/models/caves.py   | 2 +-
 core/models/wallets.py | 7 ++++---
 core/views/scans.py    | 4 ++--
 parsers/people.py      | 8 ++++----
 templates/aliases.html | 5 +++++
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/models/caves.py b/core/models/caves.py
index 3e2511b..624239d 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -629,7 +629,7 @@ def GetCaveLookup():
         ("bs30", "1623-190"),
         ("2011-01", "1623-190"),
         ("2002-x11", "1623-2005-08"),
-        ("2002-x12", "1623-2005-07"),
+        ("2002-x12", "2005-07"),
         ("2002-x13", "1623-2005-06"),
         ("2002-x14", "2005-05"),
         ("kh", "1623-161"),
diff --git a/core/models/wallets.py b/core/models/wallets.py
index dd8567d..bae919a 100644
--- a/core/models/wallets.py
+++ b/core/models/wallets.py
@@ -134,9 +134,10 @@ class Wallet(models.Model):
                         self.save()
                         waldata["date"] = thisdate.isoformat()
                     else:
-                        message = f"! {str(self.walletname)} Date format not ISO {waldata['date']}. Failed to load from {jsonfile} JSON file"
-                        from troggle.core.models.troggle import DataIssue
-                        DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl)
+                        if waldata["date"] != "" or waldata["date"] != "None":
+                            message = f"! {str(self.walletname)} Date format not ISO {waldata['date']}. Failed to load from {jsonfile} JSON file"
+                            from troggle.core.models.troggle import DataIssue
+                            DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl)
         return waldata
 
     def year(self):
diff --git a/core/views/scans.py b/core/views/scans.py
index 6efcce1..c7295a9 100644
--- a/core/views/scans.py
+++ b/core/views/scans.py
@@ -189,10 +189,10 @@ def parse_name_list(w):
             peeps.add(crew[n.lower()].person)
         else:
             if n.startswith("*"): #ignore people flagged as guests or not-expo anyway, such as ARGE
-                pass
+                continue
             nobod = n.lower()
             if nobod == "unknown" or nobod == "nobody" or nobod == " " or nobod == "":
-                pass
+                continue
             else:
                 wurl = f"/walletedit/{w.walletname.replace('#',':')}"
                 message = f"{w} name '{n.lower()}' NOT found in GetPersonExpeditionNameLookup({w.year()}) ?!"
diff --git a/parsers/people.py b/parsers/people.py
index 8cbe630..97793a6 100644
--- a/parsers/people.py
+++ b/parsers/people.py
@@ -265,10 +265,10 @@ def GetPersonExpeditionNameLookup(expedition):
     dellist = []
     for personexpedition in personexpeditions:
         possnames = []
-        f = unidecode(unescape(personexpedition.person.first_name.lower()))
-        l = unidecode(unescape(personexpedition.person.last_name.lower()))
-        full = unidecode(unescape(personexpedition.person.fullname.lower()))
-        n = unidecode(unescape(personexpedition.person.nickname.lower()))
+        f = unidecode(unescape(personexpedition.person.first_name.lower().strip()))
+        l = unidecode(unescape(personexpedition.person.last_name.lower().strip()))
+        full = unidecode(unescape(personexpedition.person.fullname.lower().strip()))
+        n = unidecode(unescape(personexpedition.person.nickname.lower().strip()))
         if full not in possnames:
             possnames.append(full)
         if n not in possnames:
diff --git a/templates/aliases.html b/templates/aliases.html
index 3ff6592..b50503e 100644
--- a/templates/aliases.html
+++ b/templates/aliases.html
@@ -11,6 +11,11 @@ This ridiculously long list of alternatives is derived from what people have act
 On a year with more than one Sophie, an additional disambiguation is required, such as a surnbame or the first letter of the surname.
 In the case of a year with two people called Ben, both of whose surnames begin with W (yes this has happened),
 the entire surname is required.
+<style>
+td {
+  font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
+}
+</style>
 <table>
 <tr><th>alias</th><th>who</th></tr>
 {% for key, value  in aliasdict.items %}