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

Korrekturen für 7.0.0.10

Browse Source
This commit is contained in:
Daniel Schick 2022-03-21 18:23:35 +01:00
parent dce64f9a8e
commit 03c31936de
20 changed files with 182 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ENI2/DetailRootControl.xaml.cs
View File

@ -665,6 +665,11 @@ namespace ENI2
RuleEngine ruleEngine = new RuleEngine(); RuleEngine ruleEngine = new RuleEngine();
foreach (Message aMessage in _messages) foreach (Message aMessage in _messages)
{ {
// XXX : TODO wegmachen wenn CREWD/PASD kommt
if ((aMessage.MessageNotificationClass == Message.NotificationClass.PASD) ||
(aMessage.MessageNotificationClass == Message.NotificationClass.CREWD))
continue;
if (!aMessage.EvaluateForValidation(this.Core.IsTransit)) continue; if (!aMessage.EvaluateForValidation(this.Core.IsTransit)) continue;
List<MessageError> errors = new List<MessageError>(); List<MessageError> errors = new List<MessageError>();
@ -723,6 +728,9 @@ namespace ENI2
// Wir können davon ausgehen, dass bei allen Unterelementen die Flags gleich gesetzt sind. Das wird im Import und BorderPoliceDetailControl sichergestellt. // Wir können davon ausgehen, dass bei allen Unterelementen die Flags gleich gesetzt sind. Das wird im Import und BorderPoliceDetailControl sichergestellt.
// XXX : TODO auskommentiert bis CREWD/PASD kommt
/*
if(crewaMessage.Elements.Count > 0) if(crewaMessage.Elements.Count > 0)
{ {
CREW crewaFirst = crewaMessage.Elements[0] as CREW; CREW crewaFirst = crewaMessage.Elements[0] as CREW;
@ -831,6 +839,8 @@ namespace ENI2
} }
} }
*/
#endregion #endregion
#region WAS_RCPT double numbers #region WAS_RCPT double numbers

12
ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
View File

@ -49,7 +49,7 @@
</ScrollViewer> </ScrollViewer>
</GroupBox> </GroupBox>
</TabItem> </TabItem>
<TabItem Header="{x:Static p:Resources.textCrewArrival}" Name="tabCrewArrival"> <TabItem Header="{x:Static p:Resources.textCrew}" Name="tabCrewArrival">
<GroupBox Name="groupBoxCrewList" Header="{x:Static p:Resources.textTabCrewList}"> <GroupBox Name="groupBoxCrewList" Header="{x:Static p:Resources.textTabCrewList}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -60,11 +60,13 @@
<Button Name="buttonImportExcelCrew" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelCrew_Click" /> <Button Name="buttonImportExcelCrew" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelCrew_Click" />
<TextBlock Margin="20, 0, 0, 0" Name="textBlockNumCrewEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/> <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumCrewEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
<Label Name="labelCrewEntryCount" Content="{x:Static p:Resources.textEntries}" /> <Label Name="labelCrewEntryCount" Content="{x:Static p:Resources.textEntries}" />
<!--
<CheckBox Name="checkBoxCrewNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationSchengen_Click"/> <CheckBox Name="checkBoxCrewNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationSchengen_Click"/>
<Label Name="labelCrewNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" /> <Label Name="labelCrewNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
<CheckBox Name="checkBoxCrewNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationPAX_Click"/> <CheckBox Name="checkBoxCrewNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxCrewNotificationPAX_Click"/>
<Label Name="labelCrewNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" /> <Label Name="labelCrewNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
<TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="CREWA" VerticalAlignment="Center" /> <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="CREWA" VerticalAlignment="Center" />
-->
</StackPanel> </StackPanel>
<enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" x:Name="dataGridCrewList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
AutoGenerateColumns="False" Margin="0,5,0,0"> AutoGenerateColumns="False" Margin="0,5,0,0">
@ -89,6 +91,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
</TabItem> </TabItem>
<!-- XXX : TODO
<TabItem Header="{x:Static p:Resources.textCrewDeparture}" Name="tabCrewDeparture"> <TabItem Header="{x:Static p:Resources.textCrewDeparture}" Name="tabCrewDeparture">
<GroupBox Name="groupBoxCrewListDeparture" Header="{x:Static p:Resources.textTabCrewList}"> <GroupBox Name="groupBoxCrewListDeparture" Header="{x:Static p:Resources.textTabCrewList}">
<Grid> <Grid>
@ -128,7 +131,8 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
</TabItem> </TabItem>
<TabItem Header="{x:Static p:Resources.textPasArrival}" Name="tabPassengerList"> -->
<TabItem Header="{x:Static p:Resources.textPas}" Name="tabPassengerList">
<GroupBox Name="groupBoxPassengerList" Header="{x:Static p:Resources.textTabPassengerList}"> <GroupBox Name="groupBoxPassengerList" Header="{x:Static p:Resources.textTabPassengerList}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -139,11 +143,13 @@
<Button Name="buttonImportExcelPassenger" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelPassenger_Click" /> <Button Name="buttonImportExcelPassenger" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Width="120" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Transparent" Click="buttonImportExcelPassenger_Click" />
<TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPasEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/> <TextBlock Margin="20, 0, 0, 0" Name="textBlockNumPasEntries" FontWeight="Bold" Text="{Binding Elements.Count}" VerticalAlignment="Center"/>
<Label Name="labelPasEntryCount" Content="{x:Static p:Resources.textEntries}" /> <Label Name="labelPasEntryCount" Content="{x:Static p:Resources.textEntries}" />
<!--
<CheckBox Name="checkBoxPasNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationSchengen_Click"/> <CheckBox Name="checkBoxPasNotificationSchengen" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationSchengen_Click"/>
<Label Name="labelPasNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" /> <Label Name="labelPasNotificationSchengen" Content="{x:Static p:Resources.textNotificationSchengen}" />
<CheckBox Name="checkBoxPasNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationPAX_Click"/> <CheckBox Name="checkBoxPasNotificationPAX" IsThreeState="False" VerticalAlignment="Center" Margin="10,0,0,0" Click="checkBoxPasNotificationPAX_Click"/>
<Label Name="labelPasNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" /> <Label Name="labelPasNotificationPAX" Content="{x:Static p:Resources.textNotificationPAX}" />
<TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" /> <TextBlock Margin="30,0,0,0" FontWeight="Bold" FontSize="16" Text="PASA" VerticalAlignment="Center" />
-->
</StackPanel> </StackPanel>
<enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPassengerList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPassengerList" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
AutoGenerateColumns="False" Margin="0,5,0,0"> AutoGenerateColumns="False" Margin="0,5,0,0">
@ -172,6 +178,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
</TabItem> </TabItem>
<!-- XXX : TODO
<TabItem Header="{x:Static p:Resources.textPasDeparture}" Name="tabPassengerListDeparture"> <TabItem Header="{x:Static p:Resources.textPasDeparture}" Name="tabPassengerListDeparture">
<GroupBox Name="groupBoxPassengerListDeparture" Header="{x:Static p:Resources.textTabPassengerList}"> <GroupBox Name="groupBoxPassengerListDeparture" Header="{x:Static p:Resources.textTabPassengerList}">
<Grid> <Grid>
@ -215,6 +222,7 @@
</Grid> </Grid>
</GroupBox> </GroupBox>
</TabItem> </TabItem>
-->
</TabControl> </TabControl>
</src:DetailBaseControl> </src:DetailBaseControl>

34
ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
View File

@ -112,16 +112,20 @@ namespace ENI2.DetailViewControls
this.dataGridCrewList.DeleteRequested += DataGridCrewList_DeleteRequested; this.dataGridCrewList.DeleteRequested += DataGridCrewList_DeleteRequested;
this.dataGridCrewList.CreateRequested += DataGridCrewList_CreateRequested; this.dataGridCrewList.CreateRequested += DataGridCrewList_CreateRequested;
this.dataGridCrewList.RefreshGrid += DataGridCrewList_RefreshGrid; this.dataGridCrewList.RefreshGrid += DataGridCrewList_RefreshGrid;
/* XXX : TODO
if(this._crewMessage.Elements.Count > 0) if(this._crewMessage.Elements.Count > 0)
{ {
this.checkBoxCrewNotificationSchengen.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationSchengen; this.checkBoxCrewNotificationSchengen.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationSchengen;
this.checkBoxCrewNotificationPAX.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationPAX; this.checkBoxCrewNotificationPAX.IsChecked = ((CREW)this._crewMessage.Elements[0]).NotificationPAX;
} }
*/
#endregion #endregion
#region init CREWD #region init CREWD
/* XXX : TODO
if (this._crewdMessage == null) if (this._crewdMessage == null)
{ {
this._crewdMessage = this.Core.CreateMessage(Message.NotificationClass.CREWD); this._crewdMessage = this.Core.CreateMessage(Message.NotificationClass.CREWD);
@ -144,6 +148,8 @@ namespace ENI2.DetailViewControls
this.checkBoxCrewNotificationPAXDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationPAX; this.checkBoxCrewNotificationPAXDeparture.IsChecked = ((CREWD)this._crewdMessage.Elements[0]).NotificationPAX;
} }
*/
#endregion #endregion
#region init PASA #region init PASA
@ -164,16 +170,22 @@ namespace ENI2.DetailViewControls
this.dataGridPassengerList.CreateRequested += DataGridPassengerList_CreateRequested; this.dataGridPassengerList.CreateRequested += DataGridPassengerList_CreateRequested;
this.dataGridPassengerList.RefreshGrid += DataGridPassengerList_RefreshGrid; this.dataGridPassengerList.RefreshGrid += DataGridPassengerList_RefreshGrid;
/* XXX : TODO
if (this._pasMessage.Elements.Count > 0) if (this._pasMessage.Elements.Count > 0)
{ {
this.checkBoxPasNotificationSchengen.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationSchengen; this.checkBoxPasNotificationSchengen.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationSchengen;
this.checkBoxPasNotificationPAX.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationPAX; this.checkBoxPasNotificationPAX.IsChecked = ((PAS)this._pasMessage.Elements[0]).NotificationPAX;
} }
*/
#endregion #endregion
#region init PASD #region init PASD
/* XXX : TODO
if (this._pasdMessage == null) if (this._pasdMessage == null)
{ {
this._pasdMessage = this.Core.CreateMessage(Message.NotificationClass.PASD); this._pasdMessage = this.Core.CreateMessage(Message.NotificationClass.PASD);
@ -196,6 +208,8 @@ namespace ENI2.DetailViewControls
this.checkBoxPasNotificationPAXDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationPAX; this.checkBoxPasNotificationPAXDeparture.IsChecked = ((PASD)this._pasdMessage.Elements[0]).NotificationPAX;
} }
*/
#endregion #endregion
} }
@ -425,6 +439,8 @@ namespace ENI2.DetailViewControls
#endregion #endregion
/* XXX : TODO
#region passenger grid departure #region passenger grid departure
private void DataGridPassengerListDeparture_CreateRequested() private void DataGridPassengerListDeparture_CreateRequested()
@ -517,6 +533,8 @@ namespace ENI2.DetailViewControls
#endregion #endregion
*/
#region crew grid arrival #region crew grid arrival
private void DataGridCrewList_CreateRequested() private void DataGridCrewList_CreateRequested()
@ -606,6 +624,8 @@ namespace ENI2.DetailViewControls
#endregion #endregion
/* XXX : TODO
#region crew grid departure #region crew grid departure
private void DataGridCrewListDeparture_CreateRequested() private void DataGridCrewListDeparture_CreateRequested()
@ -698,6 +718,8 @@ namespace ENI2.DetailViewControls
#endregion #endregion
*/
#region Excel import #region Excel import
private string getValueAsString(IExcelDataReader reader, int index) private string getValueAsString(IExcelDataReader reader, int index)
@ -786,6 +808,8 @@ namespace ENI2.DetailViewControls
} }
} }
/* XXX : TODO
private void buttonImportExcelCrewDeparture_Click(object sender, RoutedEventArgs e) private void buttonImportExcelCrewDeparture_Click(object sender, RoutedEventArgs e)
{ {
OpenFileDialog ofd = new OpenFileDialog OpenFileDialog ofd = new OpenFileDialog
@ -863,6 +887,8 @@ namespace ENI2.DetailViewControls
} }
} }
*/
private void buttonImportExcelPassenger_Click(object sender, RoutedEventArgs e) private void buttonImportExcelPassenger_Click(object sender, RoutedEventArgs e)
{ {
OpenFileDialog ofd = new OpenFileDialog OpenFileDialog ofd = new OpenFileDialog
@ -946,6 +972,8 @@ namespace ENI2.DetailViewControls
} }
} }
/*
private void buttonImportExcelPassengerDeparture_Click(object sender, RoutedEventArgs e) private void buttonImportExcelPassengerDeparture_Click(object sender, RoutedEventArgs e)
{ {
OpenFileDialog ofd = new OpenFileDialog OpenFileDialog ofd = new OpenFileDialog
@ -1029,6 +1057,8 @@ namespace ENI2.DetailViewControls
} }
} }
*/
#endregion #endregion
#region Highlighting #region Highlighting
@ -1068,6 +1098,8 @@ namespace ENI2.DetailViewControls
#region Schengen/PAX checkboxes changed event handler #region Schengen/PAX checkboxes changed event handler
/* XXX : TODO
private void checkBoxCrewNotificationSchengen_Click(object sender, RoutedEventArgs e) private void checkBoxCrewNotificationSchengen_Click(object sender, RoutedEventArgs e)
{ {
foreach(CREW crew in _crewMessage.Elements) foreach(CREW crew in _crewMessage.Elements)
@ -1141,6 +1173,8 @@ namespace ENI2.DetailViewControls
this.SublistElementChanged(Message.NotificationClass.PASD); this.SublistElementChanged(Message.NotificationClass.PASD);
} }
*/
#endregion #endregion
} }

