Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ export default {
this.updateChargePointChargeTemplate(this.chargePointId, modeId, "chargemode.selected");
}
},
setChargePointConnectedVehiclePriority(priority) {
if (priority != this.mqttStore.getChargePointConnectedVehiclePriority(this.chargePointId)) {
this.updateChargePointChargeTemplate(this.chargePointId, priority, "prio");
}
},
},
}
</script>
Expand Down Expand Up @@ -99,41 +94,6 @@ export default {
</i-button>
</i-button-group>
</i-form-group>
<i-form-group>
<i-form-label>Priorität</i-form-label>
<i-button-group block>
<i-button
size="lg"
class="large-button"
:color="
mqttStore.getChargePointConnectedVehiclePriority(
chargePointId,
) !== true
? 'danger'
: ''
"
@click="
setChargePointConnectedVehiclePriority(false)
"
>
Nein
</i-button>
<i-button
:color="
mqttStore.getChargePointConnectedVehiclePriority(
chargePointId,
) === true
? 'success'
: ''
"
@click="
setChargePointConnectedVehiclePriority(true)
"
>
Ja
</i-button>
</i-button-group>
</i-form-group>
</i-form>
</i-modal>
<!-- end charge mode only-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,19 +245,6 @@ export default {
{{
mqttStore.getChargePointConnectedVehicleChargeMode(chargePointId)?.label
}}
<font-awesome-icon
fixed-width
:icon="
mqttStore.getChargePointConnectedVehiclePriority(chargePointId)
? ['fas', 'fa-star']
: ['far', 'fa-star']
"
:class="
mqttStore.getChargePointConnectedVehiclePriority(chargePointId)
? '_color:warning'
: ''
"
/>
</i-badge>
</i-column>
<i-column
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,6 @@ export default {
:style="{ color: mqttStore.getChargePointConnectedVehicleColor(chargePointId) }"
/>
{{ mqttStore.getChargePointConnectedVehicleName(chargePointId) }}
<font-awesome-icon
class="_padding-left:1"
fixed-width
:icon="
mqttStore.getChargePointConnectedVehiclePriority(chargePointId)
? ['fas', 'fa-star']
: ['far', 'fa-star']
"
:class="
mqttStore.getChargePointConnectedVehiclePriority(chargePointId)
? '_color:warning'
: ''
"
/>
</i-button>
<!-- SoC -->
<i-button
Expand Down
10 changes: 0 additions & 10 deletions packages/modules/display_themes/cards/source/src/stores/mqtt.js
Original file line number Diff line number Diff line change
Expand Up @@ -651,16 +651,6 @@ export const useMqttStore = defineStore("mqtt", {
return undefined;
};
},
getChargePointConnectedVehiclePriority(state) {
return (chargePointId) => {
if (state.getChargePointConnectedVehicleChargeTemplate(chargePointId)) {
return state.getChargePointConnectedVehicleChargeTemplate(
chargePointId,
).prio;
}
return undefined;
};
},
getChargePointConnectedVehicleInfo(state) {
Comment thread
benderl marked this conversation as resolved.
return (chargePointId) => {
return state.topics[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ export default {
this.updateChargePointChargeTemplate(id, event, "chargemode.selected");
}
},
setChargePointConnectedVehiclePriority(id, event) {
if (event != this.mqttStore.getChargePointConnectedVehiclePriority(id)) {
this.updateChargePointChargeTemplate(id, event, "prio");
}
},
setChargePointConnectedVehicleTimeChargingActive(id, event) {
if (
event !=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
class="col"
:charge-point-id="Number(props.chargePointId)"
/>
<ChargePointPriority
class="col-auto"
:charge-point-id="props.chargePointId"
/>
</q-card-section>
<q-card-section>
<ChargePointModeButtons :charge-point-id="props.chargePointId" />
Expand Down Expand Up @@ -129,7 +125,6 @@ import { useMqttStore } from 'src/stores/mqtt-store';
import SliderDouble from './SliderDouble.vue';
import ChargePointLock from './ChargePointLock.vue';
import ChargePointStateIcon from './ChargePointStateIcon.vue';
import ChargePointPriority from './ChargePointPriority.vue';
import ChargePointModeButtons from './ChargePointModeButtons.vue';
import BaseMessage from './BaseMessage.vue';
import BaseFaultMessage from './BaseFaultMessage.vue';
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@
/>
</div>
</div>
<div class="row items-center justify-between q-mt-sm">
<div class="text-subtitle2">Priorität</div>
<ChargePointPriority
:charge-point-id="props.chargePointId"
:readonly="false"
dense
/>
</div>
<q-separator class="q-mt-sm" />
<div class="row items-center no-wrap">
<ChargePointModeButtons :charge-point-id="props.chargePointId" />
Expand Down Expand Up @@ -81,7 +73,6 @@ import ChargePointPvSettings from './ChargePointPvSettings.vue';
import ChargePointEcoSettings from './ChargePointEcoSettings.vue';
import ChargePointScheduledSettings from './ChargePointScheduledSettings.vue';
import ChargePointTimeChargingSettings from './ChargePointTimeChargingSettings.vue';
import ChargePointPriority from './ChargePointPriority.vue';
import ChargePointLock from './ChargePointLock.vue';
import ChargePointModeButtons from './ChargePointModeButtons.vue';
import ChargePointVehicleSelect from './ChargePointVehicleSelect.vue';
Expand Down
23 changes: 0 additions & 23 deletions packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2040,28 +2040,6 @@ export const useMqttStore = defineStore('mqtt', () => {
});
};

/**
* Get or set the charge point connected vehicle charge priority identified by the charge point id
* @param chargePointId charge point id
* @returns boolean | undefined
*/
const chargePointConnectedVehiclePriority = (chargePointId: number) => {
return computed({
get() {
return chargePointConnectedVehicleChargeTemplate(chargePointId).value
?.prio;
},
set(newValue: boolean) {
return updateTopic(
`openWB/chargepoint/${chargePointId}/set/charge_template`,
newValue,
'prio',
true,
);
},
});
};

/**
* Get or set the charge point connected vehicle time charging identified by the charge point id
* @param chargePointId charge point id
Expand Down Expand Up @@ -4893,7 +4871,6 @@ export const useMqttStore = defineStore('mqtt', () => {
chargePointConnectedVehicleEcoChargeLimitSoC,
chargePointConnectedVehicleEcoChargeLimitEnergy,
chargePointConnectedVehicleEcoChargeMaxPrice,
chargePointConnectedVehiclePriority,
chargePointConnectedVehicleTimeCharging,
chargePointConnectedVehicleChargeTemplate,
chargePointConnectedVehicleBidiEnabled,
Expand Down
15 changes: 0 additions & 15 deletions packages/modules/web_themes/standard_legacy/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -520,21 +520,6 @@
</label>
</div>
</div>
<!-- Priorität -->
<div class="form-row mb-1">
<div class="col">
<i class="fas fa-star"></i>
Priorität
</div>
<div class="col-md-8 text-right">
<input class="charge-point-vehicle-priority" type="checkbox" data-toggle="toggle"
data-topic="openWB/set/chargepoint/<cp>/set/charge_template"
data-object="chargeTemplate"
data-object-path="prio"
data-on="Ja" data-off="Nein" data-onstyle="success" data-offstyle="danger" data-size="sm"
data-style="w-100">
</div>
</div>
<div class="charge-point-charge-mode-options mb-0 hide">
<!-- Zeit -->
<div class="chargemode-options chargemode-option-instant_charging chargemode-option-pv_charging chargemode-option-scheduled_charging chargemode-option-eco_charging">
Expand Down
Loading