From 194470841ebb2affc8af2be060527d9f4c2fb3c7 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 23 Dec 2022 22:13:43 +0000 Subject: [PATCH] logbooks correct numberss of entries expected --- parsers/imports.py | 2 +- parsers/logbooks.py | 2 +- templates/logbook2008style.txt | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 templates/logbook2008style.txt diff --git a/parsers/imports.py b/parsers/imports.py index 62e7e84..2ac4f1d 100644 --- a/parsers/imports.py +++ b/parsers/imports.py @@ -41,7 +41,7 @@ def import_logbooks(): with transaction.atomic(): troggle.parsers.logbooks.LoadLogbooks() -def import_logbook(year=1992): +def import_logbook(year=2022): print(f"-- Importing Logbook {year}") with transaction.atomic(): troggle.parsers.logbooks.LoadLogbook(year) diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 34b564e..881f424 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -80,7 +80,7 @@ LOGBOOK_PARSER_SETTINGS = { "1982": ("logbook.html", "parser_html"), } -entries = { "2022": 86, "2019": 56, "2018": 100, "2017": 76, "2016": 83, "2015": 80, +entries = { "2022": 89, "2019": 55, "2018": 95, "2017": 74, "2016": 86, "2015": 80, "2014": 65, "2013": 52, "2012": 75, "2011": 71, "2010": 22, "2009": 53, "2008": 49, "2007": 113, "2006": 60, "2005": 55, "2004": 76, "2003": 42, "2002": 31, "2001": 49, "2000": 54, "1999": 79, "1998": 43, "1997": 53, "1996": 95, "1995": 42, diff --git a/templates/logbook2008style.txt b/templates/logbook2008style.txt deleted file mode 100644 index 2725995..0000000 --- a/templates/logbook2008style.txt +++ /dev/null @@ -1,6 +0,0 @@ -=Expo {{logbook_entries.0.expedition}} logbook == -{%for logbook_entry in logbook_entries%} -==={{logbook_entry.date}} | {{logbook_entry.place}} - {{logbook_entry.title}} | {% for persontrip in logbook_entry.persontrip_set.all %}{{ persontrip.person_expedition.person }} {{ persontrip.person_expedition.time_underground }}, {% endfor %}=== - -{{logbook_entry.text|safe}} -{% endfor %} \ No newline at end of file