From fec84fd0485e598ca33b6460e6305f2fd82bb622 Mon Sep 17 00:00:00 2001
From: Thomas Basler <thomas@familie-basler.net>
Date: Tue, 15 Nov 2022 21:52:10 +0100
Subject: [PATCH] Show custom string name in Live View

---
 src/WebApi_ws_live.cpp                        | 6 ++++++
 webapp/src/components/InverterChannelInfo.vue | 7 +++++--
 webapp/src/types/LiveDataStatus.ts            | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index cc5e0bf5..91dc62c8 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -102,6 +102,12 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
 
         // Loop all channels
         for (uint8_t c = 0; c <= inv->Statistics()->getChannelCount(); c++) {
+            if (c > 0) {
+                INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial());
+                if (inv_cfg != nullptr) {
+                    invObject[String(c)][F("name")]["u"] = inv_cfg->channel[c - 1].Name;
+                }
+            }
             addField(invObject, i, inv, c, FLD_PAC);
             addField(invObject, i, inv, c, FLD_UAC);
             addField(invObject, i, inv, c, FLD_IAC);
diff --git a/webapp/src/components/InverterChannelInfo.vue b/webapp/src/components/InverterChannelInfo.vue
index e1144dac..dc277910 100644
--- a/webapp/src/components/InverterChannelInfo.vue
+++ b/webapp/src/components/InverterChannelInfo.vue
@@ -1,6 +1,9 @@
 <template>
     <div class="card" :class="{ 'border-info': channelNumber == 0 }">
-        <div v-if="channelNumber >= 1" class="card-header">String {{ channelNumber }}</div>
+        <div v-if="channelNumber >= 1" class="card-header">
+            <template v-if="channelData.name.u != ''">{{ channelData.name.u }}</template>
+            <template v-else>String {{ channelNumber }}</template>
+        </div>
         <div v-if="channelNumber == 0" class="card-header text-bg-info">Phase {{ channelNumber + 1 }}</div>
         <div class="card-body">
             <table class="table table-striped table-hover">
@@ -13,7 +16,7 @@
                 </thead>
                 <tbody>
                     <tr v-for="(property, key) in channelData" :key="`prop-${key}`">
-                        <template v-if="property">
+                        <template v-if="key != 'name' && property">
                             <th scope="row">{{ key }}</th>
                             <td style="text-align: right">{{ formatNumber(property.v, property.d) }}</td>
                             <td>{{ property.u }}</td>
diff --git a/webapp/src/types/LiveDataStatus.ts b/webapp/src/types/LiveDataStatus.ts
index 0fa6afbc..4079a382 100644
--- a/webapp/src/types/LiveDataStatus.ts
+++ b/webapp/src/types/LiveDataStatus.ts
@@ -5,6 +5,7 @@ export interface ValueObject {
 };
 
 export interface InverterStatistics {
+    name: ValueObject,
     Power?: ValueObject;
     Voltage?: ValueObject;
     Current?: ValueObject;