diff options
| -rw-r--r-- | core/views/statistics.py | 7 | ||||
| -rw-r--r-- | templates/statistics.html | 5 | ||||
| -rw-r--r-- | templates/survexfilewild.html | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/core/views/statistics.py b/core/views/statistics.py index 8bd7072..30fc1b5 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -26,9 +26,10 @@ def legs_by_expo(expos): survexblocks = expedition.survexblock_set.all() legsyear = 0 survexleglength = 0.0 - for survexblock in survexblocks: - survexleglength += survexblock.legslength - legsyear += int(survexblock.legsall) + for sb in survexblocks: + if not sb.foreigners: + survexleglength += sb.legslength + legsyear += int(sb.legsall) addupsurvexlength += survexleglength addupsurvexlegs += legsyear legsbyexpo.append((expedition, {"nsurvexlegs": legsyear, "survexleglength": survexleglength})) diff --git a/templates/statistics.html b/templates/statistics.html index f44fbc3..2daec6a 100644 --- a/templates/statistics.html +++ b/templates/statistics.html @@ -12,9 +12,8 @@ Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total fo <p>These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. <p> -This is work in progress June 2025): the underground survey length does not match that in e.g. -<a href="/wallets/year/2018">wallets for 2018</a> probably because ARGE surveys are not in any of our wallets. -<p>This includes ARGE and other surveys currently. It will be changed to only include lengths surveyed by valid Expo-attendees. + +<p>This only includes lengths surveyed by Expo survey trips (though not all have valid Expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes ARGE and other non-expo surveys. <table> <tr><th>Year</th><th>Survex<br>Survey<br>Blocks</th><th>Survex<br>Survey Legs</th><th>Survex <br>length(m)</th></tr> diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index a2fcf49..972f56f 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -72,4 +72,6 @@ Length of survex data referenced by wallets in this year {{walletslength|floatfo Some files from other caving clubs may have a convention of using many more blocks per file than we do, e.g. if the file is exported from other software into survex format. +<p>This only includes lengths surveyed by Expo survey trips (though not all have valid Expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes ARGE and other non-expo surveys. + {% endblock %}
\ No newline at end of file |