marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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,

Browse Source 
FinalTest: - Layout slightly changed
PasswordController: - Debug varable introduced
This commit is contained in:
Thomas Wiedebusch
2022-06-13 14:49:22 +02:00
parent b4b1b831c0
commit f7e0f63125
6 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site> </site>
<site name="MeterProcessState" id="2"> <site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <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> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" /> <binding protocol="http" bindingInformation="*:56011:localhost" />
Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
1a3d4919c9c702245832d925951f2b7cb72fc333 d6acafee485301268608cd081e3b8b166497c098
Common/ProductionUiCordonel/FinalTest.xaml
+12 -12
View File
@@ -81,31 +81,31 @@
<RowDefinition MinHeight="50"/> <RowDefinition MinHeight="50"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="125" Width="1*"/> <ColumnDefinition MinWidth="125" Width="125*"/>
<ColumnDefinition MinWidth="148" Width="1*"/> <ColumnDefinition MinWidth="148" Width="158*"/>
<ColumnDefinition MinWidth="125" Width="4*" /> <ColumnDefinition MinWidth="125" Width="221*" />
<ColumnDefinition MinWidth="100" Width="1*"/> <ColumnDefinition MinWidth="100" Width="130*"/>
</Grid.ColumnDefinitions> </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="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="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="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="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="128" /> <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="128" /> <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="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"/> <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" Height="218" Margin="10,4,0,0" Grid.Row="4" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Width="332" Grid.ColumnSpan="2"/> <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" /> <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="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"/> <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> </Grid>
</DockPanel> </DockPanel>
Common/Service/MeterProcessState/Controllers/PasswordController.cs
+11 -3
View File
@@ -181,7 +181,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
catch (Exception) catch (Exception)
{ {
} }
var logon = from p in o["TestStepResults"]["$values"] select p; var logon = from p in o["TestStepResults"]["$values"] select p;
@@ -222,14 +222,14 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
catch (Exception e) catch (Exception e)
{ {
return new PwProcessorId(e.Message + e.StackTrace); return new PwProcessorId(e.Message + e.StackTrace);
} }
return new PwProcessorId(); return new PwProcessorId();
} }
}); });
@@ -451,6 +451,12 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
//pw lvl //pw lvl
passwords.Keys.Insert(2, new Key() { Index = 2, KeyKey = result.Skeleton }); 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) foreach (var keyLVL in passwords.Keys)
{ {
using (System.Security.Cryptography.SHA1Managed sha1 = new System.Security.Cryptography.SHA1Managed()) 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 Request.CreateResponse(HttpStatusCode.OK, await Task.Run(() =>
{ {
return result; return result;
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
f64d563def603c89cafafa61a3219ba97e1e344c 8b50223304bf33a04e89f81c8416e46bbd1ea8d8
ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.Designer.cs
Generated
-1
View File
@@ -805,7 +805,6 @@
resources.ApplyResources(this.tbxCustomerName, "tbxCustomerName"); resources.ApplyResources(this.tbxCustomerName, "tbxCustomerName");
this.tbxCustomerName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbxCustomerName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbxCustomerName.Name = "tbxCustomerName"; this.tbxCustomerName.Name = "tbxCustomerName";
this.tbxCustomerName.ReadOnly = true;
this.tbxCustomerName.ShortcutsEnabled = false; this.tbxCustomerName.ShortcutsEnabled = false;
this.tbxCustomerName.TabStop = false; this.tbxCustomerName.TabStop = false;
// //