[BUG] ShadowDisplay presenter in Bypass Exclude not working properly (#…

…632) * Create draft PR for #631 * * fix display shadow presentation in inspectors + localization in inspection dialog buttons --------- Co-authored-by: peterbarancek <peterbarancek@users.noreply.github.com> Co-authored-by: Peter Barancek <peter.barancek@mts.sk>
TcOpenGroup · Sep 4, 2023 · 7472520 · 7472520
1 parent a11d7ab
commit 7472520
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 32 deletions.
diff --git a/...Inxton.TcoInspectors.Wpf/Abstractions/InspectorDialogue/TcoInspectorDialogDialogView.xaml b/...Inxton.TcoInspectors.Wpf/Abstractions/InspectorDialogue/TcoInspectorDialogDialogView.xaml
@@ -57,10 +57,10 @@
                         <Setter Property="Margin" Value="10" />
                     </Style>
                 </WrapPanel.Resources>
-                <Button Command="{Binding RetryCommand, Mode=OneWay}" Content="Retry" />
-                <Button Command="{Binding TerminateCommand, Mode=OneWay}" Content="Terminate" />
+                <Button Command="{Binding RetryCommand, Mode=OneWay}" Content="{x:Static s:strings.Retry}" />
+                <Button Command="{Binding TerminateCommand, Mode=OneWay}" Content="{x:Static s:strings.Terminate}" />
                 <vortexs:PermissionBox Permissions="can_override_inspection">
-                    <Button Command="{Binding OverrideCommand, Mode=OneWay}" Content="Override" />
+                    <Button Command="{Binding OverrideCommand, Mode=OneWay}" Content="{x:Static s:strings.Override}" />
                 </vortexs:PermissionBox>
             </WrapPanel>
             <Expander

diff --git a/src/TcoInspectors/src/Wpf/TcOpen.Inxton.TcoInspectors.Wpf/Properties/strings.sk-SK.resx b/src/TcoInspectors/src/Wpf/TcOpen.Inxton.TcoInspectors.Wpf/Properties/strings.sk-SK.resx
@@ -136,18 +136,18 @@
     <value>Vylúčené</value>
   </data>
   <data name="InspectionWasBypassed" xml:space="preserve">
-    <value>Obchádzka</value>
+    <value>Preskočiť</value>
   </data>
   <data name="InspectionFailedYouWillNeedToDecideWhatSNext" xml:space="preserve">
     <value>Kontrola zlyhala, budete sa musieť rozhodnúť, čo ďalej...</value>
   </data>
   <data name="Retry" xml:space="preserve">
-    <value>Opakovanie</value>
+    <value>Opakovať</value>
   </data>
   <data name="Terminate" xml:space="preserve">
     <value>Ukončiť</value>
   </data>
   <data name="Override" xml:space="preserve">
-    <value>Override</value>
+    <value>Nahradiť</value>
   </data>
 </root>
diff --git a/...n.TcoInspectors.Wpf/TcoAnalogueInpector/Shadow/TcoAnalogueInspectorShadowDisplayView.xaml b/...n.TcoInspectors.Wpf/TcoAnalogueInpector/Shadow/TcoAnalogueInspectorShadowDisplayView.xaml
@@ -33,14 +33,8 @@
                         <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.DetectedStatus}" PresentationType="ShadowDisplaySlim"/>
                         <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.RequiredMax}" PresentationType="ShadowDisplaySlim"/>
 
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="4"
-                        DataContext="{Binding _data.IsByPassed}"
-                        PresentationType="DisplaySlim" />
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="5"
-                        DataContext="{Binding _data.IsExcluded}"
-                        PresentationType="DisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsByPassed}" PresentationType="ShadowDisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsExcluded}" PresentationType="ShadowDisplaySlim" />
 
                         <StackPanel Grid.Column="5" Margin="10,0">
                             <materialDesign:PackIcon HorizontalAlignment="Stretch" 

diff --git a/...n.Inxton.TcoInspectors.Wpf/TcoDataInspector/Shadow/TcoDataInspectorShadowDisplayView.xaml b/...n.Inxton.TcoInspectors.Wpf/TcoDataInspector/Shadow/TcoDataInspectorShadowDisplayView.xaml
@@ -32,14 +32,8 @@
                         <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.RequiredStatus}" PresentationType="ShadowDisplaySlim"/>
                         <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.DetectedStatus}" PresentationType="ShadowDisplaySlim"/>
                         <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.StarNotationEnabled}" PresentationType="ShadowDisplaySlim"/>
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="4"
-                        DataContext="{Binding _data.IsByPassed}"
-                        PresentationType="DisplaySlim" />
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="5"
-                        DataContext="{Binding _data.IsExcluded}"
-                        PresentationType="DisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsByPassed}" PresentationType="ShadowDisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsExcluded}" PresentationType="ShadowDisplaySlim" />
                         <StackPanel Grid.Column="5" Margin="10,0">
                             <materialDesign:PackIcon HorizontalAlignment="Stretch" 
                                                  VerticalAlignment="Stretch"                                                  

diff --git a/...on.TcoInspectors.Wpf/TcoDigitalInspector/Shadow/TcoDigitalInspectorShadowDisplayView.xaml b/...on.TcoInspectors.Wpf/TcoDigitalInspector/Shadow/TcoDigitalInspectorShadowDisplayView.xaml
@@ -30,16 +30,10 @@
                     <TextBlock Margin="0,0,20,0" Grid.ColumnSpan="2" TextWrapping="WrapWithOverflow" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="1" Grid.Column="0" Text="{Binding Converter={controls:NameOrSymbolConverter}}"></TextBlock>
 
                     <WrapPanel Grid.Column="2">
-                        <controls:RenderableContentControl Grid.Column="1" Margin="10,0" DataContext="{Binding _data.RequiredStatus}" PresentationType="ShadowDisplaySlim"/>
-                        <controls:RenderableContentControl Grid.Column="2" Margin="10,0" DataContext="{Binding _data.DetectedStatus}" PresentationType="ShadowDisplaySlim"/>
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="4"
-                        DataContext="{Binding _data.IsByPassed}"
-                        PresentationType="DisplaySlim" />
-                        <controls:RenderableContentControl Margin="10,0"
-                        Grid.Column="5"
-                        DataContext="{Binding _data.IsExcluded}"
-                        PresentationType="DisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.RequiredStatus}" PresentationType="ShadowDisplaySlim"/>
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.DetectedStatus}" PresentationType="ShadowDisplaySlim"/>
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsByPassed}" PresentationType="ShadowDisplaySlim" />
+                        <controls:RenderableContentControl Margin="10,0" DataContext="{Binding _data.IsExcluded}" PresentationType="ShadowDisplaySlim" />
                         <StackPanel Grid.Column="5" Margin="10,0">
                             <materialDesign:PackIcon HorizontalAlignment="Stretch" 
                                                  VerticalAlignment="Stretch"