13
ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
View File

@ -168,6 +168,9 @@ namespace ENI2.DetailViewControls
#region lokale Meldeklassen #region lokale Meldeklassen
Message crewdMessage = null;
Message pasdMessage = null;
foreach (Message aMessage in this.Messages) foreach (Message aMessage in this.Messages)
{ {
if (aMessage.MessageNotificationClass == notificationClass) if (aMessage.MessageNotificationClass == notificationClass)
@ -178,8 +181,18 @@ namespace ENI2.DetailViewControls
this._atdMessage = aMessage; this._atdMessage = aMessage;
if (aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD) if (aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD)
this._noanodMessage = aMessage; this._noanodMessage = aMessage;
if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD)
crewdMessage = aMessage;
if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
pasdMessage = aMessage;
} }
// XXX : TODO remove this
this.Messages.Remove(crewdMessage);
this.Messages.Remove(pasdMessage);
#endregion #endregion
#region init ATA #region init ATA

4
ENI2/DetailViewControls/WasteDetailControl.xaml
View File

@ -58,7 +58,7 @@
<Button Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" /> <Button Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
</Grid> </Grid>
<enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1"> AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1" CanUserAddRows="False">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" /> <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
<DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" /> <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
@ -157,7 +157,7 @@
<Button Grid.Row="0" Grid.Column="0" Name="buttonWasteReceivedAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonWasteReceivedAddMissingEntries_Click"/> <Button Grid.Row="0" Grid.Column="0" Name="buttonWasteReceivedAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonWasteReceivedAddMissingEntries_Click"/>
</Grid> </Grid>
<enictrl:ENIDataGrid x:Name="dataGridWasteReceived" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <enictrl:ENIDataGrid x:Name="dataGridWasteReceived" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="2"> AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="2" CanUserAddRows="False">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" /> <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
<DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" /> <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />

