Option for CRW name added

faanskit · Jan 27, 2024 · f20d0e5 · f20d0e5
1 parent 19094c8
commit f20d0e5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/custom_components/checkwatt/__init__.py b/custom_components/checkwatt/__init__.py
@@ -21,6 +21,7 @@
 from .const import (
  BASIC_TEST,
  CONF_CM10_SENSOR,
+ CONF_CWR_NAME,
  CONF_POWER_SENSORS,
  CONF_PUSH_CW_TO_RANK,
  CONF_UPDATE_INTERVAL_ALL,
@@ -177,6 +178,8 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
  use_power_sensors = self._entry.options.get(CONF_POWER_SENSORS)
  push_to_cw_rank = self._entry.options.get(CONF_PUSH_CW_TO_RANK)
  use_cm10_sensor = self._entry.options.get(CONF_CM10_SENSOR)
+ cwr_name = self._entry.options.get(CONF_CWR_NAME)
+ _LOGGER.debug("Configured name for CheckWattRank: %s", cwr_name)
 
  async with CheckwattManager(
  username, password, INTEGRATION_NAME
@@ -256,7 +259,7 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
  != dt_util.start_of_local_day(self.last_cw_rank_push)
  ):
  _LOGGER.debug("Pushing to CheckWattRank")
- if await self.push_to_checkwatt_rank(cw_inst):
+ if await self.push_to_checkwatt_rank(cw_inst, cwr_name):
  self.last_cw_rank_push = dt_util.now()
 
  resp: CheckwattResp = {
@@ -378,7 +381,7 @@ async def _async_update_data(self) -> CheckwattResp: # noqa: C901
  except CheckwattError as err:
  raise UpdateFailed(str(err)) from err
 
- async def push_to_checkwatt_rank(self, cw_inst):
+ async def push_to_checkwatt_rank(self, cw_inst, cwr_name):
  """Push data to CheckWattRank."""
  if self.today_net_revenue is not None:
  if (
@@ -401,6 +404,8 @@ async def push_to_checkwatt_rank(self, cw_inst):
  }
  if BASIC_TEST:
  payload["display_name"] = "xxTESTxx"
+ elif cwr_name != "":
+ payload["display_name"] = cwr_name
  else:
  payload["display_name"] = cw_inst.customer_details["Meter"][0][
  "DisplayName"

diff --git a/custom_components/checkwatt/config_flow.py b/custom_components/checkwatt/config_flow.py
@@ -14,7 +14,13 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from .const import CONF_CM10_SENSOR, CONF_POWER_SENSORS, CONF_PUSH_CW_TO_RANK, DOMAIN
+from .const import (
+ CONF_CM10_SENSOR,
+ CONF_CWR_NAME,
+ CONF_POWER_SENSORS,
+ CONF_PUSH_CW_TO_RANK,
+ DOMAIN,
+)
 
 CONF_TITLE = "CheckWatt"
 
@@ -74,6 +80,7 @@ async def async_step_user(
  CONF_POWER_SENSORS: False,
  CONF_PUSH_CW_TO_RANK: False,
  CONF_CM10_SENSOR: True,
+ CONF_CWR_NAME: "",
  },
  )
 
@@ -120,6 +127,10 @@ async def async_step_init(
  CONF_CM10_SENSOR,
  default=self.config_entry.options.get(CONF_CM10_SENSOR),
  ): bool,
+ vol.Optional(
+ CONF_CWR_NAME,
+ default=self.config_entry.options.get(CONF_CWR_NAME),
+ ): str,
  }
  ),
  )

diff --git a/custom_components/checkwatt/const.py b/custom_components/checkwatt/const.py
@@ -15,6 +15,7 @@
 CONF_POWER_SENSORS: Final = "show_details"
 CONF_PUSH_CW_TO_RANK: Final = "push_to_cw_rank"
 CONF_CM10_SENSOR: Final = "cm10_sensor"
+CONF_CWR_NAME: Final = "cwr_name"
 
 # Misc
 P_UNKNOWN = "Unknown"

diff --git a/custom_components/checkwatt/strings.json b/custom_components/checkwatt/strings.json
@@ -25,7 +25,8 @@
  "data": {
  "show_details": "Provide energy sensors",
  "push_to_cw_rank": "Push data to CheckWattRank",
- "cm10_sensor": "Provide CM10 sensor"
+ "cm10_sensor": "Provide CM10 sensor",
+ "cwr_name": "System name for CheckWattRank"
  },
  "description": "Select options",
  "title": "CheckWatt"

diff --git a/custom_components/checkwatt/translations/en.json b/custom_components/checkwatt/translations/en.json
@@ -25,7 +25,8 @@
  "data": {
  "show_details": "Provide energy sensors",
  "push_to_cw_rank": "Push data to CheckWattRank",
- "cm10_sensor": "Provide CM10 sensor"
+ "cm10_sensor": "Provide CM10 sensor",
+ "cwr_name": "System name for CheckWattRank"
  },
  "description": "Select options",
  "title": "CheckWatt"

diff --git a/custom_components/checkwatt/translations/sv.json b/custom_components/checkwatt/translations/sv.json
@@ -25,7 +25,8 @@
  "data": {
  "show_details": "Skapa energisensorer",
  "push_to_cw_rank": "Skicka data till CheckWattRank",
- "cm10_sensor": "Skapa CM10 sensor"
+ "cm10_sensor": "Skapa CM10 sensor",
+ "cwr_name": "Systemnamn till CheckWattRank"
  },
  "description": "Dina val",
  "title": "CheckWatt"