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
These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys.
-This is work in progress June 2025): the underground survey length does not match that in e.g. -wallets for 2018 probably because ARGE surveys are not in any of our wallets. -
This includes ARGE and other surveys currently. It will be changed to only include lengths surveyed by valid Expo-attendees. + +
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.
| Year | Survex Survey Blocks | Survex Survey Legs | Survex length(m) |
|---|