Skip to content

minor fixes #69

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
merged 2 commits into from
Jan 20, 2022
Merged

minor fixes #69

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
96768ba
display component/chargepoint id
Jan 20, 2022
d13e66f
fix energy limit step size
Jan 20, 2022
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
58 changes: 36 additions & 22 deletions src/views/ChargePointInstallation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
>
Wollen Sie den Ladepunkt "{{
getChargePointName(modalChargePointIndex)
}}" wirklich entfernen? Dieser Vorgang kann nicht rückgängig gemacht
werden!
}}" (ID: {{ modalChargePointIndex }}) wirklich entfernen? Dieser Vorgang
kann nicht rückgängig gemacht werden!
</openwb-base-modal-dialog>
<openwb-base-modal-dialog
:show="showChargePointTemplateModal"
Expand All @@ -23,8 +23,8 @@
>
Wollen Sie die Ladepunkt-Vorlage "{{
getChargePointTemplateName(modalChargePointTemplateIndex)
}}" wirklich entfernen? Dieser Vorgang kann nicht rückgängig gemacht
werden!
}}" (ID: {{ modalChargePointTemplateIndex }}) wirklich entfernen? Dieser
Vorgang kann nicht rückgängig gemacht werden!
</openwb-base-modal-dialog>
<openwb-base-modal-dialog
:show="showChargePointTemplateAutolockPlanModal"
Expand Down Expand Up @@ -92,7 +92,12 @@
installedChargePoint, installedChargePointKey
) in installedChargePoints"
:key="installedChargePointKey"
:title="installedChargePoint.name"
:title="
installedChargePoint.name +
' (ID: ' +
installedChargePoint.id +
')'
"
:collapsible="true"
:collapsed="true"
subtype="primary"
Expand Down Expand Up @@ -135,6 +140,13 @@
)
"
/>
<openwb-base-text-input
title="Ladepunkt-Typ"
readonly
:model-value="
$store.state.mqtt[installedChargePointKey].type
"
/>
<hr />
<openwb-base-text-input
title="Verbindungsmodul"
Expand Down Expand Up @@ -303,7 +315,12 @@
chargePointTemplate, chargePointTemplateKey
) in chargePointTemplates"
:key="chargePointTemplateKey"
:title="chargePointTemplate.name"
:title="
chargePointTemplate.name +
' (ID: ' +
getChargePointTemplateIndex(chargePointTemplateKey) +
')'
"
:collapsible="true"
:collapsed="true"
subtype="primary"
Expand Down Expand Up @@ -774,10 +791,10 @@ export default {
},
getChargePointName(chargePointIndex) {
return this.$store.state.mqtt[
"openWB/chargepoint/" + chargePointIndex
"openWB/chargepoint/" + chargePointIndex + "/config"
]
? this.$store.state.mqtt[
"openWB/chargepoint/" + chargePointIndex
"openWB/chargepoint/" + chargePointIndex + "/config"
].name
: "Ladepunkt " + chargePointIndex;
},
Expand All @@ -799,13 +816,15 @@ export default {
data: {},
});
},
getChargePointTemplateIndex(chargePointTemplate) {
// get trailing characters as index
return parseInt(chargePointTemplate.match(/([^/]+)$/)[0]);
},
removeChargePointTemplateModal(chargePointTemplate, event) {
// prevent further processing of the click event
event.stopPropagation();
// get trailing characters as index
this.modalChargePointTemplateIndex = parseInt(
chargePointTemplate.match(/([^/]+)$/)[0]
);
this.modalChargePointTemplateIndex =
this.getChargePointTemplateIndex(chargePointTemplate);
this.showChargePointTemplateModal = true;
},
removeChargePointTemplate(chargePointTemplateIndex, event) {
Expand All @@ -828,10 +847,8 @@ export default {
console.info(
"requesting new charge point template autolock plan..."
);
// get trailing characters as index
let chargePointTemplateIndex = parseInt(
chargePointTemplate.match(/([^/]+)$/)[0]
);
let chargePointTemplateIndex =
this.getChargePointTemplateIndex(chargePointTemplate);
this.$emit("sendCommand", {
command: "addAutolockPlan",
data: { template: chargePointTemplateIndex },
Expand All @@ -844,10 +861,8 @@ export default {
) {
// prevent further processing of the click event
event.stopPropagation();
// get trailing characters as index
this.modalChargePointTemplateIndex = parseInt(
chargePointTemplate.match(/([^/]+)$/)[0]
);
this.modalChargePointTemplateIndex =
this.getChargePointTemplateIndex(chargePointTemplate);
this.modalChargePointTemplateAutolockPlanIndex = parseInt(
autolockPlan.match(/([^/]+)$/)[0]
);
Expand Down Expand Up @@ -892,9 +907,8 @@ export default {
: "Autolock Zeitplan " + templateIndex + "/" + planIndex;
},
getChargePointTemplateAutolockPlans(chargePointTemplate) {
// get trailing characters as index
let chargePointTemplateIndex =
chargePointTemplate.match(/([^/]+)$/)[0];
this.getChargePointTemplateIndex(chargePointTemplate);
let result = this.getWildcardTopics(
"openWB/chargepoint/template/" +
chargePointTemplateIndex +
Expand Down
2 changes: 1 addition & 1 deletion src/views/Status.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
:key="installedChargePointKey"
:title="
installedChargePoint.name +
' (Ladepunkt ' +
' (ID: ' +
getChargePointIndex(installedChargePointKey) +
')'
"
Expand Down
2 changes: 1 addition & 1 deletion src/views/VehicleConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@
title="Energie-Limit"
unit="kWh"
:min="5"
:step="5"
:step="1"
:model-value="
template.chargemode.instant_charging.limit
.amount
Expand Down