Verbraucher: Refactor für ResetChargemode auf einmalig, täglich, wöchentlich by LKuemmel · Pull Request #4024 · openWB/core

LKuemmel · 2026-09-28T07:52:45Z

UI openWB/openwb-ui-settings#1106

Copilot

Copilot review overview

🟡 Changes recommended

Critical reset scheduling and default-state issues, along with migration gaps, remain unresolved.

Review effort: Lite
Findings: 2 · 1

Open (3)

Daily and weekly reset occurrences roll over before due-time checks · New
ResetChargemode defaults to unexpectedly active · New
Migration drops the legacy reset chargemode target · New

What changed in this PR

Refactors consumer charge-mode resets to use reusable timepoint plans and migrates legacy reset settings.

Changes:

Adds one-time, daily, and weekly reset scheduling.
Adds datastore migration support.
Updates reset handling and related tests.

File	Summary
`packages/helpermodules/update_config.py`	Migrates legacy reset configurations.
`packages/helpermodules/update_config_test.py`	Tests migration behavior.
`packages/helpermodules/timecheck.py`	Supports timepoint scheduling.
`packages/helpermodules/abstract_plans.py`	Adds the reusable timepoint base class.
`packages/control/consumer/consumer.py`	Applies scheduled resets; recurring due-time handling requires correction.
`packages/control/consumer/consumer_test.py`	Tests reset execution.
`packages/control/consumer/consumer_data.py`	Defines the reset schema; default behavior requires correction.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

