From f7e0f63125409e51600dfb70a12cefb565815650 Mon Sep 17 00:00:00 2001
From: Thomas Wiedebusch <thomas.wiedebusch@t-wiedebusch.de>
Date: Mon, 13 Jun 2022 14:49:22 +0200
Subject: [PATCH] FwUpdateBuilder: -Customer field can be changed manually to
 give the safe a different name and overcome the data base limitations of the
 naming field size and special characters, FinalTest: - Layout slightly
 changed PasswordController: - Debug varable introduced

---
 Common/.vs/config/applicationhost.config      |  2 +-
 ...erRegisters.csproj.CoreCompileInputs.cache |  2 +-
 Common/ProductionUiCordonel/FinalTest.xaml    | 24 +++++++++----------
 .../Controllers/PasswordController.cs         | 14 ++++++++---
 ...ToXlsHelper.csproj.CoreCompileInputs.cache |  2 +-
 .../FrmFwUpdateBuilder.Designer.cs            |  1 -
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config
index 1b9332b4..305a2bb6 100644
--- a/Common/.vs/config/applicationhost.config
+++ b/Common/.vs/config/applicationhost.config
@@ -155,7 +155,7 @@
 			</site>
             <site name="MeterProcessState" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\wiedebu_th.WORLD\Source\Repos\laa_production\Common\Service\MeterProcessState" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:56011:localhost" />
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
index d8b5c8f6..7286a520 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-1a3d4919c9c702245832d925951f2b7cb72fc333
+d6acafee485301268608cd081e3b8b166497c098
diff --git a/Common/ProductionUiCordonel/FinalTest.xaml b/Common/ProductionUiCordonel/FinalTest.xaml
index cc096e5a..b3ca4e68 100644
--- a/Common/ProductionUiCordonel/FinalTest.xaml
+++ b/Common/ProductionUiCordonel/FinalTest.xaml
@@ -81,31 +81,31 @@
                 <RowDefinition MinHeight="50"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition MinWidth="125" Width="1*"/>
-                <ColumnDefinition MinWidth="148" Width="1*"/>
-                <ColumnDefinition MinWidth="125" Width="4*" />
-                <ColumnDefinition MinWidth="100" Width="1*"/>
+                <ColumnDefinition MinWidth="125" Width="125*"/>
+                <ColumnDefinition MinWidth="148" Width="158*"/>
+                <ColumnDefinition MinWidth="125" Width="221*" />
+                <ColumnDefinition MinWidth="100" Width="130*"/>
             </Grid.ColumnDefinitions>
-            <Button Name="btnStart" IsEnabled="False" Content="Start" Click="ButtonBase_OnClick"  HorizontalAlignment="Left" Height="58" Margin="236,0,0,2" VerticalAlignment="Bottom" Width="122" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="2" />
+            <Button Name="btnStart" IsEnabled="False" Content="Start" Click="ButtonBase_OnClick"  HorizontalAlignment="Left" Height="58" Margin="0,0,0,1" VerticalAlignment="Bottom" Width="122" Grid.Row="0" Grid.Column="3" Grid.RowSpan="2" />
             <Label Content="SerialNumber" HorizontalAlignment="Left"  Margin="10,1,0,0" VerticalAlignment="Top"  Grid.Row="0" Grid.Column="0" Height="26" Width="82"  />
             <Label Content="RadioAdress" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="0" Height="26" Width="76"   />
             <Label Content="OrderNumber" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="0" Height="26" Width="84"   />
 
 
-            <Label Content="" Name="lblSerialNumber" HorizontalAlignment="Left"  Margin="10,1,0,0" VerticalAlignment="Top"  Grid.Row="0" Grid.Column="1" Height="26" Width="128"  />
-            <Label Content="" Name="lblRadioAdress" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="1" Height="26" Width="128"   />
-            <Label Content="" Name="lblOrderNumber" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="1" Height="26" Width="128"   />
+            <Label Content="" Name="lblSerialNumber" HorizontalAlignment="Left"  Margin="10,1,0,0" VerticalAlignment="Top"  Grid.Row="0" Grid.Column="1" Height="26" Width="240" Grid.ColumnSpan="2"  />
+            <Label Content="" Name="lblRadioAdress" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="1" Height="26" Width="221" Grid.ColumnSpan="2"   />
+            <Label Content="" Name="lblOrderNumber" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="1" Height="26" Width="221" Grid.ColumnSpan="2"   />
 
             <Label Content="Status" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="0" Height="26" Width="84"   />
