gru/gree-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.8.6-r2

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2026-08-28 12:58:48 +02:00
parent 615b2836b7
commit 7b5c9e4528
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api.rs
+4 -3
View File
@@ -812,7 +812,8 @@ async fn apply_zone_control_patch(state: &AppState, id: &str, patch: ZoneControl
safety_duration_seconds.map(|seconds| active_base.clone() + ChronoDuration::seconds(seconds as i64))
} else { None };
let immediate_activation = !editing_active && start_kind == "now" && runtime.house_power_enabled && !zone.device_manual_override;
let starts_now = start_kind == "now";
let immediate_activation = !editing_active && starts_now && runtime.house_power_enabled && !zone.device_manual_override;
let restore_zone_enabled = if editing_active {
existing_session.as_ref().and_then(|session| session.restore_zone_enabled)
} else if immediate_activation {
@@ -840,7 +841,7 @@ async fn apply_zone_control_patch(state: &AppState, id: &str, patch: ZoneControl
}
let state_value = if editing_active {
if zone.device_manual_override { "paused_manual" } else { "active" }
} else if start_kind == "now" && zone.device_manual_override {
} else if starts_now && zone.device_manual_override {
"paused_manual"
} else {
"scheduled"
@@ -905,7 +906,7 @@ async fn apply_zone_control_patch(state: &AppState, id: &str, patch: ZoneControl
hold_seconds,
condition_started_at: None,
condition_last_observed_at: None,
paused_at: if zone.device_manual_override && (editing_active || start_kind == "now") {
paused_at: if zone.device_manual_override && (editing_active || starts_now) {
existing_session.as_ref().and_then(|session| session.paused_at.clone()).or(Some(now.clone()))
} else { None },
deferred_mode: existing_session.as_ref().and_then(|session| session.deferred_mode.clone()),