Skip to content

LiveStatus View #2248

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

Closed
MartinRinas wants to merge 2 commits into from
Closed

LiveStatus View #2248

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
4c9e901
livestatus view
MartinRinas Mar 7, 2025
61d0307
remove tooltip, to be added later with daily yield
MartinRinas Mar 7, 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
7 changes: 7 additions & 0 deletions packages/modules/web_themes/koala/source/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/modules/web_themes/koala/source/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"build": "quasar build"
},
"dependencies": {
"@mdi/js": "^7.4.47",
"@quasar/extras": "^1.16.12",
"chart.js": "^4.4.8",
"chartjs-adapter-luxon": "^1.3.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/modules/web_themes/koala/source/src/components/ChartCarousel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import { ref } from 'vue';
import { useQuasar } from 'quasar';
import EnergyFlowChart from './charts/energyFlowChart/EnergyFlowChart.vue';
import HistoryChart from './charts/historyChart/HistoryChart.vue';
import LiveStatus from './charts/livestatus/LiveStatus.vue';

defineOptions({
name: 'ChartCarousel',
Expand All @@ -68,6 +69,10 @@ const chartCarouselItems = [
name: 'HistoryChart',
component: HistoryChart,
},
{
name: 'LiveStatus',
component: LiveStatus,
},
];
const currentSlide = ref<string>(chartCarouselItems[0].name);
</script>
Expand Down
240 changes: 240 additions & 0 deletions packages/modules/web_themes/koala/source/src/components/charts/livestatus/LiveStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
<template>
<div class="custom-width">
<div class="card-container">
<!-- PV Card -->
<q-card v-if="hasPV" class="item pv" flat>
<div class="header">PV</div>
<div class="row">
<div class="col text-value">
{{ formatValue(pvPower*-1) }}W
</div>
<div class="col icon-container">
<q-badge rounded class="pv-background">
<q-icon name="solar_power" style="font-size: 24px;" class="pv-color" />
</q-badge>
</div>
</div>
</q-card>

<!-- Grid Card -->
<q-card class="item grid" flat>
<div class="header" >Netz</div>
<div class="row">
<div class="col text-value" >
{{ formatValue(gridPower) }}W
</div>
<div class="col icon-container">
<q-badge rounded class="grid-background">
<q-icon :name="mdiTransmissionTower" style="font-size: 24px;" class="grid-color"/>
</q-badge>
</div>
</div>

</q-card>

<!-- House Card -->
<q-card class="item house" flat>
<div class="header" >Haus</div>
<div class="row">
<div class="col text-value">
{{ formatValue(homePower)}}W
</div>
<div class="col icon-container">
<q-badge rounded class="house-background">
<q-icon name="home" style="font-size: 24px;" class="house-color" />
</q-badge>
</div>
</div>
</q-card>

<!-- Battery Card -->
<q-card v-if="hasBattery" class="item battery" flat>
<div class="header" >Speicher</div>
<div class="row">
<div class="col text-value" style="font-size: 14px;">
{{ formatValue(batteryPower) }}W<br />
{{ (batterySoc * 100).toFixed(0) }}%
</div>
<div class="col icon-container">
<q-badge rounded class="battery-background">
<q-icon name="battery_charging_full" style="font-size: 24px;" class="battery-color" />
</q-badge>
</div>
</div>
</q-card>

<!-- EV Card -->
<q-card class="item ev" flat>
<div class="header">Ladepunkte</div>
<div class="row">
<div class="col text-value">
{{ formatValue(evPower) }}W
</div>
<div class="col icon-container">
<q-badge rounded class="ev-background">
<q-icon name="ev_station" style="font-size: 24px;" class="ev-color" />
</q-badge>
</div>
</div>
</q-card>
</div>

</div>
</template>

<script setup lang="ts">
import { onMounted, computed } from 'vue';
import { QCard, QIcon } from 'quasar';
import { useMqttStore } from 'src/stores/mqtt-store';
import { mdiTransmissionTower} from '@mdi/js';

const mqttStore = useMqttStore();

const gridPower = computed(
() => mqttStore.getGridPower('value') as number,
);

const hasBattery = computed(
() => mqttStore.batteryConfigured as boolean,
);

const hasPV = computed(
() => mqttStore.getPvConfigured as boolean,
);

const batteryPower = computed(() => mqttStore.batteryTotalPower('value') as number);
const batterySoc = computed(() => Number(mqttStore.batterySocTotal) / 100);
const homePower = computed(
() => mqttStore.getHomePower('value') as number,
);
const pvPower = computed(() => mqttStore.getPvPower('value') as number);
const evPower = computed(() => mqttStore.chargePointSumPower('value') as number);

const formatValue = (value: number) => {
if (Math.abs(value) >= 1000) {
return (value / 1000).toFixed(1) + 'k';
}
return value.toString();
};

onMounted(() => {
//const interval = setInterval(fetchData, 5000);
//onUnmounted(() => clearInterval(interval));
});
</script>

<style scoped>
.card-container {
display: flex;
flex-wrap: wrap;
justify-content: space-around;
gap: 10px;
}

.item {
flex: 1 1 calc(50% - 20px); /* Adjust the width of the cards */
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
padding: 5px;
}

.item.pv {
flex: 1 1 100%; /* Make the PV card span the entire row */
border-left: 8px solid var(--pv-color); /* Add left border with pv-color */
}

.item.grid {
border-left: 8px solid var(--grid-color);
}

.item.house {
border-left: 8px solid var(--house-color);
}

.item.battery {
border-left: 8px solid var(--battery-color);
}

.item.ev {
border-left: 8px solid var(--ev-color);
}

.header {
font-size: 14px;
color: #888;
text-align: left;
width: 100%;
}

.row {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}

.text-value {
font-size: 24px;
font-weight: bold;
text-align: left;
}

.icon-container {
display: flex;
justify-content: flex-end;
align-items: center;
}

.q-icon {
font-size: 20px;
}

.custom-width {
width: 100%;
max-width: 600px;
margin: 0 auto; /* Center the card horizontally */
}

/* Define color classes */
.pv-background {
background-color: var(--pv-background);
}

.pv-color {
color: var(--pv-color);
}

.grid-background {
background-color: var(--grid-background);
}

.grid-color {
color: var(--grid-color);
}

.house-background {
background-color: var(--house-background);
}

.house-color {
color: var(--house-color);
}

.battery-background {
background-color: var(--battery-background);
}

.battery-color {
color: var(--battery-color);
}

.ev-background {
background-color: var(--ev-background);
}

.ev-color {
color: var(--ev-color);
}
</style>
34 changes: 27 additions & 7 deletions packages/modules/web_themes/koala/source/src/css/quasar.variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ $battery: #ba7128;
background-color: var(--q-background-1);
// Text color
color: var(--q-brown-text);
--pv-color: green;
--grid-color: #a33c42;
--house-color: #949aa1;
--battery-color: #b5a647;
--ev-color: #4766b5;
--pv-background: rgba(144, 238, 144, 0.2);
--grid-background: rgba(239, 182, 188, 0.2);
--house-background: rgba(148, 154, 161, 0.2);
--battery-background: rgba(181, 166, 71, 0.2);
--ev-background: rgba(71, 102, 181, 0.2);
.theme-text {
color: var(--q-brown-text) !important;
}
Expand Down Expand Up @@ -112,9 +122,9 @@ $battery: #ba7128;
background-color: var(--q-background-2);
}
// Slide background
.q-card {
background-color: var(--q-secondary);
}
//.q-card {
// background-color: var(--q-secondary);
//}
// Expansion item (expand arrow)
.q-expansion-item__toggle-icon {
color: var(--q-white);
Expand Down Expand Up @@ -169,6 +179,16 @@ $dark-tab-icon: #d7d9e0;
background-color: $dark-page;
// Text color
color: var(--q-white);
--pv-color: green;
--grid-color: #a33c42;
--house-color: #949aa1;
--battery-color: #b5a647;
--ev-color: #4766b5;
--pv-background: rgba(144, 238, 144, 0.2);
--grid-background: rgba(239, 182, 188, 0.2);
--house-background: rgba(148, 154, 161, 0.2);
--battery-background: rgba(181, 166, 71, 0.2);
--ev-background: rgba(71, 102, 181, 0.2);
.theme-text {
color: var(--q-white) !important;
}
Expand Down Expand Up @@ -226,10 +246,10 @@ $dark-tab-icon: #d7d9e0;
color: var(--q-white);
}
// Slide background
.q-card {
background-color: var(--q-secondary);
color: var(--q-white);
}
//.q-card {
// background-color: var(--q-secondary);
// color: var(--q-white);
//}
// Input field text label color
.q-field__label {
color: var(--q-white);
Expand Down
Loading