-            <Label Content="Warte auf Zähler" Name="lblCurrentProcess" Margin="10,3,10,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Height="26"   />
+            <Label Content="Warte auf Zähler" Name="lblCurrentProcess" Margin="10,3,10,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Height="26" RenderTransformOrigin="0.607,0.577"   />
 
-            <DataGrid Name="dgTotalProcess" ItemsSource="{Binding}"  AutoGenerateColumns="True" HorizontalAlignment="Left" Margin="10,4,0,5" Width="253" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" SelectionMode="Single" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsEnabled="False"/>
-            <DockPanel Name="dpSubProcess" Grid.Column="2"  Height="218" Margin="10,4,0,0" Grid.Row="4" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="332" Grid.ColumnSpan="2"/>
+            <DataGrid Name="dgTotalProcess" ItemsSource="{Binding}"  AutoGenerateColumns="True" HorizontalAlignment="Left" Margin="10,4,0,5" Width="267" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" SelectionMode="Single" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsEnabled="False"/>
+            <DockPanel Name="dpSubProcess" Grid.Column="2" Margin="18,12,8,8" Grid.Row="4" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2"/>
 
             <TextBox Name="txtLog" Grid.Column="0" Grid.ColumnSpan="4"  Grid.Row="7" TextWrapping="Wrap" HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" Margin="0,0,73,10" />
             <ProgressBar Name="pbTotalProgress" Grid.Column="0" Grid.ColumnSpan="4"  Grid.Row="6" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0" />
             <ProgressBar Name="pbSubProgress" Grid.ColumnSpan="2" Grid.Column="2"  Grid.Row="5"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0"/>
-            <Button x:Name="btnDetect" IsEnabled="false" Content="Detect" Click="BtnDetect_Click"  HorizontalAlignment="Left" Height="58" Margin="109,0,0,1" VerticalAlignment="Bottom" Width="122" Grid.Row="0" Grid.Column="2" Grid.RowSpan="2" />
+            <Button x:Name="btnDetect" IsEnabled="false" Content="Detect" Click="BtnDetect_Click"  HorizontalAlignment="Left" Height="58" Margin="97,0,0,0" VerticalAlignment="Bottom" Width="114" Grid.Row="0" Grid.Column="2" Grid.RowSpan="2" />
         </Grid>
 
     </DockPanel>
diff --git a/Common/Service/MeterProcessState/Controllers/PasswordController.cs b/Common/Service/MeterProcessState/Controllers/PasswordController.cs
index bcc1b50a..381462f1 100644
--- a/Common/Service/MeterProcessState/Controllers/PasswordController.cs
+++ b/Common/Service/MeterProcessState/Controllers/PasswordController.cs
@@ -181,7 +181,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
                             catch (Exception)
                             {
 
-                              
+
                             }
 
                             var logon = from p in o["TestStepResults"]["$values"] select p;
@@ -222,14 +222,14 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
                     catch (Exception e)
                     {
                         return new PwProcessorId(e.Message + e.StackTrace);
-            
+
 
 
                     }
 
                     return new PwProcessorId();
 
-      
+
                 }
             });
 
@@ -451,6 +451,12 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
                 //pw lvl  
                 passwords.Keys.Insert(2, new Key() { Index = 2, KeyKey = result.Skeleton });
 
+                var pwdLVL8 = "";
+                if (passwords.Keys.Count > 7)
+                {
+                    pwdLVL8 = passwords.Keys[7].KeyKey.Substring(0, 12);
+                }
+
                 foreach (var keyLVL in passwords.Keys)
                 {
                     using (System.Security.Cryptography.SHA1Managed sha1 = new System.Security.Cryptography.SHA1Managed())
@@ -469,6 +475,8 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
                     }
                 }
 
+
+
                 return Request.CreateResponse(HttpStatusCode.OK, await Task.Run(() =>
                 {
                     return result;
diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
index 0028f628..8345ac8d 100644
--- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f64d563def603c89cafafa61a3219ba97e1e344c
+8b50223304bf33a04e89f81c8416e46bbd1ea8d8
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs
index d7d1b218..8466df1f 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs
@@ -805,7 +805,6 @@
             resources.ApplyResources(this.tbxCustomerName, "tbxCustomerName");
             this.tbxCustomerName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.tbxCustomerName.Name = "tbxCustomerName";
-            this.tbxCustomerName.ReadOnly = true;
             this.tbxCustomerName.ShortcutsEnabled = false;
             this.tbxCustomerName.TabStop = false;
             //