From 14fa374bb7834b3da4b3b5ffa7d4c8db09be3a75 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 7 Jun 2023 08:50:47 +0200 Subject: [PATCH] Bouton Actualiser --- src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor | 2 +- .../Elektrifikatsiya/Pages/Dashboard.razor.cs | 4 ++-- src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor | 6 +++--- .../Services/Implementations/UpdateService.cs | 4 ++-- src/Elektrifikatsiya/host/prometheus/prometheus.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index d63777f..6269368 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -127,7 +127,7 @@ - + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs index 6fb0007..f3e4caa 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs @@ -64,9 +64,9 @@ public partial class Dashboard double energyPrice = MainDatabaseContext.EnergyPriceChanges.OrderByDescending(e =>e.DateTime).FirstOrDefault()?.EnergyPrice ?? 0; PrometheusDataWrapper? deviceData = (await promQueryer.Query($$"""sum(power{sensor=~"{{plugnames}}"})[1h:1m]"""))?.Data; - PrometheusDataWrapper? priceData = (await promQueryer.Query($$"""sum(sum_over_time(power{sensor=~"{{plugnames}}"}[1y])*{{energyPrice}})"""))?.Data; + //PrometheusDataWrapper? priceData = (await promQueryer.Query($$"""sum(sum_over_time(power{sensor=~"{{plugnames}}"}[1y])*{{energyPrice}})"""))?.Data; - Console.WriteLine(priceData.VectorTypeToTimestampFloatTuple()); + //Console.WriteLine(priceData.VectorTypeToTimestampFloatTuple()); var r = new Random(DateTime.Now.Millisecond); diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index 4b68b99..d2aea31 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -92,7 +92,7 @@ Here you can change the name of your plug - +

@@ -171,8 +171,8 @@ { if (hideButtonSettings) { - - MainDatabaseContext.EnergyPriceChanges.Add(new EnergyPriceChange(electricityPrice)); + MainDatabaseContext.ChangeTracker.Clear(); + MainDatabaseContext.EnergyPriceChanges.Add(new EnergyPriceChange(electricityPrice)); await MainDatabaseContext.SaveChangesAsync(); } else if(DeviceCopy is not null && SelectedDevice is not null) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs index 94070e1..e1073c3 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs @@ -27,8 +27,8 @@ public class UpdateService : IUpdateService } } - public DateTime FirstExecutionTime { get; } = DateTime.Now.AddSeconds(15); - public TimeSpan ExecutionRepeatDelay { get; } = TimeSpan.FromSeconds(15); + public DateTime FirstExecutionTime { get; } = DateTime.Now.AddSeconds(10); + public TimeSpan ExecutionRepeatDelay { get; } = TimeSpan.FromSeconds(1); public async void Update() { diff --git a/src/Elektrifikatsiya/host/prometheus/prometheus.yml b/src/Elektrifikatsiya/host/prometheus/prometheus.yml index ea003f0..9ae35f2 100644 --- a/src/Elektrifikatsiya/host/prometheus/prometheus.yml +++ b/src/Elektrifikatsiya/host/prometheus/prometheus.yml @@ -1,6 +1,6 @@ global: - scrape_interval: 15s - evaluation_interval: 15s + scrape_interval: 1s + evaluation_interval: 1s rule_files: # - "first.rules"