From ebe86d73d430b9d2d628262cf5a3539af9fd0fe7 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Mon, 30 Jan 2023 16:27:01 +0000
Subject: [PATCH] Renaming class - step 3 complete
---
core/models/troggle.py | 2 +-
core/views/logbooks.py | 8 ++++----
parsers/logbooks.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/models/troggle.py b/core/models/troggle.py
index a061ee5..3be7b5c 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -85,7 +85,7 @@ class Expedition(TroggleModel):
class ExpeditionDay(TroggleModel):
- """Exists only on Expedition now. Removed links from logbookentry, persontrip, survex stuff etc.
+ """Exists only on Expedition now. Removed links from logbookentry, personlogentry, survex stuff etc.
"""
expedition = models.ForeignKey("Expedition",on_delete=models.CASCADE)
date = models.DateField()
diff --git a/core/views/logbooks.py b/core/views/logbooks.py
index 4daede9..b7ad2bc 100644
--- a/core/views/logbooks.py
+++ b/core/views/logbooks.py
@@ -166,9 +166,9 @@ def get_person_chronology(personexpedition):
Rewrite more simply with the login in the python, not in Django template language (you bastard Curtis).
'''
res = { }
- for persontrip in personexpedition.persontrip_set.all():
- a = res.setdefault(persontrip.logbook_entry.date, { })
- a.setdefault("personlogentries", [ ]).append(persontrip)
+ for personlogentry in personexpedition.personlogentry_set.all():
+ a = res.setdefault(personlogentry.logbook_entry.date, { })
+ a.setdefault("personlogentries", [ ]).append(personlogentry)
for personrole in personexpedition.survexpersonrole_set.all():
if personrole.survexblock.date: # avoid bad data from another bug
@@ -227,7 +227,7 @@ def logbookentry(request, date, slug):
# svxothers = None
svxothers = SurvexBlock.objects.filter(date=date)
this_logbookentry=this_logbookentry[0]
- # This is the only page that uses persontrip_next and persontrip_prev
+ # This is the only page that uses personlogentry_next and personlogentry_prev
# and it is calculated on the fly in the model
return render(request, 'logbookentry.html',
{'logbookentry': this_logbookentry, 'trips': trips, 'svxothers': svxothers, 'wallets': wallets})
diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index 2f077e8..8f4acb1 100644
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -212,7 +212,7 @@ def tidy_tid(tid, title):
return tid
def store_entry_into_database(date, place, tripcave, title, text, trippersons, author, expedition, logtime_underground, tid):
- """saves a single logbook entry and related persontrips
+ """saves a single logbook entry and related personlogentrys
Does NOT save the expeditionday_id - all NULLs. why? Because we are deprecating expeditionday !
"""