diff --git a/ENI2/Controls/StatusWindowBase.cs b/ENI2/Controls/StatusWindowBase.cs index 205c4af9..e555e56c 100644 --- a/ENI2/Controls/StatusWindowBase.cs +++ b/ENI2/Controls/StatusWindowBase.cs @@ -50,5 +50,16 @@ namespace ENI2.Controls // this.SetPlacement(..) } + public void BringUp() + { + if (!IsVisible) this.Show(); + if (WindowState == WindowState.Minimized) + WindowState = WindowState.Normal; + Activate(); + Topmost = true; // k.a. ob dieser grauenhafte Hack notwendig ist.. + Topmost = false; + System.Diagnostics.Trace.WriteLine("XXX"); + } + } } diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs index 11d4237f..4e9be988 100644 --- a/ENI2/DetailRootControl.xaml.cs +++ b/ENI2/DetailRootControl.xaml.cs @@ -1047,7 +1047,11 @@ namespace ENI2 this._errorListDialog.Loaded += (o, e) => this._errorListDialog.RefreshVisible = true; this._errorListDialog.ErrorSelected += _errorListDialog_ErrorSelected; this._errorListDialog.RefreshClicked += _errorListDialog_RefreshClicked; - this._errorListDialog.Show(); + this._errorListDialog.Show(); + } + else + { + this._errorListDialog.BringUp(); } this._errorListDialog.Errors = vErrors; } @@ -1056,13 +1060,17 @@ namespace ENI2 { if(this._violationListDialog == null) { - this._violationListDialog = new ViolationListDialog(); + this._violationListDialog = new ViolationListDialog(); this._violationListDialog.Closed += (o, e) => this._violationListDialog = null; this._violationListDialog.Loaded += (o, e) => this._violationListDialog.RefreshVisible = true; this._violationListDialog.ViolationSelected += _errorListDialog_ErrorSelected; this._violationListDialog.RefreshClicked += _errorListDialog_RefreshClicked; - this._violationListDialog.Show(); - } + this._violationListDialog.Show(); + } + else + { + this._violationListDialog.BringUp(); + } _violationListDialog.Violations = vViolations; } diff --git a/ENI2/EditControls/ErrorListDialog.xaml b/ENI2/EditControls/ErrorListDialog.xaml index 587cfdf7..76cff46c 100644 --- a/ENI2/EditControls/ErrorListDialog.xaml +++ b/ENI2/EditControls/ErrorListDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_red.ico" Topmost="True"> + Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_red.ico" Topmost="False"> diff --git a/ENI2/EditControls/ShowIdDialog.xaml b/ENI2/EditControls/ShowIdDialog.xaml index 861baefe..b958ab2f 100644 --- a/ENI2/EditControls/ShowIdDialog.xaml +++ b/ENI2/EditControls/ShowIdDialog.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:ENI2.EditControls" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textVisitTransitId}" Height="236" Width="300" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" Topmost="True"> + Title="{x:Static p:Resources.textVisitTransitId}" Height="236" Width="300" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" Topmost="False"> diff --git a/ENI2/EditControls/SystemErrorDialog.xaml b/ENI2/EditControls/SystemErrorDialog.xaml index 9cc689ee..b3a8b79f 100644 --- a/ENI2/EditControls/SystemErrorDialog.xaml +++ b/ENI2/EditControls/SystemErrorDialog.xaml @@ -16,7 +16,7 @@ - + diff --git a/ENI2/EditControls/ViolationListDialog.xaml b/ENI2/EditControls/ViolationListDialog.xaml index ba797b83..651a4e22 100644 --- a/ENI2/EditControls/ViolationListDialog.xaml +++ b/ENI2/EditControls/ViolationListDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Topmost="True"> + Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Topmost="False"> diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index db44af40..c7206f2f 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -434,7 +434,7 @@ namespace ENI2.Excel { string ibc_productName = string.Format("HAZA.IBC.ProductName_{0}", i); string ibc_pollutionCategory = string.Format("HAZA.IBC.PollutionCategory_{0}", i); - string ibc_flash = string.Format("HAZA.IBC.FlashpointInformation_{0}", i); + string ibc_flash = string.Format("HAZA.IBC.Flashpoint_CEL_{0}", i); string ibc_quantity = string.Format("HAZA.IBC.Quantity_KGM_{0}", i); string ibc_stowagePosition = string.Format("HAZA.IBC.StowagePosition_{0}", i); string ibc_portOfLoading = string.Format("HAZA.IBC.PortOfLoading_{0}", i); diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs index 385fb4cb..2d2838f3 100644 --- a/ENI2/Excel/ExcelWriter.cs +++ b/ENI2/Excel/ExcelWriter.cs @@ -505,7 +505,7 @@ namespace ENI2.Excel { string ibc_productName = string.Format("{1}.IBC.ProductName_{0}", i + 1, className); string ibc_pollutionCategory = string.Format("{1}.IBC.PollutionCategory_{0}", i + 1, className); - string ibc_flash = string.Format("{1}.IBC.FlashpointInformation_{0}", i + 1, className); + string ibc_flash = string.Format("{1}.IBC.Flashpoint_CEL_{0}", i + 1, className); string ibc_quantity = string.Format("{1}.IBC.Quantity_KGM_{0}", i + 1, className); string ibc_stowagePosition = string.Format("{1}.IBC.StowagePosition_{0}", i + 1, className); string ibc_portOfLoading = string.Format("{1}.IBC.PortOfLoading_{0}", i + 1, className); diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs index e675ba42..ae7de548 100644 --- a/ENI2/MainWindow.xaml.cs +++ b/ENI2/MainWindow.xaml.cs @@ -426,11 +426,11 @@ namespace ENI2 }; this.showIdDict.Add(closedDialog.Core.Id.Value, showIdDialog); showIdDialog.Show(); - this.UpdateWaitIdLabel(); - + showIdDialog.Activate(); + this.UpdateWaitIdLabel(); } }; - visitIdDialog.Show(); + visitIdDialog.Show(); } /// @@ -558,6 +558,7 @@ namespace ENI2 this.AnmeldungenControl_MessageCoreSelected(changedCore); }; showIdDialog.Show(); + showIdDialog.Activate(); showIdDialog.UpdateId(changedCore.VisitId.IsNullOrEmpty() ? changedCore.TransitId : changedCore.VisitId); })); }