mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-22 07:11:52 +00:00
clean up small errors and debugging
This commit is contained in:
parent
fcfa59cdf7
commit
ed993761a1
@ -629,7 +629,7 @@ def GetCaveLookup():
|
|||||||
("bs30", "1623-190"),
|
("bs30", "1623-190"),
|
||||||
("2011-01", "1623-190"),
|
("2011-01", "1623-190"),
|
||||||
("2002-x11", "1623-2005-08"),
|
("2002-x11", "1623-2005-08"),
|
||||||
("2002-x12", "1623-2005-07"),
|
("2002-x12", "2005-07"),
|
||||||
("2002-x13", "1623-2005-06"),
|
("2002-x13", "1623-2005-06"),
|
||||||
("2002-x14", "2005-05"),
|
("2002-x14", "2005-05"),
|
||||||
("kh", "1623-161"),
|
("kh", "1623-161"),
|
||||||
|
@ -134,9 +134,10 @@ class Wallet(models.Model):
|
|||||||
self.save()
|
self.save()
|
||||||
waldata["date"] = thisdate.isoformat()
|
waldata["date"] = thisdate.isoformat()
|
||||||
else:
|
else:
|
||||||
message = f"! {str(self.walletname)} Date format not ISO {waldata['date']}. Failed to load from {jsonfile} JSON file"
|
if waldata["date"] != "" or waldata["date"] != "None":
|
||||||
from troggle.core.models.troggle import DataIssue
|
message = f"! {str(self.walletname)} Date format not ISO {waldata['date']}. Failed to load from {jsonfile} JSON file"
|
||||||
DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl)
|
from troggle.core.models.troggle import DataIssue
|
||||||
|
DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl)
|
||||||
return waldata
|
return waldata
|
||||||
|
|
||||||
def year(self):
|
def year(self):
|
||||||
|
@ -189,10 +189,10 @@ def parse_name_list(w):
|
|||||||
peeps.add(crew[n.lower()].person)
|
peeps.add(crew[n.lower()].person)
|
||||||
else:
|
else:
|
||||||
if n.startswith("*"): #ignore people flagged as guests or not-expo anyway, such as ARGE
|
if n.startswith("*"): #ignore people flagged as guests or not-expo anyway, such as ARGE
|
||||||
pass
|
continue
|
||||||
nobod = n.lower()
|
nobod = n.lower()
|
||||||
if nobod == "unknown" or nobod == "nobody" or nobod == " " or nobod == "":
|
if nobod == "unknown" or nobod == "nobody" or nobod == " " or nobod == "":
|
||||||
pass
|
continue
|
||||||
else:
|
else:
|
||||||
wurl = f"/walletedit/{w.walletname.replace('#',':')}"
|
wurl = f"/walletedit/{w.walletname.replace('#',':')}"
|
||||||
message = f"{w} name '{n.lower()}' NOT found in GetPersonExpeditionNameLookup({w.year()}) ?!"
|
message = f"{w} name '{n.lower()}' NOT found in GetPersonExpeditionNameLookup({w.year()}) ?!"
|
||||||
|
@ -265,10 +265,10 @@ def GetPersonExpeditionNameLookup(expedition):
|
|||||||
dellist = []
|
dellist = []
|
||||||
for personexpedition in personexpeditions:
|
for personexpedition in personexpeditions:
|
||||||
possnames = []
|
possnames = []
|
||||||
f = unidecode(unescape(personexpedition.person.first_name.lower()))
|
f = unidecode(unescape(personexpedition.person.first_name.lower().strip()))
|
||||||
l = unidecode(unescape(personexpedition.person.last_name.lower()))
|
l = unidecode(unescape(personexpedition.person.last_name.lower().strip()))
|
||||||
full = unidecode(unescape(personexpedition.person.fullname.lower()))
|
full = unidecode(unescape(personexpedition.person.fullname.lower().strip()))
|
||||||
n = unidecode(unescape(personexpedition.person.nickname.lower()))
|
n = unidecode(unescape(personexpedition.person.nickname.lower().strip()))
|
||||||
if full not in possnames:
|
if full not in possnames:
|
||||||
possnames.append(full)
|
possnames.append(full)
|
||||||
if n not in possnames:
|
if n not in possnames:
|
||||||
|
@ -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.
|
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),
|
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.
|
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>
|
<table>
|
||||||
<tr><th>alias</th><th>who</th></tr>
|
<tr><th>alias</th><th>who</th></tr>
|
||||||
{% for key, value in aliasdict.items %}
|
{% for key, value in aliasdict.items %}
|
||||||
|
Loading…
Reference in New Issue
Block a user