diff --git a/core/views/wallets_edit.py b/core/views/wallets_edit.py index 8513812..4e37c6e 100644 --- a/core/views/wallets_edit.py +++ b/core/views/wallets_edit.py @@ -17,7 +17,7 @@ import settings from troggle.core.models.caves import Cave from troggle.core.models.logbooks import LogbookEntry # , PersonLogEntry from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonRole -from troggle.core.models.troggle import DataIssue, Expedition +from troggle.core.models.troggle import DataIssue, Expedition, Person from troggle.core.models.wallets import YEAR_RANGE, Wallet, make_valid_date from troggle.core.utils import ( get_cookie_max_age, @@ -36,6 +36,7 @@ from troggle.core.views.caves import get_cave_leniently, getCave from troggle.core.views.scans import caveifywallet, oldwallet from troggle.core.views.uploads import WalletFilesForm from troggle.parsers.scans import CONTENTSJSON +from troggle.parsers.people import who_is_this """Main wallet editing form, which includes scan file upload into the wallet """ @@ -868,11 +869,17 @@ def walletedit(request, path=None): if not waldata["date"]: # either absent or empty string waldata["date"] = date + persons = [] if no_people(waldata["people"]): people = team waldata["people"] = team else: people = waldata["people"] # text string + for person in waldata["people"]: + person_id = who_is_this(year, person) + print(f"walletedit: {person}, {person_id}") + persons.append(Person.objects.get(slug=person_id)) + if empty_string(waldata["cave"]): cave = caverefs # a list, potentially @@ -965,6 +972,7 @@ def walletedit(request, path=None): "complaints": complaints, "caveobject": caveobject, "people": people, + "persons": persons, "peoplesize": str(len(str(people))), "filesaved": filesaved, "actual_saved": actual_saved, diff --git a/parsers/people.py b/parsers/people.py index a290994..6f44043 100644 --- a/parsers/people.py +++ b/parsers/people.py @@ -262,7 +262,7 @@ def ensure_users_are_persons(): # print(f" {p.user} {u=}") def who_is_this(year, possibleid): - expo = Expedition.objects.filter(year=year) + expo = Expedition.objects.filter(year=year)[0] personexpedition = GetPersonExpeditionNameLookup(expo)[possibleid.lower()] if personexpedition: return personexpedition.person diff --git a/templates/walletform.html b/templates/walletform.html index 9fe1cec..e466047 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -266,7 +266,11 @@ and also the exported files in standard formats: svx, svg etc. See why + + {% for p in persons %} + {{p}} + {% endfor %} {% include 'onthisdate.html' %} {% if metadataurl %} JSON
{% include 'onthisdate.html' %} {% if metadataurl %} JSON