79
ENI2/DetailViewControls/WasteDetailControl.xaml.cs
View File

@ -289,21 +289,25 @@ namespace ENI2.DetailViewControls
ewrd.AddClicked += () => ewrd.AddClicked += () =>
{ {
ewrd.CopyValuesToEntity(); ewrd.CopyValuesToEntity();
if (!this._selectedWAS_RCPT.WasteReceived.Contains(ewrd.WasteReceived)) if (!this._selectedWAS_RCPT.WasteReceived.Any(wr => wr.WasteCode == ewrd.WasteReceived.WasteCode))
{
this._selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived); this._selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived);
this.dataGridWasteReceived.Items.Refresh(); this.dataGridWasteReceived.Items.Refresh();
ewrd.WasteReceived = new WasteReceived(); ewrd.WasteReceived = new WasteReceived();
ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT; ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT;
ewrd.WasteReceived.Identifier = WasteReceived.GetNewIdentifier(_selectedWAS_RCPT.WasteReceived); ewrd.WasteReceived.Identifier = WasteReceived.GetNewIdentifier(_selectedWAS_RCPT.WasteReceived);
this.SublistElementChanged(Message.NotificationClass.WAS_RCPT); this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
}
}; };
if (ewrd.ShowDialog() ?? false) if (ewrd.ShowDialog() ?? false)
{ {
if (!this._selectedWAS_RCPT.WasteReceived.Contains(ewrd.WasteReceived)) if (!this._selectedWAS_RCPT.WasteReceived.Any(wr => wr.WasteCode == ewrd.WasteReceived.WasteCode))
{
this._selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived); this._selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived);
this.dataGridWasteReceived.Items.Refresh(); this.dataGridWasteReceived.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.WAS_RCPT); this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
}
} }
} }
@ -316,21 +320,25 @@ namespace ENI2.DetailViewControls
ewrd.AddClicked += () => ewrd.AddClicked += () =>
{ {
ewrd.CopyValuesToEntity(); ewrd.CopyValuesToEntity();
if (!this._selectedWAS_RCPT.WasteReceived.Contains(ewrd.WasteReceived)) if (!this._selectedWAS_RCPT.WasteReceived.Any(wr => wr.WasteCode == ewrd.WasteReceived.WasteCode))
{
_selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived); _selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived);
this.dataGridWasteReceived.Items.Refresh(); this.dataGridWasteReceived.Items.Refresh();
ewrd.WasteReceived = new WasteReceived(); ewrd.WasteReceived = new WasteReceived();
ewrd.WasteReceived.Identifier = WasteReceived.GetNewIdentifier(_selectedWAS_RCPT.WasteReceived); ewrd.WasteReceived.Identifier = WasteReceived.GetNewIdentifier(_selectedWAS_RCPT.WasteReceived);
ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT; ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT;
this.SublistElementChanged(Message.NotificationClass.WAS_RCPT); this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
}
}; };
if (ewrd.ShowDialog() ?? false) if (ewrd.ShowDialog() ?? false)
{ {
if (!_selectedWAS_RCPT.WasteReceived.Contains(ewrd.WasteReceived)) if (!_selectedWAS_RCPT.WasteReceived.Any(wr => wr.WasteCode == ewrd.WasteReceived.WasteCode))
{
_selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived); _selectedWAS_RCPT.WasteReceived.Add(ewrd.WasteReceived);
this.dataGridWasteReceived.Items.Refresh(); this.dataGridWasteReceived.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.WAS_RCPT); this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
}
} }
} }
@ -354,21 +362,24 @@ namespace ENI2.DetailViewControls
epd.AddClicked += () => epd.AddClicked += () =>
{ {
epd.CopyValuesToEntity(); epd.CopyValuesToEntity();
if(!this._was.Waste.Contains(epd.Waste)) if (!this._was.Waste.Any(w => w.WasteType == epd.Waste.WasteType)) {
this._was.Waste.Add(epd.Waste); this._was.Waste.Add(epd.Waste);
this.dataGridWaste.Items.Refresh(); this.dataGridWaste.Items.Refresh();
epd.Waste = new Waste(); epd.Waste = new Waste();
epd.Waste.WAS = this._was; epd.Waste.WAS = this._was;
epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste); epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste);
this.SublistElementChanged(Message.NotificationClass.WAS); this.SublistElementChanged(Message.NotificationClass.WAS);
}
}; };
if (epd.ShowDialog() ?? false) if (epd.ShowDialog() ?? false)
{ {
if(!this._was.Waste.Contains(epd.Waste)) if (!this._was.Waste.Any(w => w.WasteType == epd.Waste.WasteType))
{
_was.Waste.Add(epd.Waste); _was.Waste.Add(epd.Waste);
this.dataGridWaste.Items.Refresh(); this.dataGridWaste.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.WAS); this.SublistElementChanged(Message.NotificationClass.WAS);
}
} }
} }
@ -393,13 +404,15 @@ namespace ENI2.DetailViewControls
epd.AddClicked += () => epd.AddClicked += () =>
{ {
epd.CopyValuesToEntity(); epd.CopyValuesToEntity();
if(!_was.Waste.Contains(epd.Waste)) if (!_was.Waste.Any(w => w.WasteType == epd.Waste.WasteType))
{
_was.Waste.Add(epd.Waste); _was.Waste.Add(epd.Waste);
this.dataGridWaste.Items.Refresh(); this.dataGridWaste.Items.Refresh();
epd.Waste = new Waste(); epd.Waste = new Waste();
epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste); epd.Waste.Identifier = Waste.GetNewIdentifier(_was.Waste);
epd.Waste.WAS = _was; epd.Waste.WAS = _was;
this.SublistElementChanged(Message.NotificationClass.WAS); this.SublistElementChanged(Message.NotificationClass.WAS);
}
}; };
if (epd.ShowDialog() ?? false) if (epd.ShowDialog() ?? false)

