diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models/caves.py | 4 | ||||
| -rw-r--r-- | core/views/logbooks.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index 70a13ae..0b3aa1d 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -549,6 +549,10 @@ class PersonTrip(TroggleModel): logbook_entry = models.ForeignKey(LogbookEntry,on_delete=models.CASCADE) is_logbook_entry_author = models.BooleanField(default=False) + class Meta: + ordering = ('-personexpedition',) + #order_with_respect_to = 'personexpedition' + def persontrip_next(self): futurePTs = PersonTrip.objects.filter(personexpedition = self.personexpedition, logbook_entry__date__gt = self.logbook_entry.date).order_by('logbook_entry__date').all() if len(futurePTs) > 0: diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 415c7f8..9748aed 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -18,7 +18,7 @@ from troggle.core.models.caves import LogbookEntry, PersonTrip from troggle.core.models.survex import SurvexBlock, Wallet from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.utils import TROG -from troggle.parsers.logbooks import parse_logbook_for_expedition +from troggle.parsers.imports import import_logbook from troggle.parsers.people import GetPersonExpeditionNameLookup from .auth import login_required_if_public @@ -69,7 +69,7 @@ def expedition(request, expeditionname): #print(f'! - delete entry: "{entry}"') entry.delete() entries = this_expedition.logbookentry_set.all() - LoadLogbookForExpedition(this_expedition) + import_logbook(year=this_expedition.year) logged_in = True else: logged_in = False |