From 92722ba7fe67c8cad5bc3587999e1363e70259e4 Mon Sep 17 00:00:00 2001
From: Brano5 <97288158+Brano5@users.noreply.github.com>
Date: Thu, 27 Jun 2024 12:53:51 +0200
Subject: [PATCH] Added show attribute units if is set in template views (#320)

* Added show attribute units if is set in template views

* Test repair
---
 .../Base/Online/Control/OnlinerBaseControlView.razor   |  2 +-
 .../Base/Online/Control/OnlinerBoolControlView.razor   |  2 +-
 .../Base/Online/Control/OnlinerDateControlView.razor   |  2 +-
 .../Online/Control/OnlinerDateTimeControlView.razor    |  2 +-
 .../Base/Online/Control/OnlinerLRealControlView.razor  |  2 +-
 .../Base/Online/Control/OnlinerRealControlView.razor   |  2 +-
 .../Base/Online/Control/OnlinerTimeControlView.razor   |  2 +-
 .../Online/Control/OnlinerTimeOfDayControlView.razor   |  2 +-
 .../Base/Online/Display/OnlinerBaseDisplayView.razor   |  2 +-
 .../Base/Online/Display/OnlinerBoolDisplayView.razor   |  2 +-
 .../Base/Online/Display/OnlinerDateDisplayView.razor   |  2 +-
 .../Online/Display/OnlinerDateTimeDisplayView.razor    |  2 +-
 .../Base/Online/Display/OnlinerLRealDisplayView.razor  |  2 +-
 .../Base/Online/Display/OnlinerRealDisplayView.razor   |  2 +-
 .../Base/Online/Display/OnlinerTimeDisplayView.razor   |  2 +-
 .../Online/Display/OnlinerTimeOfDayDisplayView.razor   |  2 +-
 .../Shadow/Control/OnlinerBaseShadowControlView.razor  |  2 +-
 .../Shadow/Control/OnlinerBoolShadowControlView.razor  |  2 +-
 .../Shadow/Control/OnlinerDateShadowControlView.razor  |  2 +-
 .../Control/OnlinerDateTimeShadowControlView.razor     |  2 +-
 .../Shadow/Control/OnlinerLRealShadowControlView.razor |  2 +-
 .../Shadow/Control/OnlinerRealShadowControlView.razor  |  2 +-
 .../Control/OnlinerTimeOfDayShadowControlView.razor    |  2 +-
 .../Shadow/Control/OnlinerTimeShadowControlView.razor  |  2 +-
 .../Shadow/Display/OnlinerBaseShadowDisplayView.razor  |  2 +-
 .../Shadow/Display/OnlinerBoolShadowDisplayView.razor  |  2 +-
 .../Shadow/Display/OnlinerDateShadowDisplayView.razor  |  2 +-
 .../Display/OnlinerDateTimeShadowDisplayView.razor     |  2 +-
 .../Shadow/Display/OnlinerLRealShadowDisplayView.razor |  2 +-
 .../Shadow/Display/OnlinerRealShadowDisplayView.razor  |  2 +-
 .../Display/OnlinerTimeOfDayShadowDisplayView.razor    |  2 +-
 .../Shadow/Display/OnlinerTimeShadowDisplayView.razor  |  2 +-
 .../HtmlFiles/prgWeatherStations.html                  | 10 +++++-----
 .../HtmlFiles/stTestLayoutOverWrite.html               | 10 +++++-----
 34 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBaseControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBaseControlView.razor
index 582aed3a..d4389a0d 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBaseControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBaseControlView.razor
@@ -6,7 +6,7 @@
 @typeparam T
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBoolControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBoolControlView.razor
index 90446508..89f2df7e 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBoolControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBoolControlView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseOnline<bool>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName @(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $"[{Onliner.AttributeUnits}]")</label>
     <div class="form-check form-switch">
         <input id="@ComponentId"
                disabled="@IsReadOnly"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateControlView.razor
index b8779d08..715e47c2 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<DateOnly>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateTimeControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateTimeControlView.razor
index 8a88c010..1c14eb28 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateTimeControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateTimeControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<DateTime>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLRealControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLRealControlView.razor
index f1e65f98..bea470cf 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLRealControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLRealControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Double>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerRealControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerRealControlView.razor
index c181f359..22414fd6 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerRealControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerRealControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Single>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeControlView.razor
index 0647022d..da7c1f08 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeControlView.razor
@@ -4,7 +4,7 @@
 @inherits TemplateBaseOnline<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeOfDayControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeOfDayControlView.razor
index 2cf35179..b1e002e2 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeOfDayControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeOfDayControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBaseDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBaseDisplayView.razor
index baac0ba1..48f71552 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBaseDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBaseDisplayView.razor
@@ -3,7 +3,7 @@
 @typeparam T
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBoolDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBoolDisplayView.razor
index 827b43e4..2aeb128e 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBoolDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBoolDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseOnline<bool>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <div class="form-check form-switch">
         <input id="@ComponentId"
                disabled
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateDisplayView.razor
index e60d97da..9be56b78 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseOnline<DateOnly>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateTimeDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateTimeDisplayView.razor
index 39baa615..8865e615 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateTimeDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateTimeDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseOnline<DateTime>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLRealDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLRealDisplayView.razor
index 348bb203..7254f098 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLRealDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLRealDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Double>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerRealDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerRealDisplayView.razor
index 61a03c9a..96520be4 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerRealDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerRealDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Single>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeDisplayView.razor
index e4db981b..bc1a8a43 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeOfDayDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeOfDayDisplayView.razor
index bc52fe54..832fd926 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeOfDayDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeOfDayDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBaseShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBaseShadowControlView.razor
index ff50db22..d2d0f413 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBaseShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBaseShadowControlView.razor
@@ -3,7 +3,7 @@
 @typeparam T
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBoolShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBoolShadowControlView.razor
index 0ae26232..038d3479 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBoolShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBoolShadowControlView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseShadow<bool>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <div class="form-check form-switch">
         <input id="@ComponentId"
                disabled="@IsReadOnly"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateShadowControlView.razor
index 20ea93cf..199247f2 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<DateOnly>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateTimeShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateTimeShadowControlView.razor
index 857b6db0..96859703 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateTimeShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateTimeShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<DateTime>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerLRealShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerLRealShadowControlView.razor
index 9c49b980..38bc6bc0 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerLRealShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerLRealShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Double>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerRealShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerRealShadowControlView.razor
index d2c31f0a..2560e5a3 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerRealShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerRealShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Single>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeOfDayShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeOfDayShadowControlView.razor
index e599a243..349c80a5 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeOfDayShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeOfDayShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeShadowControlView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeShadowControlView.razor
index db4aaeec..93ac3207 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeShadowControlView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerTimeShadowControlView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="@IsReadOnly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBaseShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBaseShadowDisplayView.razor
index f22fd2a5..7aa3601f 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBaseShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBaseShadowDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<T>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBoolShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBoolShadowDisplayView.razor
index 1234b8c4..16986818 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBoolShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerBoolShadowDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseShadow<bool>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <div class="form-check form-switch">
         <input id="@ComponentId"
                disabled
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateShadowDisplayView.razor
index 1314766f..4d064d30 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateShadowDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseShadow<DateOnly>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateTimeShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateTimeShadowDisplayView.razor
index 3715ecce..c1a34af9 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateTimeShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerDateTimeShadowDisplayView.razor
@@ -2,7 +2,7 @@
 @inherits TemplateBaseShadow<DateTime>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerLRealShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerLRealShadowDisplayView.razor
index f1e6dbc2..b4419222 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerLRealShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerLRealShadowDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Double>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerRealShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerRealShadowDisplayView.razor
index 91f594fb..000a710c 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerRealShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerRealShadowDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseOnline<Single>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeOfDayShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeOfDayShadowDisplayView.razor
index 655be23f..04a63ecc 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeOfDayShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeOfDayShadowDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeShadowDisplayView.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeShadowDisplayView.razor
index def3d10d..2ce16ebf 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeShadowDisplayView.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Templates/Base/Shadow/Display/OnlinerTimeShadowDisplayView.razor
@@ -3,7 +3,7 @@
 @inherits TemplateBaseShadow<TimeSpan>
 
 <TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
-    <label for="@ComponentId">@Onliner.AttributeName</label>
+    <label for="@ComponentId">@Onliner.AttributeName@(string.IsNullOrWhiteSpace(Onliner.AttributeUnits) ? null : $" [{Onliner.AttributeUnits}]")</label>
     <input id="@ComponentId"
            readonly="readonly"
            class="w-100 form-control @AccessStatus"
diff --git a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/prgWeatherStations.html b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/prgWeatherStations.html
index 13403b80..af8e5d98 100644
--- a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/prgWeatherStations.html
+++ b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/prgWeatherStations.html
@@ -7,19 +7,19 @@
 
         <input id:ignore="StationStatus_6e28cfe0-4435-4380-8cdf-aab96c56d900" class="w-100 form-control " readonly="readonly" style="background-color:transparent" value="Unknown  " data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Station status" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Pressure" class="w-100 form-group mb-2"><label for:ignore="Pressure_6e94ef0f-3fa6-44b7-b3eb-77f94c8e7492">Pressure</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Pressure" class="w-100 form-group mb-2"><label for:ignore="Pressure_6e94ef0f-3fa6-44b7-b3eb-77f94c8e7492">Pressure [Torr]</label>
     <input id:ignore="Pressure_6e94ef0f-3fa6-44b7-b3eb-77f94c8e7492" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Pressure" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Temp" class="w-100 form-group mb-2"><label for:ignore="Temp_408c4920-ff92-44a8-96a0-1c52494bd230">Temperature</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Temp" class="w-100 form-group mb-2"><label for:ignore="Temp_408c4920-ff92-44a8-96a0-1c52494bd230">Temperature [&#xB0;C]</label>
     <input id:ignore="Temp_408c4920-ff92-44a8-96a0-1c52494bd230" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Temperature" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Visibility" class="w-100 form-group mb-2"><label for:ignore="Visibility_4a119f80-9765-4909-b1a8-f286a3fb0fb2">Visibility</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-Visibility" class="w-100 form-group mb-2"><label for:ignore="Visibility_4a119f80-9765-4909-b1a8-f286a3fb0fb2">Visibility [km]</label>
     <input id:ignore="Visibility_4a119f80-9765-4909-b1a8-f286a3fb0fb2" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Visibility" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-WindHeading" class="w-100 form-group mb-2"><label for:ignore="WindHeading_df5a8e19-4c12-4633-b793-d7db8ad4e6f6">Wind heading</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-WindHeading" class="w-100 form-group mb-2"><label for:ignore="WindHeading_df5a8e19-4c12-4633-b793-d7db8ad4e6f6">Wind heading [Azimuth]</label>
     <input id:ignore="WindHeading_df5a8e19-4c12-4633-b793-d7db8ad4e6f6" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" step="any" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Wind heading" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-WindSpeed" class="w-100 form-group mb-2"><label for:ignore="WindSpeed_2d739f9b-e493-4d56-afff-5c858c7298e2">Wind speed</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-WindSpeed" class="w-100 form-group mb-2"><label for:ignore="WindSpeed_2d739f9b-e493-4d56-afff-5c858c7298e2">Wind speed [m/s]</label>
     <input id:ignore="WindSpeed_2d739f9b-e493-4d56-afff-5c858c7298e2" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="prgWeatherStations.Weather Cyclic.North pole station.Wind speed" />
     
     <div class="invalid-feedback"></div></div></div><div><div name="prgWeatherStations-_weatherStations-NorthPole-TestDate" class="w-100 form-group mb-2"><label for:ignore="TestDate_69cee20a-667c-4fd3-b2f2-df1a87cfad33">TestDate</label>
diff --git a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/stTestLayoutOverWrite.html b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/stTestLayoutOverWrite.html
index be3c9ae9..ec87aa67 100644
--- a/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/stTestLayoutOverWrite.html
+++ b/src/AXSharp.blazor/tests/sandbox/AXSharp.RenderableContent.Tests/HtmlFiles/stTestLayoutOverWrite.html
@@ -28,19 +28,19 @@
 
         <input id:ignore="StationStatus_06d5b9cc-d94a-45b2-99ca-381b2bf2ba92" class="w-100 form-control " readonly="readonly" style="background-color:transparent" value="Unknown  " data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Station status" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Pressure" class="w-100 form-group mb-2"><label for:ignore="Pressure_fa98d4cb-a950-4bad-8649-e191100715ed">Pressure</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Pressure" class="w-100 form-group mb-2"><label for:ignore="Pressure_fa98d4cb-a950-4bad-8649-e191100715ed">Pressure [Torr]</label>
     <input id:ignore="Pressure_fa98d4cb-a950-4bad-8649-e191100715ed" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Pressure" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Temp" class="w-100 form-group mb-2"><label for:ignore="Temp_e439210a-5912-416a-b972-17fdd9ffc945">Temperature</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Temp" class="w-100 form-group mb-2"><label for:ignore="Temp_e439210a-5912-416a-b972-17fdd9ffc945">Temperature [&#xB0;C]</label>
     <input id:ignore="Temp_e439210a-5912-416a-b972-17fdd9ffc945" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Temperature" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Visibility" class="w-100 form-group mb-2"><label for:ignore="Visibility_feec5044-8dd0-43e1-9c37-79ac8a9278b6">Visibility</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-Visibility" class="w-100 form-group mb-2"><label for:ignore="Visibility_feec5044-8dd0-43e1-9c37-79ac8a9278b6">Visibility [km]</label>
     <input id:ignore="Visibility_feec5044-8dd0-43e1-9c37-79ac8a9278b6" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Visibility" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-WindHeading" class="w-100 form-group mb-2"><label for:ignore="WindHeading_a99e6c3b-185d-4f9e-a12e-e57a8df10d92">Wind heading</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-WindHeading" class="w-100 form-group mb-2"><label for:ignore="WindHeading_a99e6c3b-185d-4f9e-a12e-e57a8df10d92">Wind heading [Azimuth]</label>
     <input id:ignore="WindHeading_a99e6c3b-185d-4f9e-a12e-e57a8df10d92" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" step="any" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Wind heading" />
     
-    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-WindSpeed" class="w-100 form-group mb-2"><label for:ignore="WindSpeed_dfbb36f2-c4e7-4ebe-815f-75b323f2483f">Wind speed</label>
+    <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-WindSpeed" class="w-100 form-group mb-2"><label for:ignore="WindSpeed_dfbb36f2-c4e7-4ebe-815f-75b323f2483f">Wind speed [m/s]</label>
     <input id:ignore="WindSpeed_dfbb36f2-c4e7-4ebe-815f-75b323f2483f" readonly="readonly" class="w-100 form-control " style="background-color:transparent" type="text" value="0" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-custom-class="custom-tooltip" data-bs-title="testingProgram.testLayoutOverwrite.weather.Weather Cyclic.North pole station.Wind speed" />
     
     <div class="invalid-feedback"></div></div></div><div><div name="testingProgram-testLayoutOverwrite-weather-_weatherStations-NorthPole-TestDate" class="w-100 form-group mb-2"><label for:ignore="TestDate_fed6fbb8-163d-4588-8fd8-5d7112e73bfa">TestDate</label>