From 4fe9bc7d87b31e9b858e6ef1881dca96e465723b Mon Sep 17 00:00:00 2001 From: Jan Benicek Date: Thu, 16 Jan 2025 18:54:15 +0100 Subject: [PATCH] First main page test prepared --- Layout/MainLayout.razor | 4 -- Layout/NavMenu.razor | 8 +-- Models/VariablePostModel.cs | 12 ++++ Pages/Counter.razor | 2 +- Pages/Home.razor | 125 +++++++++++++++++++++++++++++++++- Pages/Weather.razor | 57 ---------------- TestingRoom_NN_Kajk_UI.csproj | 4 ++ 7 files changed, 143 insertions(+), 69 deletions(-) create mode 100644 Models/VariablePostModel.cs delete mode 100644 Pages/Weather.razor diff --git a/Layout/MainLayout.razor b/Layout/MainLayout.razor index 76eb725..1641bdc 100644 --- a/Layout/MainLayout.razor +++ b/Layout/MainLayout.razor @@ -5,10 +5,6 @@
-
- About -
-
@Body
diff --git a/Layout/NavMenu.razor b/Layout/NavMenu.razor index f85de0e..cb4b911 100644 --- a/Layout/NavMenu.razor +++ b/Layout/NavMenu.razor @@ -1,6 +1,6 @@ 
- TestingRoom_NN_Kajk_UI + NN - Kajk @@ -11,12 +11,12 @@ diff --git a/Models/VariablePostModel.cs b/Models/VariablePostModel.cs new file mode 100644 index 0000000..2b0fb03 --- /dev/null +++ b/Models/VariablePostModel.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace TestingRoom_NN_Kajk_UI.Models +{ + public class VariablePostModel + { + public string data { get; set; } + + [JsonPropertyName("default")] + public bool Isdefault { get; set; } + } +} diff --git a/Pages/Counter.razor b/Pages/Counter.razor index ef23cb3..6186185 100644 --- a/Pages/Counter.razor +++ b/Pages/Counter.razor @@ -1,4 +1,4 @@ -@page "/counter" +@page "/variables" Counter diff --git a/Pages/Home.razor b/Pages/Home.razor index 9001e0b..f144154 100644 --- a/Pages/Home.razor +++ b/Pages/Home.razor @@ -1,7 +1,126 @@ @page "/" -Home +@using TestingRoom_NN_Kajk_UI.Models +@inject HttpClient HttpClient -

Hello, world!

+Control -Welcome to your new app. +
+
+

Otáčky: @RPM_Actual RPM

+
+
+
+

+

+ +
+
+

Žádané otáčky:

+
+ +
+ +
+ + + + + + +
+ +
+ +
+ @foreach (int i in RPM_Presets) + { + + } +
+
+

+

+ +
+ + + + + + +@code{ + string RPM_Actual_Variable_Name = "actual_rpm"; + string RPM_Requested_Variable_Name = "requested_rpm"; + string RPM_Max_Variable_Name = "max_rpm"; + + float RPM_Actual = 0; + float RPM_Max = 1900; + float RPM_Requested = 0; + List RPM_Presets = new() { 0, 1500, 1800 }; + + private System.Timers.Timer RPM_Actual_Timer = new System.Timers.Timer(500); //actual RPM reader timer + private System.Timers.Timer RPM_Requested_Timer = new System.Timers.Timer(5000); //requested RPM reader timer + + protected override void OnInitialized() + { + base.OnInitialized(); + + //actual RPM request timer + RPM_Actual_Timer.AutoReset = true; + RPM_Actual_Timer.Elapsed += RequestActualRPM; + RPM_Actual_Timer.Start(); + + //requested RPM request timer + RPM_Requested_Timer.AutoReset = true; + RPM_Requested_Timer.Elapsed += RequestRequestedRPM; + RPM_Requested_Timer.Start(); + } + + private void SetRPMRequested(int rpm) + { + RPM_Requested_Timer.Stop(); + RPM_Requested = rpm; + SetRPMRequested(); + RPM_Requested_Timer.Start(); + } + + private void AddRPMRequested(int add) + { + RPM_Requested_Timer.Stop(); + RPM_Requested += add; + + if (RPM_Requested < 0) + RPM_Requested = 0; + if (RPM_Requested > RPM_Max) + RPM_Requested = RPM_Max; + + SetRPMRequested(); + RPM_Requested_Timer.Start(); + } + + private async void RequestActualRPM(object? sender, System.Timers.ElapsedEventArgs e) + { + //RPM_Actual = float.Parse(await HttpClient.GetStringAsync($"/api/variables/{RPM_Actual_Variable_Name}")); + await InvokeAsync(StateHasChanged); + } + + private async void RequestRequestedRPM(object? sender, System.Timers.ElapsedEventArgs e) + { + //RPM_Requested = int.Parse(await HttpClient.GetStringAsync($"/api/variables/{RPM_Requested_Variable_Name}")); + await InvokeAsync(StateHasChanged); + } + + private async void SetRPMRequested() + { + //await HttpClient.PostAsJsonAsync($"/api/variables/{RPM_Requested_Variable_Name}", new VariablePostModel { data = RPM_Requested.ToString(), Isdefault = false }); + } + + private async void GetRPMMax() + { + //RPM_Max = int.Parse(await HttpClient.GetStringAsync($"/api/variables/{RPM_Requested_Variable_Name}")); + await InvokeAsync(StateHasChanged); + } + + +} \ No newline at end of file diff --git a/Pages/Weather.razor b/Pages/Weather.razor deleted file mode 100644 index f2defcf..0000000 --- a/Pages/Weather.razor +++ /dev/null @@ -1,57 +0,0 @@ -@page "/weather" -@inject HttpClient Http - -Weather - -

Weather

- -

This component demonstrates fetching data from the server.

- -@if (forecasts == null) -{ -

Loading...

-} -else -{ - - - - - - - - - - - @foreach (var forecast in forecasts) - { - - - - - - - } - -
DateTemp. (C)Temp. (F)Summary
@forecast.Date.ToShortDateString()@forecast.TemperatureC@forecast.TemperatureF@forecast.Summary
-} - -@code { - private WeatherForecast[]? forecasts; - - protected override async Task OnInitializedAsync() - { - forecasts = await Http.GetFromJsonAsync("sample-data/weather.json"); - } - - public class WeatherForecast - { - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public string? Summary { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - } -} diff --git a/TestingRoom_NN_Kajk_UI.csproj b/TestingRoom_NN_Kajk_UI.csproj index 8648f5d..db3c071 100644 --- a/TestingRoom_NN_Kajk_UI.csproj +++ b/TestingRoom_NN_Kajk_UI.csproj @@ -16,4 +16,8 @@ + + + +