Merge pull request #362 from nic547/desktop

Desktop: Display which engines use the same dcc address in the decoder programming window
nic547 · Jun 9, 2024 · 0579c9d · 0579c9d
2 parents 7208491 + 3fd5a96
commit 0579c9d
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 7 deletions.
diff --git a/src/TauStellwerk.Client/Resources/Resources.Designer.cs b/src/TauStellwerk.Client/Resources/Resources.Designer.cs
diff --git a/src/TauStellwerk.Client/Resources/Resources.de.resx b/src/TauStellwerk.Client/Resources/Resources.de.resx
@@ -226,7 +226,7 @@
     <value>Status noch nicht bekannt</value>
   </data>
   <data name="StatusRunningSubtitle" xml:space="preserve">
-    <value>TauStellwerk wurde gestartet von:</value>
+    <value>Gestartet von:</value>
   </data>
   <data name="Open" xml:space="preserve">
     <value>Öffnen</value>
@@ -252,4 +252,7 @@
   <data name="NonePlaceholder" xml:space="preserve">
     <value>Keine</value>
   </data>
+  <data name="EngineSameAddress" xml:space="preserve">
+    <value>Lokomotiven mit gleicher Adresse</value>
+  </data>
 </root>
diff --git a/src/TauStellwerk.Client/Resources/Resources.gsw.resx b/src/TauStellwerk.Client/Resources/Resources.gsw.resx
@@ -127,7 +127,7 @@
         <value>Status nonig bekannt</value>
     </data>
   <data name="StatusRunningSubtitle" xml:space="preserve">
-    <value>TauStellwerk isch gstarted worde vo:</value>
+    <value>Gstarted worde vo:</value>
   </data>
     <data name="Open" xml:space="preserve">
         <value>Öffne</value>
@@ -153,4 +153,7 @@
   <data name="Write" xml:space="preserve">
     <value>Schribe</value>
   </data>
+  <data name="EngineSameAddress" xml:space="preserve">
+    <value>Loks mit gliicher Adresse</value>
+  </data>
 </root>
diff --git a/src/TauStellwerk.Client/Resources/Resources.resx b/src/TauStellwerk.Client/Resources/Resources.resx
@@ -226,7 +226,7 @@
     <value>State not yet loaded</value>
   </data>
   <data name="StatusRunningSubtitle" xml:space="preserve">
-    <value>TauStellwerk was started by:</value>
+    <value>Started by:</value>
   </data>
   <data name="Open" xml:space="preserve">
     <value>Open</value>
@@ -252,4 +252,7 @@
   <data name="NonePlaceholder" xml:space="preserve">
     <value>None</value>
   </data>
+  <data name="EngineSameAddress" xml:space="preserve">
+    <value>Engines with same address</value>
+  </data>
 </root>
diff --git a/src/TauStellwerk.Client/Services/EngineService.cs b/src/TauStellwerk.Client/Services/EngineService.cs
@@ -66,6 +66,17 @@ public async Task ReleaseEngine(int id)
         }
     }
 
+    public async Task<List<EngineOverviewDto>> GetEnginesForAddress(int address)
+    {
+        var connection = await _service.TryGetHubConnection();
+        if (connection != null)
+        {
+            return await connection.InvokeAsync<List<EngineOverviewDto>>("GetEnginesForAddress", address);
+        }
+
+        return [];
+    }
+
     public async Task SetSpeed(int id, int speed, Direction direction)
     {
         var limiter = _activeEngines.TryGet(id) ?? throw new InvalidOperationException();

diff --git a/src/TauStellwerk.Data/Dao/EngineDao.cs b/src/TauStellwerk.Data/Dao/EngineDao.cs
@@ -70,6 +70,21 @@ public async Task<Result<Engine>> GetEngine(int id)
         return result.Select(e => e.ToEngineDto()).ToList();
     }
 