4
ENI2/ENI2.csproj
View File

@ -36,8 +36,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>9</ApplicationRevision> <ApplicationRevision>10</ApplicationRevision>
<ApplicationVersion>7.0.0.9</ApplicationVersion> <ApplicationVersion>7.0.0.10</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

7
ENI2/EditControls/EditWasteDialog.xaml
View File

@ -8,7 +8,7 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:p="clr-namespace:ENI2.Properties" xmlns:p="clr-namespace:ENI2.Properties"
mc:Ignorable="d" mc:Ignorable="d"
Title="{x:Static p:Resources.textWaste}" Height="340" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> Title="{x:Static p:Resources.textWaste}" Height="312" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="28" /> <RowDefinition Height="28" />
@ -18,7 +18,7 @@
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="3*" /> <ColumnDefinition Width="3*" />
@ -33,7 +33,7 @@
<Label Name="labelWasteAmountRetained" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteRetained}" /> <Label Name="labelWasteAmountRetained" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteRetained}" />
<Label Name="labelPortOfDeliver" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWastePortOfDelivery}" /> <Label Name="labelPortOfDeliver" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWastePortOfDelivery}" />
<Label Name="labelEstimatedWasteGenerated" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" /> <Label Name="labelEstimatedWasteGenerated" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" />
<Label Name="labelAmountWasteDischarged" Grid.Row="7" Grid.Column="0" Content="{x:Static p:Resources.textWasteAmountDischargedLastPort}" />
<ComboBox Name="comboBoxWasteCode" Grid.Row="0" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" /> <ComboBox Name="comboBoxWasteCode" Grid.Row="0" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" />
<Label Name="labelWasteCodeText" Grid.Row="0" Grid.Column="2" /> <Label Name="labelWasteCodeText" Grid.Row="0" Grid.Column="2" />
<TextBox Name="textBoxDescription" Grid.Row="1" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" Width="auto" MaxLength="99" TextWrapping="Wrap" /> <TextBox Name="textBoxDescription" Grid.Row="1" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" Width="auto" MaxLength="99" TextWrapping="Wrap" />
@ -43,7 +43,6 @@
<xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/> <xctk:DoubleUpDown Grid.Row="4" Grid.Column="1" Name="doubleUpDownAmountRetained" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
<enictrl:LocodeControl Grid.Row="5" Grid.Column="1" x:Name="locodePortOfDeliveryRemainingWaste" /> <enictrl:LocodeControl Grid.Row="5" Grid.Column="1" x:Name="locodePortOfDeliveryRemainingWaste" />
<xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/> <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownAmountGeneratedTilNextPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
<xctk:DoubleUpDown Grid.Row="7" Grid.Column="1" Name="doubleUpDownAmountWasteDischargedLastPort" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2" FormatString="N3" TextAlignment="Left"/>
<Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "2" Grid.Column="2" /> <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "2" Grid.Column="2" />
<Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "3" Grid.Column="2" /> <Label Content="{x:Static p:Resources.textCubicMeters}" Grid.Row = "3" Grid.Column="2" />

