expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

clean up small errors and debugging

Browse Source
This commit is contained in:
Philip Sargent 2023-10-05 14:45:46 +03:00
parent fcfa59cdf7
commit ed993761a1
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/models/caves.py
View File

@ -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"),

7
core/models/wallets.py
View File

@ -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):

4
core/views/scans.py
View File

@ -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()}) ?!"

8
parsers/people.py
View File

@ -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:

5
templates/aliases.html
View File

@ -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 %}