From f04cdf45c51c1d1bd083f1eef0b50acf1e1f8407 Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Mon, 23 Jan 2023 14:45:07 +0100 Subject: [PATCH] ProductionUiCordonel: - ReSharper --- Common/ProductionUiCordonel/FinalTest.xaml.cs | 4 ++-- ...ctionProcessFinalParametrizationVakoCsd.cs} | 18 +++++++++++++----- .../Actions/ProductionProcessPasswordFile.cs | 10 +++++----- .../ProductionUiCordonel.csproj | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) rename Common/ProductionUiCordonel/ProductionProcesses/Actions/{ProductionProcessFinalParameterizationVakoCsd.cs => ProductionProcessFinalParametrizationVakoCsd.cs} (95%) diff --git a/Common/ProductionUiCordonel/FinalTest.xaml.cs b/Common/ProductionUiCordonel/FinalTest.xaml.cs index 3869b471..cecea0b6 100644 --- a/Common/ProductionUiCordonel/FinalTest.xaml.cs +++ b/Common/ProductionUiCordonel/FinalTest.xaml.cs @@ -428,7 +428,7 @@ namespace ProductionUiCordonel //pc.Processes.Add(new ProductionProcessFinalParametrizationFix()); //[x] [x] [] - pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] [] + pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] [] //if (RadioAddress != 0) //{ @@ -445,7 +445,7 @@ namespace ProductionUiCordonel //pc.Processes.Add(new ProductionProcessSpecialConfig()); //[x] [x] [] pc.Processes.Add(new ProductionProcessShippingMode(true, RadioAddress != 0)); //[] [] [] - pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] [] + pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] [] pc.Processes.Add(new ProductionProcessShippingMode(false, RadioAddress != 0)); //[] [] [] diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParametrizationVakoCsd.cs similarity index 95% rename from Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs rename to Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParametrizationVakoCsd.cs index 6602b40e..90dec186 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParametrizationVakoCsd.cs @@ -11,13 +11,13 @@ using Xylem.Common.Logic.ProductionOrderCore; namespace ProductionUiCordonel.ProductionProcesses.Actions { - public class ProductionProcessFinalParameterizationVakoCsd : BaseProductionProcess + public class ProductionProcessFinalParametrizationVakoCsd : BaseProductionProcess { private UcPlain UserControl; private ProductionProcessConnect connectProcess; private Boolean hasRadio; - public ProductionProcessFinalParameterizationVakoCsd(ProductionProcessConnect connectProcess, Boolean registerHasRadio = true) + public ProductionProcessFinalParametrizationVakoCsd(ProductionProcessConnect connectProcess, Boolean registerHasRadio = true) { this.connectProcess = connectProcess; name = "Kunden Parametrierung"; @@ -27,9 +27,17 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions public override void InitUserControl() { - UserControl = new UcPlain(); - UserControl.lblHl.Content = name; - UserControl.lblText.Content = "Dieser Vorgang Kann bis zu 1 Minute dauern!"; + UserControl = new UcPlain + { + lblHl = + { + Content = name + }, + lblText = + { + Content = "Dieser Vorgang kann bis zu 1 Minute dauern!" + } + }; } public override UserControl GetControl() diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs index 5713cbda..0b8b6bcd 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessPasswordFile.cs @@ -51,7 +51,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions { Boolean ret = RequestPassword(); updateImage(UserControl.RequestPassword, ret); - Progress = Progress + 16; + Progress += 16; if (Encoding.UTF8.GetString(pwContainer.listOfPasswords.Last()) == pwContainer.Skeleton)//pwContainer.Skeleton ) @@ -70,14 +70,14 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions updateImage(UserControl.CreateFile, ret); - Progress = Progress + 16; + Progress += 16; if (ret) { ret = WritePasswordFileToMeter(); } updateImage(UserControl.WriteToMeter, ret); - Progress = Progress + 16; + Progress += 16; //Check if new password is in the meter ... even the file write wasn't successful if (!ret) { @@ -90,14 +90,14 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions ret = UpdatePasswordinDb(); } updateImage(UserControl.UpdatePassword, ret); - Progress = Progress + 16; + Progress += 16; if (ret) { ret = Meter.Logout(); } updateImage(UserControl.Logout, ret); - Progress = Progress + 16; + Progress += 16; if (ret) diff --git a/Common/ProductionUiCordonel/ProductionUiCordonel.csproj b/Common/ProductionUiCordonel/ProductionUiCordonel.csproj index ef5c4fcd..e466f08d 100644 --- a/Common/ProductionUiCordonel/ProductionUiCordonel.csproj +++ b/Common/ProductionUiCordonel/ProductionUiCordonel.csproj @@ -164,7 +164,7 @@ - +