From 0d38635b40223e58d10bbe615db112754a7cadd4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 12 Oct 2023 19:24:48 +0200
Subject: [PATCH] =?UTF-8?q?Display=20cerchi:=20-=20Aggiunta=20propriet?=
 =?UTF-8?q?=C3=A0=20x=20colore=20esterno=20-=20cambio=20nome=20con=20maius?=
 =?UTF-8?q?cole?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EgwCoreLib.BlazorTest/Pages/Index.razor | 31 +++++++++++--------------
 EgwCoreLib.Razor/CircleGauge.razor      |  4 ++--
 EgwCoreLib.Razor/CircleGauge.razor.cs   |  4 +++-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/EgwCoreLib.BlazorTest/Pages/Index.razor b/EgwCoreLib.BlazorTest/Pages/Index.razor
index a1d2a2d..aa67a90 100644
--- a/EgwCoreLib.BlazorTest/Pages/Index.razor
+++ b/EgwCoreLib.BlazorTest/Pages/Index.razor
@@ -5,6 +5,14 @@
 
     <div class="row py-4" style="background-color: #ACDDAC;">
         <div class="col-4">
+            @*<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+            <rect width="10" height="10">
+            <animate attributeName="rx"
+            values="0;5;0"
+            dur="5s"
+            repeatCount="indefinite" />
+            </rect>
+            </svg>*@
         </div>
         <div class="col-4">
             <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
@@ -33,20 +41,6 @@
                 </g>
             </svg>
         </div>
-        <div class="col-4">
-        </div>
-        @*<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
-        <rect width="10" height="10">
-        <animate attributeName="rx"
-        values="0;5;0"
-        dur="5s"
-        repeatCount="indefinite" />
-        </rect>
-        </svg>*@
-    </div>
-    <div class="row py-4" style="background-color: #34495E;">
-        <div class="col-4">
-        </div>
         <div class="col-4">
             <svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
                 <defs>
@@ -61,18 +55,19 @@
                 </rect>
             </svg>
         </div>
-        <div class="col-4">
-        </div>
     </div>
     <div class="row">
         <div class="col-12 containerCalendario">
             <div class="calendario">
                 <div class="d-flex justify-content-between">
                     <div>
-                        <CircleGauge Titolo="9:00" Testo="Caricate" maxVal="480" currVal="540" strokeColorVal="#F1C40F" ShowCircleBtn="true"></CircleGauge>
+                        <CircleGauge Titolo="9:00" Testo="Caricate" maxVal="480" currVal="540" StrokeColorVal="#F1C40F" ShowCircleBtn="true"></CircleGauge>
                     </div>
                     <div>
-                        <CircleGauge Titolo="4:00" Testo="Lavorate" maxVal="480" currVal="240" strokeColorVal="#00FF00" ShowCircleBtn="true"></CircleGauge>
+                        <CircleGauge Titolo="4:00" Testo="Lavorate" maxVal="480" currVal="240" StrokeColorVal="#00FF00" ShowCircleBtn="true"></CircleGauge>
+                    </div>
+                    <div>
+                        <CircleGauge Titolo="12:00" Testo="Caricate" maxVal="480" currVal="720" StrokeColorVal="#F1C40F" StrokeColorValOuter="#01C4FF" ShowCircleBtn="true"></CircleGauge>
                     </div>
                 </div>
                 <div class="containerBtnTemp">
diff --git a/EgwCoreLib.Razor/CircleGauge.razor b/EgwCoreLib.Razor/CircleGauge.razor
index ddc1f3d..a588672 100644
--- a/EgwCoreLib.Razor/CircleGauge.razor
+++ b/EgwCoreLib.Razor/CircleGauge.razor
@@ -1,7 +1,7 @@
 
 <svg viewBox="0 0 200 200" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
     <circle cx="100" cy="100" r="@innRad" fill="none" stroke="rgba(189, 195, 199, 0.5)" stroke-width="@sWidth" />
-    <circle cx="100" cy="100" r="@innRad" fill="none" stroke="@strokeColorVal" stroke-width="@sWidth" stroke-linecap="round" transform="rotate(-90,100,100)" stroke-dasharray="calc(@innRad * 6.28 * @valInner / @maxVal) calc(@innRad * 6.28 * (@maxVal - @valInner) / @maxVal)" />
+    <circle cx="100" cy="100" r="@innRad" fill="none" stroke="@StrokeColorVal" stroke-width="@sWidth" stroke-linecap="round" transform="rotate(-90,100,100)" stroke-dasharray="calc(@innRad * 6.28 * @valInner / @maxVal) calc(@innRad * 6.28 * (@maxVal - @valInner) / @maxVal)" />
     @if (ShowCircleBtn)
     {
         <defs>
@@ -18,7 +18,7 @@
     @if (showOuter)
     {
         <circle cx="100" cy="100" r="@outRad" fill=none stroke="rgba(189, 195, 199, 0.5)" class="bg-opacity-25" stroke-width="@sWidth" />
-        <circle cx="100" cy="100" r="@outRad" fill=none stroke="@strokeColorVal" stroke-width="@sWidth" stroke-linecap="round" transform="rotate(-90,100,100)" stroke-dasharray="calc(@outRad * 6.28 * @valOuter / @maxVal) calc(@outRad * 6.28 * (@maxVal - @valOuter) / @maxVal)" />
+        <circle cx="100" cy="100" r="@outRad" fill=none stroke="@StrokeColorValOuter" stroke-width="@sWidth" stroke-linecap="round" transform="rotate(-90,100,100)" stroke-dasharray="calc(@outRad * 6.28 * @valOuter / @maxVal) calc(@outRad * 6.28 * (@maxVal - @valOuter) / @maxVal)" />
     }
     <g transform="translate(100,100)">
         <text id="TitleElem" style="@StyleTitolo" x="0" y="0">@Titolo</text>
diff --git a/EgwCoreLib.Razor/CircleGauge.razor.cs b/EgwCoreLib.Razor/CircleGauge.razor.cs
index 8d39107..0571f7c 100644
--- a/EgwCoreLib.Razor/CircleGauge.razor.cs
+++ b/EgwCoreLib.Razor/CircleGauge.razor.cs
@@ -18,7 +18,9 @@ namespace EgwCoreLib.Razor
         [Parameter]
         public string StyleTesto { get; set; } = "font-size: 1em; fill: gray;";
         [Parameter]
-        public string strokeColorVal { get; set; } = "#00FF66";
+        public string StrokeColorVal { get; set; } = "#00FF66";
+        [Parameter]
+        public string StrokeColorValOuter { get; set; } = "#00FF66";
         /// <summary>
         /// Indica se mostrare o meno il btn centrale
         /// </summary>