+    public async Task<List<EngineOverviewDto>> GetEnginesWithAddress(int address)
+    {
+        var stopwatch = Stopwatch.StartNew();
+
+        var result = await _dbContext.Engines
+            .AsSingleQuery()
+            .Where(e => e.Address == address)
+            .Take(6)
+            .Select(e => e.ToEngineDto())
+            .ToListAsync();
+
+        _logger.LogDebug("Engines with address {address} were queried in {time}ms", address, stopwatch.Elapsed.TotalMilliseconds.ToString("F2", CultureInfo.CurrentCulture));
+        return result;
+    }
+
     public async Task<Result<EngineFullDto>> UpdateOrAdd(EngineFullDto engineDto)
     {
         Engine? engine;

diff --git a/src/TauStellwerk.Desktop/ViewModels/DecoderProgrammingViewModel.cs b/src/TauStellwerk.Desktop/ViewModels/DecoderProgrammingViewModel.cs
@@ -4,13 +4,15 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Splat;
+using TauStellwerk.Client.Services;
 using TauStellwerk.Client.Services.DecoderProgramming;
 
 namespace TauStellwerk.Desktop.ViewModels;
 
 public partial class DecoderProgrammingViewModel : ViewModelBase
 {
     private readonly IDecoderProgrammingService _decoderProgrammingService;
+    private readonly EngineService _engineService;
 
     [ObservableProperty]
     private int? _dccAddress;
@@ -21,9 +23,34 @@ public partial class DecoderProgrammingViewModel : ViewModelBase
     [ObservableProperty]
     private bool _isNotProgramming = true;
 
-    public DecoderProgrammingViewModel(IDecoderProgrammingService? programmingService = null)
+    [ObservableProperty]
+    private List<string> _enginesWithSameAddress = [];
+
+    [ObservableProperty]
+    private bool _hasManyEnginesWithSameAddress;
+
+    public DecoderProgrammingViewModel(IDecoderProgrammingService? programmingService = null, EngineService? engineService = null)
     {
-        _decoderProgrammingService = programmingService ?? Locator.Current.GetService<IDecoderProgrammingService>() ?? throw new InvalidOperationException();
+        _decoderProgrammingService = programmingService ?? Locator.Current.GetRequiredService<IDecoderProgrammingService>();
+        _engineService = engineService ?? Locator.Current.GetRequiredService<EngineService>();
+
+        PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName == nameof(DccAddress))
+            {
+                HandleChangedAddress();
+            }
+        };
+    }
+
+    private async void HandleChangedAddress()
+    {
+        if (DccAddress is > 0 and < 10240)
+        {
+            var engines = await _engineService.GetEnginesForAddress((int)DccAddress);
+            EnginesWithSameAddress = engines.Take(5).Select(e => e.Name).ToList();
+            HasManyEnginesWithSameAddress = engines.Count > 5;
+        }
     }
 
     [RelayCommand]

diff --git a/src/TauStellwerk.Desktop/Views/DecoderProgrammingWindow.axaml b/src/TauStellwerk.Desktop/Views/DecoderProgrammingWindow.axaml
@@ -7,7 +7,8 @@
         xmlns:viewModels="clr-namespace:TauStellwerk.Desktop.ViewModels"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="TauStellwerk.Desktop.Views.DecoderProgrammingWindow"
-        Title="ProgrammingWindow">
+        Title="ProgrammingWindow"
+        Icon="/Assets/tauStellwerk.ico">
     <Design.DataContext>
         <viewModels:DecoderProgrammingViewModel />
     </Design.DataContext>
@@ -22,6 +23,15 @@
                 <Button Command="{Binding WriteDccAddressCommand}" Content="{x:Static r:Resources.Write}" IsEnabled="{Binding IsNotProgramming}"/>
             </StackPanel>
             <Label Content="{Binding Message}" Classes="Warning"></Label>
+            <Label Content="{x:Static r:Resources.EngineSameAddress}"/>
+            <ItemsControl ItemsSource="{Binding EnginesWithSameAddress}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Label Content="{Binding}"/>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <Label IsVisible="{Binding HasManyEnginesWithSameAddress}" Content="..."/>
         </StackPanel>
     </DockPanel>
 </Window>
diff --git a/src/TauStellwerk.Server/Hub/TauHubEngine.cs b/src/TauStellwerk.Server/Hub/TauHubEngine.cs
@@ -66,6 +66,13 @@ public async Task<Result<EngineFullDto>> GetEngine([FromServices] EngineDao engi
         return list;
     }
 
+    public async Task<List<EngineOverviewDto>> GetEnginesForAddress(
+        [FromServices] EngineDao engineDao,
+        int address)
+    {
+        return await engineDao.GetEnginesWithAddress(address);
+    }
+
     public async Task<ResultDto<EngineFullDto>> AddOrUpdateEngine([FromServices] EngineDao engineDao, EngineFullDto engine)
     {
         if (engine.Id is not 0)