Skip to content

add daily graph labels #106

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 1 commit into from
Apr 21, 2022
Merged

add daily graph labels #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ requireComponent.keys().forEach((fileName) => {
)
);

console.debug("global registering of component", componentName);
// console.debug("global registering of component", componentName);
vApp.component(
componentName,
// Look for the component options on `.default`, which will
Expand Down
88 changes: 75 additions & 13 deletions src/views/DailyGraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<openwb-base-alert v-if="!chartDataHasEntries" subtype="info">
Es konnten keine Einträge für dieses Datum gefunden werden.
</openwb-base-alert>
<openwb-base-card v-else title="Demo-Diagramm">
<openwb-base-card v-else title="Tages-Diagramm">
<LineChart :chartData="chartData" :options="chartOptions" />
</openwb-base-card>
</div>
Expand Down Expand Up @@ -75,6 +75,9 @@ export default {
mqttTopicsToSubscribe: [
"openWB/general/extern",
"openWB/log/daily/#",
"openWB/system/device/+/component/+/config",
"openWB/chargepoint/+/config",
"openWB/vehicle/+/name",
],
currentDay: "",
dailyGraphRequestData: {
Expand Down Expand Up @@ -292,6 +295,7 @@ export default {
// color: fontColor
},
grid: {
display: false,
// color: gridSocColor,
},
ticks: {
Expand Down Expand Up @@ -478,41 +482,100 @@ export default {
},
},
methods: {
getDatasetLabel(baseObject, objectKey, elementKey, datasetKey) {
// console.log(
// "getDatasetLabel",
// baseObject,
// objectKey,
// elementKey,
// datasetKey
// );
var label = "*" + datasetKey;
if (objectKey == "all") {
switch (baseObject) {
case "pv":
label = "PV Summe";
break;
case "bat":
label = "Speicher ";
switch (elementKey) {
case "power":
label += "Summe";
break;
case "soc":
label += "SoC Summe";
break;
}
break;
case "cp":
label = "Ladepunkte Summe";
break;
}
} else {
var objectId = objectKey.match(/\d+$/);
var topic = "";
switch (baseObject) {
case "cp":
topic = "openWB/chargepoint/" + objectId + "/config";
break;
case "ev":
topic = "openWB/vehicle/" + objectId + "/name";
break;
default:
topic =
"openWB/system/device/+/component/" +
objectId +
"/config";
}
var objectTopic = Object.keys(this.getWildcardTopics(topic))[0];
switch (baseObject) {
case "pv":
case "counter":
case "bat":
case "cp":
label = this.$store.state.mqtt[objectTopic].name;
if (elementKey == "soc") {
label += " SoC";
}
break;
case "ev":
label = this.$store.state.mqtt[objectTopic];
break;
}
}
return label;
},
getDatasetIndex(datasetKey) {
let index = this.chartDatasets.datasets.findIndex((dataset) => {
return dataset.jsonKey == datasetKey;
});
if (index != -1) {
console.debug(
"index for dataset '" + datasetKey + "': " + index
);
return index;
}
console.debug("no index found for '" + datasetKey + "'");
return;
},
addDataset(baseObject, objectKey, elementKey, datasetKey) {
console.log(
console.debug(
"adding new dataset",
baseObject,
objectKey,
elementKey,
datasetKey
);
// var datasetTemplate = datasetId.replace(/\d/g, "");
var datasetTemplate = baseObject + "-" + elementKey;
console.debug(
"template name: " + datasetTemplate + " key: " + datasetKey
);
if (this.datasetTemplates[datasetTemplate]) {
var newDataset = JSON.parse(
JSON.stringify(this.datasetTemplates[datasetTemplate])
);
newDataset.parsing.yAxisKey = datasetKey;
newDataset.jsonKey = datasetKey;
newDataset.data = this.chartDataObject;
newDataset.label = datasetKey;
console.log("adding new dataset", newDataset);
newDataset.label = this.getDatasetLabel(
baseObject,
objectKey,
elementKey,
datasetKey
);
return this.chartDatasets.datasets.push(newDataset) - 1;
} else {
console.warn(
Expand Down Expand Up @@ -543,7 +606,6 @@ export default {
return;
} else {
this.chartDatasets.datasets = [];
console.log(this.dailyGraphRequestData);
this.$emit("sendCommand", {
command: "getDailyLog",
data: this.commandData,
Expand Down