mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-20 17:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-2' of https://github.com/evilbunny2008/weewx into evilbunny2008-patch-2

Browse Source
This commit is contained in:
Tom Keffer
2018-09-07 06:00:27 -07:00
parent 48a7d45a0e f56df7b1f9
commit abc745eaf2
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
examples/xstats/bin/user/xstats.py
View File

@@ -12,6 +12,11 @@ This search list extension offers extra tags:
'seven_day': Statistics for the last seven days.
'thirty_day': Statistics for the last thirty days.
'last_year': Statistics for last calendar year.
'last_year_todate': Statistics of last calendar year until this time last year.
This especially useful for comprisons of rain fall up to this time last year.
You can then use tags such as $alltime.outTemp.max for the all-time max
temperature, or $seven_day.rain.sum for the total rainfall in the last seven
@@ -69,10 +74,34 @@ class ExtendedStatistics(SearchList):
context='thirty_day',
formatter=self.generator.formatter,
converter=self.generator.converter)
# Now use a similar process to get statistics for last year.
year = datetime.date.today().year
start_ts = time.mktime((year - 1, 1, 1, 0, 0, 0, 0, 0, 0))
stop_ts = time.mktime((year, 1, 1, 0, 0, 0, 0, 0, 0))
last_year_stats = TimespanBinder(TimeSpan(start_ts, stop_ts),
db_lookup,
context='last_year',
formatter=self.generator.formatter,
converter=self.generator.converter)
# Now use a similar process to get statistics for last year to date.
year = datetime.date.today().year
month = datetime.date.today().month
day = datetime.date.today().day
start_ts = time.mktime((year - 1, 1, 1, 0, 0, 0, 0, 0, 0))
stop_ts = time.mktime((year - 1, month, day, 0, 0, 0, 0, 0, 0))
last_year_todate_stats = TimespanBinder(TimeSpan(start_ts, stop_ts),
db_lookup,
context='last_year_todate',
formatter=self.generator.formatter,
converter=self.generator.converter
return [{'alltime': all_stats,
'seven_day': seven_day_stats,
'thirty_day': thirty_day_stats}]
'thirty_day': thirty_day_stats,
'last_year': last_year_stats,
'last_year_todate': last_year_todate_stats}]
# For backwards compatibility:
ExtStats = ExtendedStatistics

10
examples/xstats/readme.txt
View File

@@ -16,7 +16,15 @@ This search list extension offers extra tags:
thirty days ago. For example, "what is the maximum wind
speed in the last thirty days?"
$thirty_day.wind.max
'last_year': Statistics for last calendar year, this is useful for
things like total rainfall for last year.
$last_year.rain.sum
'last_year_todate': Statistics of last calendar year until this time
last year. This is useful for comprisons of rain
fall up to this time last year.
$last_year_todate.rain.sum
Installation instructions