[NEW-FEATURE] Refactor TcoCore and TcoData Blazor libraries (#526)

* Create draft PR for #525

* added tcosequencerobserver, added context for tco task, some minor changes in dataview

* added possibility to set update interval to diagnostics, some minor tweaks

Co-authored-by: Specter-13 <Specter-13@users.noreply.github.com>
Co-authored-by: David Spavor <david.spavor@gmail.com>

Author: github-actions[bot]

src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/Diagnostics.razor

@@ -1,19 +1,16 @@
 @page "/diagnostics"
-<h3>Diagnostics</h3>
 
 <RenderableContentControl Context="@Entry.PlcHammer.TECH_MAIN._app"
                           Presentation="Diagnostics" />
 
 
-
-@*<RenderableContentControl Context="@Entry.PlcHammer.TECH_MAIN._app._station001._messenger"
-                          Presentation="Base" />*@
 @code {
 
     protected override void OnInitialized()
     {
-        TcoDiagnosticsViewModel.SetDefaultCategory(eMessageCategory.Fatal);
+        TcoDiagnosticsViewModel.SetDefaultCategory(eMessageCategory.Trace);
         TcoDiagnosticsView.SetDefaultDepth(7);
+        TcoDiagnosticsView.SetDiagnosticsUpdateInterval(2500);
         base.OnInitialized();
     }
 }

src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/Pages/Security.razor

@@ -12,7 +12,7 @@
         <SecurityManagementView @ref="@securityManagementView"></SecurityManagementView>
     </Authorized>
     <NotAuthorized>
-        <p>Sorry, you are not authorized to see UserManagement. Please log in as administrator.</p>
+        <p>Sorry, you are not authorized to see user management. Please log in as administrator.</p>
     </NotAuthorized>
 </AuthorizeView>
 

src/TcOpen.Inxton/src/TcOpen.Inxton.Local.Security.Blazor/Views/AccountManagementView.razor

@@ -41,7 +41,7 @@
         </div>
     </Authorized>
     <NotAuthorized>
-        <p>Sorry, you are not log in. Please log in.</p>
+        <p>Sorry, you are not logged in. Please log in.</p>
     </NotAuthorized>
 </AuthorizeView>
 

src/TcOpen.Inxton/src/TcOpen.Inxton.Local.Security.Blazor/Views/SecurityManagementView.razor

@@ -25,7 +25,7 @@
         </div>
     </Authorized>
     <NotAuthorized>
-        <p>Sorry, you are not authorized to see UserManagement. Please log in as administrator.</p>
+        <p>Sorry, you are not authorized to access user management. Please log in as administrator.</p>
     </NotAuthorized>
 </AuthorizeView>
 

src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsView.cs

@@ -29,13 +29,14 @@ public void OnSelectedMessage(PlainTcoMessage message)
 
 
         }
