diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue b/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue index 41a06989f8..4ed5f360b8 100644 --- a/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue +++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue @@ -127,17 +127,15 @@ v-if="etData.active" heading="Strompreis:" class="grid-col-4 grid-left" + @click="showRawPrice = !showRawPrice" > - {{ etData.etCurrentPriceString }} + + {{ currentPriceToShow }} + {{ - props.chargepoint.etActive - ? (Math.round(props.chargepoint.etMaxPrice * 10) / 10).toFixed(1) + - priceUnit - : '-' - }} + >{{ maxPriceToShow }} { const priceUnit = computed(() => { return globalData.country === 'ch' ? ' Rp' : ' ct' }) +const currentPriceToShow = computed(() => { + return showRawPrice.value + ? etData.etCurrentPriceStringDetailed + : etData.etCurrentPriceString +}) +const maxPriceToShow = computed(() => { + return showRawPrice.value + ? props.chargepoint.etMaxPrice + priceUnit.value + : (Math.round(props.chargepoint.etMaxPrice * 10) / 10).toFixed(1) + + priceUnit.value +}) //methods function loadSoc() { updateServer('socUpdate', 1, props.chargepoint.connectedVehicle) diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts b/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts index b528d26f2b..f041eaeeac 100755 --- a/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts +++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts @@ -599,7 +599,6 @@ export const topVehicles = computed(() => { } */ /*else if (result.length == 1) { result.push(-1) }*/ - console.log(result) return result }) export const chargeLimitModes = [ diff --git a/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue b/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue index 9d0fb0b68b..4374d17ab6 100644 --- a/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue +++ b/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue @@ -35,7 +35,10 @@ -
+
{{ device.faultText }}
diff --git a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts index b97db227cd..aa4d689888 100644 --- a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts +++ b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts @@ -31,6 +31,12 @@ function processConsumerDeviceMessages(topic: string, message: string) { try { const moduleData = JSON.parse(message) if (moduleData) { + console.log( + 'Consumer module data for consumer ' + + index + + ' received: ' + + JSON.stringify(moduleData), + ) dev.name = moduleData.name dev.icon = moduleData.name } @@ -43,6 +49,12 @@ function processConsumerDeviceMessages(topic: string, message: string) { try { const usage = JSON.parse(message) if (usage) { + console.log( + 'Consumer usage data for consumer ' + + index + + ' received: ' + + JSON.stringify(usage), + ) dev.usage = usage } } catch (e) { diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue index 51ef2f8f47..d20fa2a46c 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue @@ -3,7 +3,7 @@
{{ graphData.errors[0] }} - ({{ graphData.errors.length - 1 }} weitere Fehlermeldungen)
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts b/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts index 9fe46a10ed..84ee823c71 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts @@ -26,7 +26,8 @@ export function processDayGraphMessages(topic: string, message: string) { totals: energyValues, message: errorTextBlock, } = JSON.parse(message) - graphData.errors = errorTextBlock.split('\n') + const errorTextBlockTemp = '' + graphData.errors = errorTextBlockTemp.split('\n') itemNames.value = new Map(Object.entries(itemNames2)) resetHistoricData() gridCounters = [] diff --git a/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts b/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts index f03756a60e..5433ed06b9 100755 --- a/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts +++ b/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts @@ -21,6 +21,15 @@ class EtData { } } + get etCurrentPriceStringDetailed() { + if (this.etPriceList.size > 0) { + const [p] = this.etPriceList.values() + return p + (globalData.country === 'ch' ? ' Rp' : ' ct') + } else { + return '---' + } + } + maxPriceForDuration(durationMinutes: number, maxTime?: Date): number { if (this.etPriceList.size > 0) { const plist = maxTime