4
ENI2/EditControls/SelectImportClassesDialog.xaml.cs
View File

@ -46,7 +46,9 @@ namespace ENI2.EditControls
(aMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) || (aMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) ||
(aMessage.MessageNotificationClass == Message.NotificationClass.ATA) || (aMessage.MessageNotificationClass == Message.NotificationClass.ATA) ||
(aMessage.MessageNotificationClass == Message.NotificationClass.ATD) || (aMessage.MessageNotificationClass == Message.NotificationClass.ATD) ||
(aMessage.MessageNotificationClass == Message.NotificationClass.STO) (aMessage.MessageNotificationClass == Message.NotificationClass.STO) ||
(aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) || // XXX : TODO remove
(aMessage.MessageNotificationClass == Message.NotificationClass.PASD)
) continue; ) continue;
if (IsTransit && if (IsTransit &&

18
ENI2/Properties/Resources.Designer.cs generated
View File

@ -1624,6 +1624,15 @@ namespace ENI2.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Crew.
/// </summary>
public static string textCrew {
get {
return ResourceManager.GetString("textCrew", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Crew arrival. /// Looks up a localized string similar to Crew arrival.
/// </summary> /// </summary>
@ -3469,6 +3478,15 @@ namespace ENI2.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Pas.
/// </summary>
public static string textPas {
get {
return ResourceManager.GetString("textPas", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Passenger arrival. /// Looks up a localized string similar to Passenger arrival.
/// </summary> /// </summary>

6
ENI2/Properties/Resources.resx
View File

@ -1825,4 +1825,10 @@
<data name="textNextWasteDisposalPort" xml:space="preserve"> <data name="textNextWasteDisposalPort" xml:space="preserve">
<value>Next waste disposal port</value> <value>Next waste disposal port</value>
</data> </data>
<data name="textCrew" xml:space="preserve">
<value>Crew</value>
</data>
<data name="textPas" xml:space="preserve">
<value>Pas</value>
</data>
</root> </root>

4
ENI2/Util/UIHelper.cs
View File

@ -130,8 +130,8 @@ namespace ENI2.Util
case Message.NotificationClass.BPOL: case Message.NotificationClass.BPOL:
case Message.NotificationClass.CREW: case Message.NotificationClass.CREW:
case Message.NotificationClass.PAS: case Message.NotificationClass.PAS:
case Message.NotificationClass.CREWD: //case Message.NotificationClass.CREWD: // XXX : TODO
case Message.NotificationClass.PASD: //case Message.NotificationClass.PASD:
aMessage.ENINotificationIconString = "../Resources/policeman_german.png"; aMessage.ENINotificationIconString = "../Resources/policeman_german.png";
aMessage.ENINotificationDetailGroup = Properties.Resources.textBorderPolice; aMessage.ENINotificationDetailGroup = Properties.Resources.textBorderPolice;
aMessage.ENINotificationDetailIndex = 10; aMessage.ENINotificationDetailIndex = 10;

6
SendNSWMessageService/NSWSendService.cs
View File

@ -133,11 +133,13 @@ namespace SendNSWMessageService
// "Virtuelle" Meldeklassen (bisher: DK) werden hier nicht versendet! // "Virtuelle" Meldeklassen (bisher: DK) werden hier nicht versendet!
if (message.MessageNotificationClass == Message.NotificationClass.STO) continue; if (message.MessageNotificationClass == Message.NotificationClass.STO) continue;
/* muss zum Go Live wieder einkommentiert werden, da CREWD und PASD vorerst nicht versendet werden // muss zum Go Live wieder einkommentiert werden, da CREWD und PASD vorerst nicht versendet werden
// XXX : TODO herausnehmen
if((message.MessageNotificationClass == Message.NotificationClass.CREWD) || if((message.MessageNotificationClass == Message.NotificationClass.CREWD) ||
(message.MessageNotificationClass == Message.NotificationClass.PASD)) (message.MessageNotificationClass == Message.NotificationClass.PASD))
continue; continue;
*/
if ((message.MessageNotificationClass == Message.NotificationClass.VISIT) || if ((message.MessageNotificationClass == Message.NotificationClass.VISIT) ||
(message.MessageNotificationClass == Message.NotificationClass.TRANSIT)) (message.MessageNotificationClass == Message.NotificationClass.TRANSIT))

3
bsmd.database/RuleEngine.cs
View File

@ -454,9 +454,8 @@ namespace bsmd.database
derivedEntity.MessageCore = entity.MessageCore; // some instance we need info from core (NOA / Transit) derivedEntity.MessageCore = entity.MessageCore; // some instance we need info from core (NOA / Transit)
if ((derivedEntity is LADG) && entity.MessageCore.IsTransit) continue; // kein error reporting für LADG bei Transit (CH, 1.2.16) if ((derivedEntity is LADG) && entity.MessageCore.IsTransit) continue; // kein error reporting für LADG bei Transit (CH, 1.2.16)
if ((derivedEntity is SEC) && entity.MessageCore.IsSmallShip) continue; // keine STAT Validierung für kleine Schiffe (CH, 1.11.18) if ((derivedEntity is SEC) && entity.MessageCore.IsSmallShip) continue; // keine STAT Validierung für kleine Schiffe (CH, 1.11.18)
RuleEngine.ValidateProperties(derivedEntity, errors, violations); ValidateProperties(derivedEntity, errors, violations);
derivedEntity.Validate(errors, violations); derivedEntity.Validate(errors, violations);
} }
foreach (MessageError error in errors) foreach (MessageError error in errors)

1
bsmd.database/WAS_RCPT.cs
View File

@ -365,6 +365,7 @@ namespace bsmd.database
wasRcpt.WasteReceived.Add(clonedWasteReceived); wasRcpt.WasteReceived.Add(clonedWasteReceived);
} }
wasRcpt.TreatmentFacilityProvider = new ObservableCollection<TreatmentFacilityProvider>();
foreach(TreatmentFacilityProvider tfp in this.TreatmentFacilityProvider) foreach(TreatmentFacilityProvider tfp in this.TreatmentFacilityProvider)
{ {
TreatmentFacilityProvider clonedTfp = tfp.Clone() as TreatmentFacilityProvider; TreatmentFacilityProvider clonedTfp = tfp.Clone() as TreatmentFacilityProvider;

13
bsmd.hisnord/NSWResponse.cs
View File

@ -54,6 +54,10 @@ namespace bsmd.hisnord
XNamespace bpolNS = "http://api.national-single-window.de/bpol"; XNamespace bpolNS = "http://api.national-single-window.de/bpol";
XNamespace towaNS = "http://api.national-single-window.de/towa"; XNamespace towaNS = "http://api.national-single-window.de/towa";
XNamespace towdNS = "http://api.national-single-window.de/towd"; XNamespace towdNS = "http://api.national-single-window.de/towd";
XNamespace crewdNS = "http://api.national-single-window.de/crewd";
XNamespace pasdNS = "http://api.national-single-window.de/pasd";
XNamespace was_rcptNS = "http://api.national-single-window.de/wasrcpt";
XNamespace cancelVisitNS = "http://api.national-single-window.de/visitIdCancelRequest"; XNamespace cancelVisitNS = "http://api.national-single-window.de/visitIdCancelRequest";
XNamespace cancelTransitNS = "http://api.national-single-window.de/transitIdCancelRequest"; XNamespace cancelTransitNS = "http://api.national-single-window.de/transitIdCancelRequest";
@ -217,6 +221,15 @@ namespace bsmd.hisnord
case Message.NotificationClass.TOWD: case Message.NotificationClass.TOWD:
lookupName = towdNS + "TOWDResponse"; lookupName = towdNS + "TOWDResponse";
break; break;
case Message.NotificationClass.CREWD:
lookupName = crewdNS + "CREWDResponse";
break;
case Message.NotificationClass.PASD:
lookupName = pasdNS + "PASDResponse";
break;
case Message.NotificationClass.WAS_RCPT:
lookupName = was_rcptNS + "WAS_RCPTResponse";
break;
default: default:
break; break;
} }

3
bsmd.hisnord/Response.cs
View File

@ -23,6 +23,9 @@ namespace bsmd.hisnord
{ {
bool isOK = true; bool isOK = true;
// bei Problemen die Antwort auf die Seite kopieren..
// File.Copy(answerFile, Path.Combine(@"C:\temp\hnord", Path.GetFileName(answerFile)));
// Informationen aus dem Dateinamen // Informationen aus dem Dateinamen
// Meldetyp_Referenz_ID_Timestamp.xml // Meldetyp_Referenz_ID_Timestamp.xml
string bareFileName = Path.GetFileNameWithoutExtension(answerFile); string bareFileName = Path.GetFileNameWithoutExtension(answerFile);