dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kleinere Fehlerkorrekturen

Browse Source
This commit is contained in:
Daniel Schick 2022-03-11 07:54:17 +01:00
parent 958f236ac0
commit 6ae0d611c4
9 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ENI2/Controls/StatusWindowBase.cs
View File

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

16
ENI2/DetailRootControl.xaml.cs
View File

@ -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;
}

2
ENI2/EditControls/ErrorListDialog.xaml
View File

@ -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="*" />

2
ENI2/EditControls/ShowIdDialog.xaml
View File

@ -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>

2
ENI2/EditControls/SystemErrorDialog.xaml
View File

@ -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>

2
ENI2/EditControls/ViolationListDialog.xaml
View File

@ -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="*" />

2
ENI2/Excel/ExcelUtil.cs
View File

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

2
ENI2/Excel/ExcelWriter.cs
View File

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

7
ENI2/MainWindow.xaml.cs
View File

@ -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();
}
/// <summary>
@ -558,6 +558,7 @@ namespace ENI2
this.AnmeldungenControl_MessageCoreSelected(changedCore);
};
showIdDialog.Show();
showIdDialog.Activate();
showIdDialog.UpdateId(changedCore.VisitId.IsNullOrEmpty() ? changedCore.TransitId : changedCore.VisitId);
}));
}