Skip to content

Koala - add schedule plan info box (next scheduled charging session) to scheduled plan input dialog #3067

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

Merged
benderl merged 2 commits into from
Dec 22, 2025
Merged

Koala - add schedule plan info box (next scheduled charging session) to scheduled plan input dialog #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e5464
Scheduled plan input dialog - add next charge session as info-box
Brett-S-OWB Dec 19, 2025
b1e06ff
Formatting changes
Brett-S-OWB Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 5 additions & 131 deletions packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,17 @@
:color="planActive.value ? 'positive' : 'negative'"
@click="$emit('editPlan', plan)"
>
<div class="column">
<div class="plan-name">{{ plan.name }}</div>
<div class="plan-details">
<div>
<q-icon
:name="
plan.frequency.selected === 'once'
? 'today'
: plan.frequency.selected === 'daily'
? 'date_range'
: 'calendar_month'
"
size="sm"
:title="
plan.frequency.selected === 'once'
? 'Einmalig'
: plan.frequency.selected === 'daily'
? 'Täglich'
: 'Wöchentlich'
"
/>
<div v-if="plan.frequency.selected === 'once'">
{{ formattedDate }}
</div>
<div v-if="plan.frequency.selected === 'weekly'">
{{ selectedWeekDays }}
</div>
<div v-if="plan.frequency.selected === 'daily'">täglich</div>
</div>
<div>
<q-icon name="schedule" size="sm" />
<div>{{ plan.time }}</div>
</div>
<div>
<q-icon
:name="plan.limit.selected === 'soc' ? 'battery_full' : 'bolt'"
size="sm"
/>
<div v-if="plan.limit.selected === 'soc'">
{{ plan.limit.soc_scheduled }}%
<q-icon
:name="
plan.bidi_charging_enabled ? 'sync_alt' : 'arrow_right_alt'
"
size="sm"
/>
{{ plan.limit.soc_limit }}%
</div>
<div v-if="plan.limit.selected === 'amount'">
{{ plan.limit.amount ? plan.limit.amount / 1000 : '' }}kWh
</div>
</div>
<div>
<q-icon v-if="planEtActive.value" name="bar_chart" size="sm" />
</div>
</div>
</div>
<ChargePointScheduledPlanSummary
:charge-point-id="props.chargePointId"
:plan="props.plan"
/>
</q-btn>
</template>

<script setup lang="ts">
import { computed } from 'vue';
import { useMqttStore } from 'src/stores/mqtt-store';
import ChargePointScheduledPlanSummary from './ChargePointScheduledPlanSummary.vue';
import { type ScheduledChargingPlan } from '../stores/mqtt-store-model';

const props = defineProps<{
Expand All @@ -78,84 +26,10 @@ const props = defineProps<{

const mqttStore = useMqttStore();

const weekdays = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'];

const planActive = computed(() =>
mqttStore.vehicleScheduledChargingPlanActive(
props.chargePointId,
props.plan.id,
),
);

const planEtActive = computed(() =>
mqttStore.vehicleScheduledChargingPlanEtActive(
props.chargePointId,
props.plan.id,
),
);

const selectedWeekDays = computed(() => {
let planDays: string[] = [];
let rangeStart: number | null = null;

props.plan.frequency.weekly.forEach((dayValue, index) => {
if (dayValue) {
if (rangeStart === null) {
rangeStart = index;
}
} else {
if (rangeStart !== null) {
if (rangeStart === index - 1) {
planDays.push(weekdays[rangeStart]);
} else {
planDays.push(`${weekdays[rangeStart]}-${weekdays[index - 1]}`);
}
rangeStart = null;
}
}
});

// Handle the case where the last day(s) of the week are true
if (rangeStart !== null) {
if (rangeStart === props.plan.frequency.weekly.length - 1) {
planDays.push(weekdays[rangeStart]);
} else {
planDays.push(
`${weekdays[rangeStart]}-${weekdays[props.plan.frequency.weekly.length - 1]}`,
);
}
}

return planDays.join(', ');
});

const formattedDate = computed(() => {
if (props.plan.frequency.once === undefined) return '-';
const date = new Date(props.plan.frequency.once);
return date.toLocaleDateString(undefined, {
day: '2-digit',
month: '2-digit',
year: 'numeric',
});
});
</script>

<style scoped lang="scss">
.plan-name {
font-weight: bold;
}

.plan-details {
display: flex;
justify-content: center;
}

.plan-details > div {
display: flex;
align-items: center;
}

.plan-details > div:not(:last-child) {
margin-right: #{map-get($space-sm, x)};
}
</style>
45 changes: 15 additions & 30 deletions packages/modules/web_themes/koala/source/src/components/ChargePointScheduledPlanDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
<q-input
v-else
class="q-mr-lg col"
:model-value="
planFrequency.value === 'daily' ? today : firstSelectedWeekday
"
:model-value="undefined"
type="date"
label="Ziel-Datum"
readonly
disable
/>
<q-input
v-model="planTime.value"
Expand All @@ -89,6 +89,17 @@
class="col"
/>
</div>
<div
class="row q-mt-sm q-pa-sm text-white no-wrap items-center bg-primary"
style="border-radius: 10px"
>
<q-icon name="info" size="sm" class="q-mr-xs" />
<ChargePointScheduledPlanSummary
:charge-point-id="props.chargePointId"
:plan="props.plan"
mode="info"
/>
</div>
</div>
<q-separator />
<SliderStandard
Expand Down Expand Up @@ -238,6 +249,7 @@ import { useQuasar } from 'quasar';
import SliderStandard from './SliderStandard.vue';
import ToggleStandard from './ToggleStandard.vue';
import { computed } from 'vue';
import ChargePointScheduledPlanSummary from './ChargePointScheduledPlanSummary.vue';
import { type ScheduledChargingPlan } from '../stores/mqtt-store-model';

const props = defineProps<{
Expand All @@ -249,12 +261,6 @@ const emit = defineEmits(['close']);
const mqttStore = useMqttStore();
const $q = useQuasar();

const formatDateDayMonthYear = (dateString: string): string => {
if (!dateString) return '';
const [year, month, day] = dateString.split('-');
return `${day}.${month}.${year}`;
};
const today = formatDateDayMonthYear(new Date().toISOString().split('T')[0]);
const weekDays = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'];

const selectDay = (index: number) => {
Expand All @@ -263,27 +269,6 @@ const selectDay = (index: number) => {
selectedWeekDays.value = newArray;
};

const firstSelectedWeekday = computed(() => {
const today = new Date();
// 0=Sonntag, ..., 6=Samstag >> 0=Montag, ..., 6=Sonntag
const todayIndex = (today.getDay() + 6) % 7;
const userSelection = selectedWeekDays.value
.map((isSelected, index) => (isSelected ? index : -1))
.filter((index) => index !== -1);
if (userSelection.length === 0) return '';
// For all selected days, calculate the distance to today
const daysUntilSelected = userSelection.map((idx) => {
let daysUntil = idx - todayIndex;
if (daysUntil < 0) daysUntil += 7;
return daysUntil;
});
// Take the smallest distance (this is the next day)
const nearestDay = Math.min(...daysUntilSelected);
const dateNextDay = new Date(today);
dateNextDay.setDate(today.getDate() + nearestDay);
return formatDateDayMonthYear(dateNextDay.toISOString().split('T')[0]);
});

const phaseOptions = [
{ value: 1, label: '1' },
{ value: 3, label: 'Maximum' },
Expand Down
Loading