diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models/caves.py | 2 | ||||
| -rw-r--r-- | core/models/wallets.py | 7 | ||||
| -rw-r--r-- | core/views/scans.py | 4 |
3 files changed, 7 insertions, 6 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()}) ?!" |