diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/cpSimpleList/CpsListItem2.vue b/packages/modules/web_themes/colors/source/src/components/chargePointList/cpSimpleList/CpsListItem2.vue
index c09fefd349..623dbc65de 100755
--- a/packages/modules/web_themes/colors/source/src/components/chargePointList/cpSimpleList/CpsListItem2.vue
+++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/cpSimpleList/CpsListItem2.vue
@@ -170,7 +170,7 @@ const statusColor = computed(() => {
const modeStyle = computed(() => {
switch (props.chargepoint.chargeMode) {
case 'stop':
- return { 'background-color': 'var(--fg)' }
+ return { 'background-color': 'var(--color-input)' }
default:
return {
'background-color': chargemodes[props.chargepoint.chargeMode].color,
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 1b03fb1491..7b6241dc37 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
@@ -409,6 +409,8 @@ export class Vehicle {
this.id = index
}
private _chargeTemplateId = 0
+ isSocConfigured = false
+ isSocManual = false
get chargeTemplateId() {
return this._chargeTemplateId
}
diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts b/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
index 9f025ca99c..bfa4a4a3c2 100755
--- a/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
@@ -159,6 +159,8 @@ export function processVehicleMessages(topic: string, message: string) {
cp.isSocManual = config.type == 'manual'
}
})
+ vehicles[index].isSocConfigured = config.type !== null
+ vehicles[index].isSocManual = config.type == 'manual'
} else {
// console.warn('Ignored vehicle message [' + topic + ']=' + message)
}
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgSoc.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgSoc.vue
index 56d5df951c..56bbc410b8 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgSoc.vue
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgSoc.vue
@@ -1,32 +1,34 @@
@@ -75,7 +77,6 @@ const myline = computed(() => {
: d['soc' + topVehicles.value[1]!],
) ?? yScale.value(0),
)
-
let p = path(graphData.data)
return p ? p : ''
})
@@ -116,11 +117,11 @@ const cpColor = computed(() => {
const nameX = computed(() => {
switch (props.order) {
case 0:
- return 3
+ return 3 // x position of first vehicle
case 1:
- return props.width - 3
+ return props.width - 3 // x position of 2nd vehicle
case 2:
- return props.width / 2
+ return props.width / 2 // x position of battery
default:
return 0 // error
}
@@ -130,16 +131,16 @@ const nameY = computed(() => {
if (graphData.data.length > 0) {
let index: number
switch (props.order) {
- case 0:
- index = graphData.data.length - 1
+ case 0: // 1st vehicle
+ index = 0
return yScale.value(
graphData.data[index]['soc' + topVehicles.value[0]] + 2,
)
case 1:
- index = 0
- return yScale.value(
+ index = graphData.data.length - 1
+ return Math.max (12, yScale.value(
graphData.data[index]['soc' + topVehicles.value[1]] + 2,
- )
+ ))
case 2:
index = Math.round(graphData.data.length / 2)
return yScale.value(graphData.data[index].batSoc + 2)
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue
index 7c16ad8c83..0c90c0e0d4 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue
@@ -155,9 +155,6 @@ const keysToUse = computed(() => {
k.splice(idx + i, 0, key)
colors[key] = chargePoints[+key.slice(2)]?.color ?? 'black'
})
- if (globalConfig.showInverters) {
- k.push('evuOut')
- }
return k
}
})
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgXAxis.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgXAxis.vue
index 9d2b9e80b7..faf6971e2d 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgXAxis.vue
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgXAxis.vue
@@ -5,7 +5,7 @@
:transform="'translate(' + 0 + ',' + (height / 2 + 9) + ')'"
>
-