+        if ((data.data.general_data.data.control_interval * -1 < timecheck.check_end_time(
+            self.data.usage.reset_chargemode) <= 0) and


+class ResetChargemode(TimepointPlan):
    chargemode: Chargemode = Chargemode.INSTANT_CHARGING


+                if reset_chargemode.get("mode") is not None:
+                    # altes Schema
+                    if reset_chargemode["mode"] == "never":
+                        reset_chargemode = ResetChargemode(active=False)
+                    elif reset_chargemode["mode"] == "midnight":
+                        reset_chargemode = ResetChargemode(active=True, time="00:00",
+                                                           frequency=FrequencyDate(selected="daily"))
+                    elif reset_chargemode["mode"] == "time":
+                        timestamp = reset_chargemode["time"]
+                        if timestamp is not None:
+                            date = datetime.datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d")
+                            time = datetime.datetime.fromtimestamp(timestamp).strftime("%H:%M")
+                        else:
+                            date = datetime.datetime.today().strftime("%Y-%m-%d")
+                            time = "07:00"
+                        reset_chargemode = ResetChargemode(
+                            active=True, time=time, frequency=FrequencyDate(selected="once", once=date))


Brett-S-OWB

Vorgeschlagene Änderungen: Der Toggle und die Auswahl der Wochentage sollten aus Konsistenzgründen mit anderen Bereichen des Koala-Themes übereinstimmen.

Brett-S-OWB · 2026-10-01T14:40:19Z

          <div class="text-subtitle2">Betriebsmodus umstellen</div>
          <q-btn-group spread outline class="q-mt-sm">
            <q-btn
-              v-for="trigger in resetTriggers"
-              :key="trigger.value"
              size="sm"
-              :outline="resetTrigger !== trigger.value"
-              :color="resetTrigger === trigger.value ? 'primary' : 'grey'"
-              :label="trigger.label"
-              @click="selectTrigger(trigger.value)"
+              :outline="resetEnabled"
+              :color="!resetEnabled ? 'negative' : 'grey'"
+              label="Nein"
+              @click="setResetEnabled(false)"
+            />
+            <q-btn
+              size="sm"
+              :outline="!resetEnabled"
+              :color="resetEnabled ? 'positive' : 'grey'"
+              label="Ja"
+              @click="setResetEnabled(true)"
            />
          </q-btn-group>


Das sollte ein Toggle sein, damit es mit den anderen Komponenten im Theme konsistent bleibt.

Suggested change

<div class="text-subtitle2">Betriebsmodus umstellen</div>

<q-btn-group spread outline class="q-mt-sm">

<q-btn

v-for="trigger in resetTriggers"

:key="trigger.value"

size="sm"

:outline="resetTrigger !== trigger.value"

:color="resetTrigger === trigger.value ? 'primary' : 'grey'"

:label="trigger.label"

@click="selectTrigger(trigger.value)"

:outline="resetEnabled"

:color="!resetEnabled ? 'negative' : 'grey'"

label="Nein"

@click="setResetEnabled(false)"

/>

<q-btn

size="sm"

:outline="!resetEnabled"

:color="resetEnabled ? 'positive' : 'grey'"

label="Ja"

@click="setResetEnabled(true)"

/>

</q-btn-group>

<div class="row items-center justify-between">

<div class="text-subtitle2 q-mr-sm">Betriebsmodus umstellen</div>

<ToggleStandard

:model-value="resetEnabled"

:size="'sm'"

color="positive"

@update:model-value="setResetEnabled"

/>

</div>

Brett-S-OWB · 2026-10-01T14:48:43Z

+          <template v-if="resetEnabled">
            <q-input
-              v-model="resetTimeOfDay"
+              v-model="resetTime"
              type="time"
              label="Uhrzeit"
-              class="col"
+              class="q-mt-sm"
+            />


Formatting

Suggested change

<template v-if="resetEnabled">

<q-input

v-model="resetTimeOfDay"

v-model="resetTime"

type="time"

label="Uhrzeit"

class="col"

class="q-mt-sm"

/>

<template v-if="resetEnabled">

<q-separator inset class="q-mt-sm" />

<q-input v-model="resetTime" type="time" label="Uhrzeit" />

Brett-S-OWB · 2026-10-01T14:53:19Z

+            <div
+              v-if="resetMode === 'weekly'"
+              class="row q-col-gutter-xs q-mt-sm"
+            >
+              <div
+                v-for="(day, index) in weekDays"
+                :key="day"
+                class="col"
+              >
+                <q-btn
+                  no-caps
+                  size="sm"
+                  class="full-width"
+                  :outline="!resetWeeklyDays[index]"
+                  :color="resetWeeklyDays[index] ? 'primary' : 'grey'"
+                  :label="day"
+                  @click="toggleWeeklyDay(index)"
+                />
+              </div>
+            </div>


Die Auswahl der Wochentage sollte das gleiche grafische Format haben wie in anderen Bereichen der Koala Theme.

Suggested change

<div

v-if="resetMode === 'weekly'"

class="row q-col-gutter-xs q-mt-sm"

>

<div

v-for="(day, index) in weekDays"

:key="day"

class="col"

>

<q-btn

no-caps

size="sm"

class="full-width"

:outline="!resetWeeklyDays[index]"

:color="resetWeeklyDays[index] ? 'primary' : 'grey'"

:label="day"

@click="toggleWeeklyDay(index)"

/>

</div>

</div>

<div

v-if="resetMode === 'weekly'"

class="row items-center q-gutter-sm justify-center no-wrap q-mt-xs"

>

<div v-for="(day, index) in weekDays" :key="day">

<q-btn

round

:size="$q.platform.is.mobile ? '0.8rem' : '0.7rem'"

:flat="!resetWeeklyDays[index]"

:outline="resetWeeklyDays[index]"

color="primary"

:label="day"

:class="{ deselected: !resetWeeklyDays[index] }"

@click="toggleWeeklyDay(index)"

/>

</div>

</div>

Brett-S-OWB · 2026-10-01T14:56:07Z

 import { useMqttStore } from 'src/stores/mqtt-store';
 import { useChargeModes } from 'src/composables/useChargeModes';
 import type { ConsumerResetTrigger } from 'src/stores/mqtt-store-model';
 import ConsumerModeButtons from './ConsumerModeButtons.vue';


Standard-Toggle import für toggle

Suggested change

import ConsumerModeButtons from './ConsumerModeButtons.vue';

import ToggleStandard from './ToggleStandard.vue';

Brett-S-OWB · 2026-10-01T15:00:25Z

 const showModeControls = computed(
  () => consumerUsageType.value !== 'meter_only' && consumerUsageType.value !== 'self_controlled',
 );


Formatting

Suggested change

const showModeControls = computed(

() =>

consumerUsageType.value !== 'meter_only' &&

consumerUsageType.value !== 'self_controlled',

);

…entlich

Brett-S-OWB

Änderungen in Koala Theme passen

LKuemmel requested a lite review from Copilot September 28, 2026 07:52

Copilot started reviewing on behalf of LKuemmel September 28, 2026 07:53 View session

Copilot AI reviewed Sep 28, 2026

View reviewed changes

LKuemmel force-pushed the auto_usage_switch branch from 9d5922a to 01c7817 Compare September 30, 2026 11:50

Brett-S-OWB mentioned this pull request Sep 30, 2026

Verbraucher: Refactor für ResetChargemode auf einmalig, täglich, wöchentlich openWB/openwb-ui-settings#1106

Merged

LKuemmel requested a review from Brett-S-OWB September 30, 2026 13:00

Brett-S-OWB requested changes Oct 1, 2026

View reviewed changes

LKuemmel requested a review from Brett-S-OWB October 2, 2026 13:10

LKuemmel added 7 commits October 2, 2026 15:14

Verbraucher: Refactor für ResetChargemode auf einmalig, täglich, wöch…

d026738

…entlich

flake8

01d3114

review

fc1e2f4

pytest

05878fb

Update koala theme

627c9fc

Review

53b8017

pytest

964fac1

LKuemmel force-pushed the auto_usage_switch branch from 3e4f293 to 964fac1 Compare October 2, 2026 13:21

Brett-S-OWB approved these changes Oct 2, 2026

View reviewed changes

Navigation Menu

Verbraucher: Refactor für ResetChargemode auf einmalig, täglich, wöchentlich - #4024

Verbraucher: Refactor für ResetChargemode auf einmalig, täglich, wöchentlich#4024
LKuemmel wants to merge 7 commits into
openWB:masterfrom
LKuemmel:auto_usage_switch

LKuemmel commented Sep 28, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Brett-S-OWB left a comment

Uh oh!

Brett-S-OWB Oct 1, 2026

Uh oh!

Brett-S-OWB Oct 1, 2026 •

edited

Loading

Uh oh!

Brett-S-OWB Oct 1, 2026

Uh oh!

Brett-S-OWB Oct 1, 2026

Uh oh!

Brett-S-OWB Oct 1, 2026

Uh oh!

Brett-S-OWB left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		if ((data.data.general_data.data.control_interval * -1 < timecheck.check_end_time(
		self.data.usage.reset_chargemode) <= 0) and

		class ResetChargemode(TimepointPlan):
		chargemode: Chargemode = Chargemode.INSTANT_CHARGING


	import ConsumerModeButtons from './ConsumerModeButtons.vue';
	import ToggleStandard from './ToggleStandard.vue';

Conversation

LKuemmel commented Sep 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟡 Changes recommended

Uh oh!

Brett-S-OWB left a comment

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB Oct 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

Brett-S-OWB left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

LKuemmel commented Sep 28, 2026 •

edited

Loading

Brett-S-OWB Oct 1, 2026 •

edited

Loading