Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Airzone select improvements #92894

Merged
merged 12 commits into from
May 24, 2023
Merged

Airzone select improvements #92894

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7f7ab82
airzone: select: remove unneed .keys()
Noltari May 10, 2023
8b6d914
airzone: select: make options translatable
Noltari May 10, 2023
e503a1d
airzone: select: change options to lists (from enums)
Noltari May 11, 2023
93f8bd1
tests: airzone: fix python 3.10 tests
Noltari May 11, 2023
b818a26
airzone: select: add manual dict values
Noltari May 15, 2023
fea174b
Revert "airzone: select: add manual dict values"
Noltari May 15, 2023
36c0b15
Revert "tests: airzone: fix python 3.10 tests"
Noltari May 15, 2023
65ff994
Revert "airzone: select: change options to lists (from enums)"
Noltari May 15, 2023
4fefdda
Merge remote-tracking branch 'upstream/dev' into airzone-select-impro…
Noltari May 17, 2023
948676a
airzone: select: options: copy dict to list
Noltari May 17, 2023
873a0c4
Merge remote-tracking branch 'upstream/dev' into airzone-select-impro…
Noltari May 23, 2023
4087cde
airzone: select: use degree symbol
Noltari May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions homeassistant/components/airzone/select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription


GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
"90º": GrilleAngle.DEG_90,
"50º": GrilleAngle.DEG_50,
"45º": GrilleAngle.DEG_45,
"40º": GrilleAngle.DEG_40,
"90deg": GrilleAngle.DEG_90,
gjohansson-ST marked this conversation as resolved.
Show resolved Hide resolved
"50deg": GrilleAngle.DEG_50,
"45deg": GrilleAngle.DEG_45,
"40deg": GrilleAngle.DEG_40,
}

SLEEP_DICT: Final[dict[str, int]] = {
"Off": SleepTimeout.SLEEP_OFF,
"off": SleepTimeout.SLEEP_OFF,
gjohansson-ST marked this conversation as resolved.
Show resolved Hide resolved
"30m": SleepTimeout.SLEEP_30,
"60m": SleepTimeout.SLEEP_60,
"90m": SleepTimeout.SLEEP_90,
Expand All @@ -62,20 +62,23 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription
key=AZD_COLD_ANGLE,
name="Cold Angle",
options_dict=GRILLE_ANGLE_DICT,
gjohansson-ST marked this conversation as resolved.
Show resolved Hide resolved
translation_key="grille_angles",
),
AirzoneSelectDescription(
api_param=API_HEAT_ANGLE,
entity_category=EntityCategory.CONFIG,
key=AZD_HEAT_ANGLE,
name="Heat Angle",
options_dict=GRILLE_ANGLE_DICT,
gjohansson-ST marked this conversation as resolved.
Show resolved Hide resolved
translation_key="grille_angles",
),
AirzoneSelectDescription(
api_param=API_SLEEP,
entity_category=EntityCategory.CONFIG,
key=AZD_SLEEP,
name="Sleep",
options_dict=SLEEP_DICT,
translation_key="sleep_times",
),
)

Expand All @@ -93,7 +96,7 @@ async def async_setup_entry(
if description.key in zone_data:
_desc = replace(
MartinHjelmare marked this conversation as resolved.
Show resolved Hide resolved
description,
options=list(description.options_dict.keys()),
options=list(description.options_dict),
gjohansson-ST marked this conversation as resolved.
Show resolved Hide resolved
)
entities.append(
AirzoneZoneSelect(
Expand Down
20 changes: 20 additions & 0 deletions homeassistant/components/airzone/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,25 @@
}
}
}
},
"entity": {
"select": {
"grille_angles": {
"state": {
"90deg": "90º",
"50deg": "50º",
"45deg": "45º",
"40deg": "40º"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use the degree symbol here

Suggested change
"90deg": "90º",
"50deg": "50º",
"45deg": "45º",
"40deg": "40º"
"90deg": "90°",
"50deg": "50°",
"45deg": "45°",
"40deg": "40°"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 4087cde

}
},
"sleep_times": {
"state": {
"off": "[%key:common::state::off%]",
"30m": "30 minutes",
"60m": "60 minutes",
"90m": "90 minutes"
}
}
}
}
}
36 changes: 18 additions & 18 deletions tests/components/airzone/test_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,49 +25,49 @@ async def test_airzone_create_selects(hass: HomeAssistant) -> None:
await async_init_integration(hass)

state = hass.states.get("select.despacho_cold_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.despacho_heat_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.despacho_sleep")
assert state.state == "Off"
assert state.state == "off"

state = hass.states.get("select.dorm_1_cold_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.dorm_1_heat_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.dorm_1_sleep")
assert state.state == "Off"
assert state.state == "off"

state = hass.states.get("select.dorm_2_cold_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.dorm_2_heat_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.dorm_2_sleep")
assert state.state == "Off"
assert state.state == "off"

state = hass.states.get("select.dorm_ppal_cold_angle")
assert state.state == "45º"
assert state.state == "45deg"

state = hass.states.get("select.dorm_ppal_heat_angle")
assert state.state == "50º"
assert state.state == "50deg"

state = hass.states.get("select.dorm_ppal_sleep")
assert state.state == "30m"

state = hass.states.get("select.salon_cold_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.salon_heat_angle")
assert state.state == "90º"
assert state.state == "90deg"

state = hass.states.get("select.salon_sleep")
assert state.state == "Off"
assert state.state == "off"


async def test_airzone_select_sleep(hass: HomeAssistant) -> None:
Expand Down Expand Up @@ -140,13 +140,13 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
SERVICE_SELECT_OPTION,
{
ATTR_ENTITY_ID: "select.dorm_1_cold_angle",
ATTR_OPTION: "50º",
ATTR_OPTION: "50deg",
},
blocking=True,
)

state = hass.states.get("select.dorm_1_cold_angle")
assert state.state == "50º"
assert state.state == "50deg"

# Heat Angle

Expand All @@ -168,10 +168,10 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
SERVICE_SELECT_OPTION,
{
ATTR_ENTITY_ID: "select.dorm_1_heat_angle",
ATTR_OPTION: "45º",
ATTR_OPTION: "45deg",
},
blocking=True,
)

state = hass.states.get("select.dorm_1_heat_angle")
assert state.state == "45º"
assert state.state == "45deg"