diff --git a/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor b/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor index 0f1714e0..0313f1b8 100644 --- a/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor +++ b/src/apps/blazor-app/Components/Advanced/BuildYourHome.razor @@ -262,28 +262,34 @@

Running Hours on Batteries

-
-
- @if(float.IsInfinity(dlh) || dlh == 99) { - string hexColor = calculationDataHandler.GetColorGradient(99); -
+
+
+ +

@tooltipService.GetTooltip("simultaneous running hours")

+
+ @if(float.IsInfinity(concurrentRuntime) || dlh == 99) { + string hexColorConcurrent = calculationDataHandler.GetColorGradient(99, 4); +

99+

} else { - string hexColor = calculationDataHandler.GetColorGradient(dlh); -
-

@dlh

+ string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); +
+

@concurrentRuntime

}

h

-
- @if(float.IsInfinity(concurrentRuntime) || dlh == 99) { - string hexColorConcurrent = calculationDataHandler.GetColorGradient(99, 4); -
+
+ +

@tooltipService.GetTooltip("running hours on batteries")

+
+ @if(float.IsInfinity(dlh) || dlh == 99) { + string hexColor = calculationDataHandler.GetColorGradient(99); +

99+

} else { - string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); -
-

@concurrentRuntime

+ string hexColor = calculationDataHandler.GetColorGradient(dlh); +
+

@dlh

}

h

diff --git a/src/apps/blazor-app/Components/Dashboard/Appliances.razor b/src/apps/blazor-app/Components/Dashboard/Appliances.razor index dc061a3f..3d6338e5 100644 --- a/src/apps/blazor-app/Components/Dashboard/Appliances.razor +++ b/src/apps/blazor-app/Components/Dashboard/Appliances.razor @@ -3,6 +3,7 @@ @using BlazorApp.Components.Base @inject ProtectedSessionStorage ProtectedSessionStore @inject BlazorApp.Data.ToastService toastService +@inject BlazorApp.Data.TooltipService tooltipService @if (appliancesLoaded) @@ -203,27 +204,33 @@
@if (appliancesLoaded) { -
- @if(float.IsInfinity(dlh) || dlh == 99) { - string hexColor = calculationDataHandler.GetColorGradient(99); -
+
+ +

@tooltipService.GetTooltip("simultaneous running hours")

+
+ @if(float.IsInfinity(concurrentRuntime) || dlh == 99) { + string hexColorConcurrent = calculationDataHandler.GetColorGradient(99, 4); +

99+

} else { - string hexColor = calculationDataHandler.GetColorGradient(dlh); -
-

@dlh

+ string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); +
+

@concurrentRuntime

}

h

- @if(float.IsInfinity(concurrentRuntime) || dlh == 99) { - string hexColorConcurrent = calculationDataHandler.GetColorGradient(99, 4); -
+ +

@tooltipService.GetTooltip("running hours on batteries has-tooltip")

+
+ @if(float.IsInfinity(dlh) || dlh == 99) { + string hexColor = calculationDataHandler.GetColorGradient(99); +

99+

} else { - string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); -
-

@concurrentRuntime

+ string hexColor = calculationDataHandler.GetColorGradient(dlh); +
+

@dlh

}

h

diff --git a/src/apps/blazor-app/Components/SolarScore/Results.razor b/src/apps/blazor-app/Components/SolarScore/Results.razor index b61a494c..3d9fa298 100644 --- a/src/apps/blazor-app/Components/SolarScore/Results.razor +++ b/src/apps/blazor-app/Components/SolarScore/Results.razor @@ -165,25 +165,25 @@
@{ - string hexColor = calculationDataHandler.GetColorGradient(dlh); + string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); } -
+
- -

@tooltipService.GetTooltip("running hours on batteries")

+ +

@tooltipService.GetTooltip("simultaneous running hours")

-

@dlh

+

@concurrentRuntime

h

@{ - string hexColorConcurrent = calculationDataHandler.GetColorGradient(concurrentRuntime, 4); + string hexColor = calculationDataHandler.GetColorGradient(dlh); } -
-
- +
+
+

@tooltipService.GetTooltip("running hours on batteries")

-

@concurrentRuntime

+

@dlh

h

diff --git a/src/apps/blazor-app/Data/Tooltips.cs b/src/apps/blazor-app/Data/Tooltips.cs index 1826d08a..dcfdd451 100644 --- a/src/apps/blazor-app/Data/Tooltips.cs +++ b/src/apps/blazor-app/Data/Tooltips.cs @@ -8,7 +8,8 @@ public TooltipService() tooltips["solarScore"] = "The percentage of sunlight exposure on your property's roof compared to an optimal roof."; tooltips["potential savings"] = "How much money you can save monthly by producing clean energy."; tooltips["average energy produced"] = "The daily energy your solar panels produce averaged over a year."; - tooltips["running hours on batteries"] = "The total time in which you can run the chosen appliances exclusively using battery power."; + tooltips["running hours on batteries"] = "The average time your batteries will last given daily duration usage of your appliances"; + tooltips["simultaneous running hours"] = "The time your batteries will last given simultaneous and constant use of all your appliances"; tooltips["battery utilisation"] = "The maximum percentage your batteries can charge, while running the selected appliances."; tooltips["solar score add button"] = "Add or remove appliances"; tooltips["number of panels"] = "Affects your average energy production and how quickly you can charge your batteries while running appliances.";