kleinere Fehlerkorrekturen

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");
+        }
+
     }
 }

ENI2/DetailRootControl.xaml.cs

@@ -1049,6 +1049,10 @@ namespace ENI2
                         this._errorListDialog.RefreshClicked += _errorListDialog_RefreshClicked;
                         this._errorListDialog.Show();                        
                     } 
+                    else
+                    {
+                        this._errorListDialog.BringUp();
+                    }
                     this._errorListDialog.Errors = vErrors;
                 }
 
@@ -1063,6 +1067,10 @@ namespace ENI2
                         this._violationListDialog.RefreshClicked += _errorListDialog_RefreshClicked;
                         this._violationListDialog.Show();                        
                     }
+                    else
+                    {
+                        this._violationListDialog.BringUp();
+                    }
                     _violationListDialog.Violations = vViolations;
                 }
 

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">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

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">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="110"></ColumnDefinition>

ENI2/EditControls/SystemErrorDialog.xaml

@@ -16,7 +16,7 @@
         <enictrl:ENIDataGrid Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0" x:Name="dataGridSystemErrors">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="At" Binding="{Binding Created}" IsReadOnly="True" Width="0.15*" />
+                <DataGridTextColumn Header="At" Binding="{Binding ErrorAt}" IsReadOnly="True" Width="0.15*" />
                 <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding ErrorCode}" IsReadOnly="True" Width="0.1*" />
                 <DataGridTextColumn Header="{x:Static p:Resources.textMessage}" Binding="{Binding ErrorMessage}" IsReadOnly="True" Width="0.25*">
                     <DataGridTextColumn.ElementStyle>

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">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />

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);

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);

ENI2/MainWindow.xaml.cs

@@ -426,8 +426,8 @@ namespace ENI2
                     };
                     this.showIdDict.Add(closedDialog.Core.Id.Value, showIdDialog);
                     showIdDialog.Show();
+                    showIdDialog.Activate();
                     this.UpdateWaitIdLabel();
-                   
                 }
             };
             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);
                         }));
                     }