-
+        public static int SetDiagnosticsUpdateInterval(int value) => _diagnosticsUpdateInterval = value;
+        private static int _diagnosticsUpdateInterval { get; set; } = 2500;
         private Timer messageUpdateTimer;
         private void DiagnosticsUpdateTimer()
         {
             if (messageUpdateTimer == null)
             {
-                messageUpdateTimer = new Timer(2500);
+                messageUpdateTimer = new Timer(_diagnosticsUpdateInterval);
                 messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed;
                 messageUpdateTimer.AutoReset = true;
                 messageUpdateTimer.Enabled = true;

src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoDiagnostics/TcoDiagnosticsViewModel.cs

@@ -50,6 +50,7 @@ public eMessageCategory MinMessageCategoryFilter
         public static eMessageCategory SetDefaultCategory(eMessageCategory item) => DefaulCategory = item;
 
         public static eMessageCategory DefaulCategory { get; set; } = eMessageCategory.Info;
+        
 
         bool diagnosticsRunning;
 

src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoSequencer/TcoSequencerObserver/TcoSequencerObserverView.razor

@@ -0,0 +1,82 @@
+@namespace TcoCore
+@inherits RenderableViewModelComponentBase<TcoSequencerObserverViewModel>
+
+<table class="table table-hover">
+    <thead>
+        <tr>
+            <th scope="col">Order</th>
+            <th scope="col">ID</th>
+            <th scope="col">Description</th>
+            <th scope="col">Enabled</th>
+            <th scope="col">Duration</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+            @foreach (var step in Steps)
+            {
+                var rowActive = "";
+                @if (step.IsActive)
+                {
+                    rowActive = "fw-bolder";
+                }
+                <tr class="@rowActive">
+                    <th>@step.Order</th>
+                    <td>@step.ID</td>
+                    <td>@step.Description</td>
+                    <td>@step.Enabled</td>
+                    <td>@step.Duration</td>
+                </tr>
+            }
+        
+    </tbody>
+       
+</table>
+
+
+@code {
+
+    [Parameter]
+    public IVortexElement Context { get; set; }
+    private IEnumerable<PlainStepDetails> Steps { get; set; } = new List<PlainStepDetails>();
+    private IEnumerable<PlainStepDetails> PreviousSteps { get; set; } = new List<PlainStepDetails>();
+    protected override void OnInitialized()
+    {
+        if (ViewModel == null)
+        {
+            ViewModel = new TcoSequencerObserverViewModel();
+            ViewModel.Model = Context;
+        }
+        SetTimer();
+    }
+
+
+    private System.Timers.Timer messageUpdateTimer;
+    private void SetTimer()
+    {
+        if (messageUpdateTimer == null)
+        {
+            messageUpdateTimer = new System.Timers.Timer(1000);
+            messageUpdateTimer.Elapsed += MessageUpdateTimer_Elapsed;
+            messageUpdateTimer.AutoReset = true;
+            messageUpdateTimer.Enabled = true;
+        }
+    }
+
+    private async void MessageUpdateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+    {
+
+        ViewModel?.UpdateStepsTable();
+        if (ViewModel.Steps == null)
+        {
+            Steps = PreviousSteps;
+        }
+        else
+        {
+            Steps = ViewModel.Steps;
+            PreviousSteps = Steps;
+            await InvokeAsync(StateHasChanged);
+        }
+
+    }
+}

src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoSequencer/TcoSequencerObserver/TcoSequencerObserverViewModel.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Vortex.Connector;
+using Vortex.Presentation;
+
+namespace TcoCore
+{
+    public class TcoSequencerObserverViewModel : RenderableViewModelBase
+    {
+
+        public void UpdateStepsTable()
+        {
+            Observer.Read();
+            var steps = Observer._steps.Take(Observer._stepsCount.LastValue).Select(p =>
+            {
+                var plain = p.CreatePlainerType();
+                plain.CopyCyclicToPlain(p);
+                plain.IsActive = plain.Order == this.Observer._currentStepOrder.LastValue;
+                return plain;
+            });
+            Steps = steps;
+
+
+        }
+
+        public IEnumerable<PlainStepDetails> Steps { get; set; }
+        public TcoSequencerObserver Observer { get; set; }
+        public override object Model { get => Observer; set { Observer = value as TcoSequencerObserver; } }
+    }
+}

src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcoTask/TcoTaskView.razor

@@ -25,6 +25,8 @@
 </div>
 
 @code{
+    [Parameter]
+    public TcoTask Context { get; set; }
     public string StatusClass => ViewModel.Component._taskState.Synchron == 30 ? "btn-danger" : "btn-primary";
 
     public bool IsError => ViewModel.Component._taskState.Synchron == 30;
@@ -40,4 +42,13 @@
         ,
         (short)eTaskState.Done => () => { }
     };
+
+    protected override Task OnInitializedAsync()
+    {
+        if (ViewModel == null)
+        {
+            ViewModel = new TcoTaskViewModel() { Model = Context };
+        }
+        return base.OnInitializedAsync();
+    }
 }

src/TcoData/src/Blazor/TcOpen.Inxton.Data.Blazor/Data/DataView.razor

@@ -26,7 +26,7 @@
                 @bind="@DataViewModel.SearchMode">
             @foreach (var item in eSearchModes)
             {
-                <option class="form-control" value="@item.">@item.ToString() </option>
+                <option class="form-control" value="@item">@item.ToString() </option>
             }
         </select>
     </div>
@@ -58,7 +58,12 @@
                             <tbody>
                                 @foreach (var item in DataViewModel.ObservableRecords.ToList())
                                 {
-                                    <tr @onclick="@(() => RowClicked(item))">
+                                    var color = "white";
+                                    @if (DataViewModel?.SelectedRecord?._EntityId == item._EntityId)
+                                    {
+                                        color = "#e9ecef";
+                                    }
+                                    <tr style="background-color: @color;" @onclick="@(() => RowClicked(item))">
                                         <td>@item._EntityId</td>
                                     </tr>
                                 }
@@ -346,8 +351,7 @@
         DataViewModel.SelectedRecord = item;
         dynamic dataExchange = DataViewModel.DataExchange;
         _data = (IVortexElement)dataExchange._data;
-        StateHasChanged();
-
+        _isRowSelected = true;
     }
 
     private async Task PageChanged(int pageNumber)
@@ -422,9 +426,6 @@
 
     protected override async Task OnInitializedAsync()
     {
-        IsLoading = true;
-        await Filter();
-        IsLoading = false;
         DataViewModel.Mode = ViewMode.Display;
         DataViewModel.SetDefaultButtonState();
     }

src/TcoData/src/Blazor/TcOpen.Inxton.Data.Blazor/Data/DataViewModel.cs

@@ -30,6 +30,7 @@ public DataViewModel(IRepository<T> repository, TcoDataExchange dataExchange) :
         {
             this.DataExchange = dataExchange;
             DataBrowser = CreateBrowsable(repository);
+            FillObservableRecords();
         }
 
         public List<IBrowsableDataObject> ObservableRecords { get; private set; } = new List<IBrowsableDataObject>();