diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index 76b4de0a..7b653b67 100644 --- a/Common/.shared/SharedAssemblyInfo.cs +++ b/Common/.shared/SharedAssemblyInfo.cs @@ -14,4 +14,4 @@ using System.Reflection; //[assembly: AssemblyVersion("1.2.*.0")] -[assembly: AssemblyVersion("2.6.13.*")] +[assembly: AssemblyVersion("2.6.14.*")] diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs index 76575467..72704585 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs @@ -31,6 +31,7 @@ using Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.EventArguments; using Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.MeasurementRecords; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts; +using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Properties; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisPwd; using Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol; using Xylem.Common.Hardware.WaterMeter.Genesis.Protocols.RequestProtocol.Consts; @@ -510,14 +511,15 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore nameof(Genesis), configFile); if (!new FileInfo(configFilePath).Exists) { - Logger.Fatal($"Slot:{Slot} - Missing register definition file (configuration.json). Search location: {configFilePath}"); - throw new ApplicationException("Missing register definition file (configuration.json). Setup is invalid!"); + var msg = $"Slot:{Slot} - {Resources.StrErrorMissingConfiguration} {location}"; + Logger.Fatal($"Slot:{Slot} - Missing register definition file (configuration.json). Search location: {location}"); + throw new ApplicationException(msg); } } try { - Logger.Trace($"Slot:{Slot} - Registers definitions loaded from {configFilePath}"); + Logger.Trace($"Slot:{Slot} - Registers definitions loaded from {location}"); if (Configuration.AutoUpdateFiles) { Logger.Trace($"Slot:{Slot} - Check for updates of {configFilePath}"); @@ -815,9 +817,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore } catch (Exception ex) { - throw new ApplicationException("Cannot Open Comport. Check TaskManager for other Genesis " + - "relevant programs and close them. " + - $"Also check if the comport is valid! { Environment.NewLine }{ ex.Message}"); + var msg = $"Slot:{Slot} - {Resources.StrErrorMsgComPort} { ex.Message}"; + Logger.Fatal(msg); + throw new ApplicationException(msg); } protocol.OnRecordReadyToSend += delegate (Object o, BasePortDataEventArgs dataToSend) diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.Designer.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.Designer.cs index afb85796..6efb2ce4 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.Designer.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.Designer.cs @@ -60,6 +60,24 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Properties { } } + /// + /// Looks up a localized string similar to ERROR: Missing or invalid register definition (configuration.json)! Search in:. + /// + internal static string StrErrorMissingConfiguration { + get { + return ResourceManager.GetString("StrErrorMissingConfiguration", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot Open Comport. Check TaskManager for other Genesis relevant programs and close them! Also check if the comport is valid!. + /// + internal static string StrErrorMsgComPort { + get { + return ResourceManager.GetString("StrErrorMsgComPort", resourceCulture); + } + } + /// /// Looks up a localized string similar to ERROR: Could not find a CSD parameter in register list!. /// diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.de.resx b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.de.resx index 7c3ba37c..b1a59e7f 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.de.resx +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.de.resx @@ -186,4 +186,10 @@ FEHLER: Register konnte nicht geschrieben werden! + + FEHLER: Konfigurationsdatei (configuration.json) nicht gefunden oder ungültig! Erwartetes Verzeichnis: + + + Kommunikationsanschluß nicht vorhanden oder von anderer Genesis App blockiert! Bitte TaskManger starten und prüfen! + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.resx b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.resx index 247a1699..be7333d5 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.resx +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/Properties/Resources.resx @@ -186,4 +186,10 @@ ERROR: Could not write register! + + ERROR: Missing or invalid register definition (configuration.json)! Search in: + + + Cannot Open Comport. Check TaskManager for other Genesis relevant programs and close them! Also check if the comport is valid! + \ No newline at end of file diff --git a/Common/LaaPackages b/Common/LaaPackages index ce1dc260..e7aa3e27 160000 --- a/Common/LaaPackages +++ b/Common/LaaPackages @@ -1 +1 @@ -Subproject commit ce1dc26047374fd7a9328914a6c2bd7eb591f012 +Subproject commit e7aa3e2723a435f0a714df661dc5d86dfd45a71c diff --git a/Common/Production/ProductionUiCordonel/FinalTest.xaml.cs b/Common/Production/ProductionUiCordonel/FinalTest.xaml.cs index 3efbce3e..25164580 100644 --- a/Common/Production/ProductionUiCordonel/FinalTest.xaml.cs +++ b/Common/Production/ProductionUiCordonel/FinalTest.xaml.cs @@ -82,7 +82,7 @@ namespace Xylem.Common.Production.ProductionUiCordonel } catch (Exception e) { - msg = Properties.Resources.StrErrorMsgMissingNetworkConnetction + "\n" + e.Message ; + msg = Properties.Resources.StrErrorMsgMissingNetworkConnetction + " " + e.Message ; _logger.Error(msg); MessageBox.Show(msg, Properties.Resources.StrProcessStateError, @@ -93,7 +93,7 @@ namespace Xylem.Common.Production.ProductionUiCordonel InitializeComponent(); // Log version to files for debug purposes - _strSoftwareNameVersion = $"{Properties.Resources.StrSoftwareNameVersion}{_version}"; + _strSoftwareNameVersion = $"{Properties.Resources.StrSoftwareNameVersion} {_version}"; _logger.Info(_strSoftwareNameVersion); Title = _strSoftwareNameVersion; @@ -181,12 +181,11 @@ namespace Xylem.Common.Production.ProductionUiCordonel } catch (Exception ex) { - var msg = Properties.Resources.StrErrorMsgMissingComPort + $"\nSlot:{Slot}"; - _logger.Error(msg); - MessageBox.Show(msg, + _logger.Error(ex.Message); + MessageBox.Show(ex.Message, Properties.Resources.StrProcessStateError, MessageBoxButton.OK, MessageBoxImage.Error); - throw new ApplicationException(msg + $"\n{ex.Message}"); + throw new ApplicationException(ex.Message); } //install the process changed event handler for single processes diff --git a/LaaProductionWeb/LaaPackages b/LaaProductionWeb/LaaPackages new file mode 160000 index 00000000..e7aa3e27 --- /dev/null +++ b/LaaProductionWeb/LaaPackages @@ -0,0 +1 @@ +Subproject commit e7aa3e2723a435f0a714df661dc5d86dfd45a71c