Skip to content

first monthly chart #119

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
May 17, 2022
Merged

first monthly chart #119

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
7 changes: 7 additions & 0 deletions src/components/OpenwbPageNavbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,13 @@
>
Tagesauswertung
</router-link>
<router-link
to="/Logging/MonthlyChart"
class="dropdown-item"
active-class="active disabled"
>
Monatsauswertung
</router-link>
</div>
</li>
<li v-if="nodeEnv !== 'production'" class="nav-item dropdown">
Expand Down
12 changes: 12 additions & 0 deletions src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,18 @@ const routes = [
"../views/DailyGraph.vue"
),
},
{
path: "/Logging/MonthlyChart",
name: "DailyChart",
meta: {
heading: "Monatsauswertung",
},
component: () =>
import(
/* webpackChunkName: "MonthlyChart" */
"../views/MonthlyChart.vue"
),
},
];
/* examples for development only start here */
if (process.env.NODE_ENV !== "production") {
Expand Down
39 changes: 34 additions & 5 deletions src/views/DailyGraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,19 @@
<LineChart :chartData="chartData" :options="chartOptions" />
</openwb-base-card>
<openwb-base-card
title="Tagessummen (Test)"
title="Tagessummen"
:collapsible="true"
:collapsed="true"
>
<pre>{{ JSON.stringify(chartTotals, undefined, 2) }}</pre>
<openwb-base-number-input
v-for="(element, elementKey) in chartTotals"
:key="elementKey"
:title="element.label"
readonly
class="text-right"
unit="kWh"
:model-value="element.value"
/>
</openwb-base-card>
</div>
</form>
Expand Down Expand Up @@ -619,7 +627,20 @@ export default {
}
break;
case "cp":
label = "Ladepunkte (Summe)";
label = "Ladepunkte";
switch (elementKey) {
case "imported":
label += " (Ladung, Summe)";
break;
case "exported":
label += " (Entladung, Summe)";
break;
case "soc":
label += " SoC (Summe)";
break;
default:
label += " (Summe)";
}
break;
}
} else {
Expand Down Expand Up @@ -670,8 +691,16 @@ export default {
break;
case "cp":
label = this.$store.state.mqtt[objectTopic].name;
if (elementKey == "soc") {
label += " SoC";
switch (elementKey) {
case "imported":
label += " (Ladung)";
break;
case "exported":
label += " (Entladung)";
break;
case "soc":
label += " SoC";
break;
}
break;
case "ev":
Expand Down
Loading