jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-17 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add quarterly cycle for utility_meter component (#29534)

Browse Source 
* Add quarterly tariff period to utility_meter

Many tariff cycles in Australia are 3 monthly (quarterly).
Add quarterly tariff cycle handling to the utility_meter component.

* Add quarterly tariff period to utility_meter

Many tariff cycles in Australia are 3 monthly (quarterly).
Add quarterly tariff cycle handling to the utility_meter component.

* Change date for test for utility_meter

* Add quarterly tariff period to utility_meter

Many tariff cycles in Australia are 3 monthly (quarterly).
Add quarterly tariff cycle handling to the utility_meter component.
This commit is contained in:
Andrew McRae 2019-12-08 19:49:18 +11:00 committed by Paulus Schoutsen
parent 94b6cbc571
commit de0db1601b
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/utility_meter/const.py
View File

@ -5,9 +5,10 @@ HOURLY = "hourly"
DAILY = "daily" DAILY = "daily"
WEEKLY = "weekly" WEEKLY = "weekly"
MONTHLY = "monthly" MONTHLY = "monthly"
QUARTERLY = "quarterly"
YEARLY = "yearly" YEARLY = "yearly"
METER_TYPES = [HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY] METER_TYPES = [HOURLY, DAILY, WEEKLY, MONTHLY, QUARTERLY, YEARLY]
DATA_UTILITY = "utility_meter_data" DATA_UTILITY = "utility_meter_data"

9
homeassistant/components/utility_meter/sensor.py
View File

@ -25,6 +25,7 @@ from .const import (
DAILY, DAILY,
WEEKLY, WEEKLY,
MONTHLY, MONTHLY,
QUARTERLY,
YEARLY, YEARLY,
CONF_SOURCE_SENSOR, CONF_SOURCE_SENSOR,
CONF_METER_TYPE, CONF_METER_TYPE,
@ -184,6 +185,12 @@ class UtilityMeterSensor(RestoreEntity):
and now != date(now.year, now.month, 1) + self._period_offset and now != date(now.year, now.month, 1) + self._period_offset
): ):
return return
if (
self._period == QUARTERLY
and now
!= date(now.year, (((now.month - 1) // 3) * 3 + 1), 1) + self._period_offset
):
return
if self._period == YEARLY and now != date(now.year, 1, 1) + self._period_offset: if self._period == YEARLY and now != date(now.year, 1, 1) + self._period_offset:
return return
await self.async_reset_meter(self._tariff_entity) await self.async_reset_meter(self._tariff_entity)
@ -209,7 +216,7 @@ class UtilityMeterSensor(RestoreEntity):
minute=self._period_offset.seconds // 60, minute=self._period_offset.seconds // 60,
second=self._period_offset.seconds % 60, second=self._period_offset.seconds % 60,
) )
elif self._period in [DAILY, WEEKLY, MONTHLY, YEARLY]: elif self._period in [DAILY, WEEKLY, MONTHLY, QUARTERLY, YEARLY]:
async_track_time_change( async_track_time_change(
self.hass, self.hass,
self._async_reset_meter, self._async_reset_meter,

7
tests/components/utility_meter/test_sensor.py
View File

@ -240,6 +240,13 @@ async def test_self_reset_monthly(hass):
) )
async def test_self_reset_quarterly(hass):
"""Test quarterly reset of meter."""
await _test_self_reset(
hass, gen_config("quarterly"), "2017-03-31T23:59:00.000000+00:00"
)
async def test_self_reset_yearly(hass): async def test_self_reset_yearly(hass):
"""Test yearly reset of meter.""" """Test yearly reset of meter."""
await _test_self_reset( await _test_self_reset(