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

Bumped version and added some small fixes for first 7.2.0.0 test version

Browse Source
This commit is contained in:
Daniel Schick 2023-11-06 08:39:52 +01:00
parent 73da72ad8a
commit 0b677f36cc
21 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI2/DetailRootControl.xaml.cs
View File

@ -734,9 +734,9 @@ namespace ENI2
} }
#region 12.11.18 / 6.3.21 / 23.5.22: globale Plausi-Prüfungen #region 12.11.18 / 6.3.21 / 23.5.22: globale Plausi-Prüfungen
Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREW); Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWA);
Message crewdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWD); Message crewdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWD);
Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PAS); Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASA);
Message pasdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASD); Message pasdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASD);
Message pobaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBA); Message pobaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBA);
Message secMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.SEC); Message secMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.SEC);
@ -1233,9 +1233,9 @@ namespace ENI2
case Message.NotificationClass.BKRA: case Message.NotificationClass.BKRA:
return Properties.Resources.textArrivalNotification; return Properties.Resources.textArrivalNotification;
case Message.NotificationClass.BPOL: case Message.NotificationClass.BPOL:
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
case Message.NotificationClass.CREWD: case Message.NotificationClass.CREWD:
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
case Message.NotificationClass.PASD: case Message.NotificationClass.PASD:
return Properties.Resources.textBorderPolice; return Properties.Resources.textBorderPolice;
case Message.NotificationClass.HAZA: case Message.NotificationClass.HAZA:

8
ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
View File

@ -132,7 +132,7 @@
</GroupBox> </GroupBox>
</TabItem> </TabItem>
<TabItem Header="{x:Static p:Resources.textPas}" Name="tabPassengerList"> <TabItem Header="{x:Static p:Resources.textPasArrival}" 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>
@ -161,15 +161,15 @@
<DataGridCheckBoxColumn Header="{x:Static p:Resources.textTransitPassenger}" Binding="{Binding PassengerInTransit}" IsReadOnly="True" Width="0.1*" /> <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTransitPassenger}" Binding="{Binding PassengerInTransit}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding PassengerNationality}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding PassengerNationality}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" />
<!--<DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding PassengerIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding PassengerIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDocumentIssuingState}" Binding="{Binding PassengerIdentityDocumentIssuingState}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textDocumentIssuingState}" Binding="{Binding PassengerIdentityDocumentIssuingState}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDocumentExpiryDate}" Binding="{Binding PassengerIdentityDocumentExpiryDate, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textDocumentExpiryDate}" Binding="{Binding PassengerIdentityDocumentExpiryDate, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" /> <DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" />
<!--<DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <!-- XXX : TODO --> <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<!-- <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" /> --> <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
</DataGrid.Columns> </DataGrid.Columns>
</enictrl:ENIDataGrid> </enictrl:ENIDataGrid>

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

@ -50,8 +50,8 @@ namespace ENI2.DetailViewControls
foreach (Message aMessage in this.Messages) foreach (Message aMessage in this.Messages)
{ {
if (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) { this._bpolMessage = aMessage; this.ControlMessages.Add(aMessage); } if (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) { this._bpolMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.CREW) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); } if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.PAS) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); } if (aMessage.MessageNotificationClass == Message.NotificationClass.PASA) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) { this._crewdMessage = aMessage; this.ControlMessages.Add(aMessage); } if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) { this._crewdMessage = aMessage; this.ControlMessages.Add(aMessage); }
if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD) { this._pasdMessage = aMessage; this.ControlMessages.Add(aMessage); } if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD) { this._pasdMessage = aMessage; this.ControlMessages.Add(aMessage); }
@ -99,7 +99,7 @@ namespace ENI2.DetailViewControls
if (this._crewMessage == null) if (this._crewMessage == null)
{ {
this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREW); this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREWA);
this.Messages.Add(this._crewMessage); this.Messages.Add(this._crewMessage);
} }
@ -151,7 +151,7 @@ namespace ENI2.DetailViewControls
if (this._pasMessage == null) if (this._pasMessage == null)
{ {
this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PAS); this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PASA);
this.Messages.Add(this._pasMessage); this.Messages.Add(this._pasMessage);
} }
@ -359,7 +359,7 @@ namespace ENI2.DetailViewControls
MessageHeader = this._pasMessage, MessageHeader = this._pasMessage,
Identifier = PAS.GetNewIdentifier(_pasMessage.Elements) Identifier = PAS.GetNewIdentifier(_pasMessage.Elements)
}; };
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
}; };
if (epd.ShowDialog() ?? false) if (epd.ShowDialog() ?? false)
@ -367,7 +367,7 @@ namespace ENI2.DetailViewControls
if(!this._pasMessage.Elements.Contains(epd.PAS)) if(!this._pasMessage.Elements.Contains(epd.PAS))
_pasMessage.Elements.Add(epd.PAS); _pasMessage.Elements.Add(epd.PAS);
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
} }
} }
@ -384,7 +384,7 @@ namespace ENI2.DetailViewControls
private void DataGridPassengerList_RefreshGrid() private void DataGridPassengerList_RefreshGrid()
{ {
DatabaseEntity.ResetIdentifiers(_pasMessage.Elements); DatabaseEntity.ResetIdentifiers(_pasMessage.Elements);
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
} }
@ -406,7 +406,7 @@ namespace ENI2.DetailViewControls
Identifier = PAS.GetNewIdentifier(_pasMessage.Elements), Identifier = PAS.GetNewIdentifier(_pasMessage.Elements),
MessageHeader = _pasMessage MessageHeader = _pasMessage
}; };
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
}; };
if (epd.ShowDialog() ?? false) if (epd.ShowDialog() ?? false)
@ -415,7 +415,7 @@ namespace ENI2.DetailViewControls
_pasMessage.Elements.Add(epd.PAS); _pasMessage.Elements.Add(epd.PAS);
epd.PAS.IsDirty = true; epd.PAS.IsDirty = true;
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
} }
} }
@ -541,7 +541,7 @@ namespace ENI2.DetailViewControls
MessageHeader = this._crewMessage, MessageHeader = this._crewMessage,
Identifier = CREW.GetNewIdentifier(_crewMessage.Elements) Identifier = CREW.GetNewIdentifier(_crewMessage.Elements)
}; };
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
}; };
if (ecd.ShowDialog() ?? false) if (ecd.ShowDialog() ?? false)
@ -549,7 +549,7 @@ namespace ENI2.DetailViewControls
if(!this._crewMessage.Elements.Contains(ecd.CREW)) if(!this._crewMessage.Elements.Contains(ecd.CREW))
_crewMessage.Elements.Add(ecd.CREW); _crewMessage.Elements.Add(ecd.CREW);
this.dataGridCrewList.Items.Refresh(); this.dataGridCrewList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
} }
} }
@ -566,7 +566,7 @@ namespace ENI2.DetailViewControls
private void DataGridCrewList_RefreshGrid() private void DataGridCrewList_RefreshGrid()
{ {
DatabaseEntity.ResetIdentifiers(_crewMessage.Elements); DatabaseEntity.ResetIdentifiers(_crewMessage.Elements);
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
this.dataGridCrewList.Items.Refresh(); this.dataGridCrewList.Items.Refresh();
} }
@ -588,7 +588,7 @@ namespace ENI2.DetailViewControls
Identifier = CREW.GetNewIdentifier(_crewMessage.Elements), Identifier = CREW.GetNewIdentifier(_crewMessage.Elements),
MessageHeader = _crewMessage MessageHeader = _crewMessage
}; };
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
}; };
if (ecd.ShowDialog() ?? false) if (ecd.ShowDialog() ?? false)
@ -597,7 +597,7 @@ namespace ENI2.DetailViewControls
_crewMessage.Elements.Add(ecd.CREW); _crewMessage.Elements.Add(ecd.CREW);
ecd.CREW.IsDirty = true; ecd.CREW.IsDirty = true;
this.dataGridCrewList.Items.Refresh(); this.dataGridCrewList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
} }
} }
@ -779,7 +779,7 @@ namespace ENI2.DetailViewControls
if (importCrew.Count > 0) if (importCrew.Count > 0)
{ {
this.dataGridCrewList.Items.Refresh(); this.dataGridCrewList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
MessageBox.Show(String.Format(Properties.Resources.textCrewImported, importCrew.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(String.Format(Properties.Resources.textCrewImported, importCrew.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
} }
} }
@ -940,7 +940,7 @@ namespace ENI2.DetailViewControls
if (importPassenger.Count > 0) if (importPassenger.Count > 0)
{ {
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
MessageBox.Show(String.Format(Properties.Resources.textPassengerImported, importPassenger.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information); MessageBox.Show(String.Format(Properties.Resources.textPassengerImported, importPassenger.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
} }
} }
@ -1078,7 +1078,7 @@ namespace ENI2.DetailViewControls
{ {
crew.NotificationSchengen = checkBoxCrewNotificationSchengen.IsChecked; crew.NotificationSchengen = checkBoxCrewNotificationSchengen.IsChecked;
} }
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
} }
private void checkBoxCrewNotificationPAX_Click(object sender, RoutedEventArgs e) private void checkBoxCrewNotificationPAX_Click(object sender, RoutedEventArgs e)
@ -1088,7 +1088,7 @@ namespace ENI2.DetailViewControls
{ {
crew.NotificationPAX = checkBoxCrewNotificationPAX.IsChecked; crew.NotificationPAX = checkBoxCrewNotificationPAX.IsChecked;
} }
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREWA);
} }
private void checkBoxCrewNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e) private void checkBoxCrewNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)
@ -1115,7 +1115,7 @@ namespace ENI2.DetailViewControls
{ {
pas.NotificationSchengen = checkBoxPasNotificationSchengen.IsChecked; pas.NotificationSchengen = checkBoxPasNotificationSchengen.IsChecked;
} }
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
} }
private void checkBoxPasNotificationPAX_Click(object sender, RoutedEventArgs e) private void checkBoxPasNotificationPAX_Click(object sender, RoutedEventArgs e)
@ -1124,7 +1124,7 @@ namespace ENI2.DetailViewControls
{ {
pas.NotificationPAX = checkBoxPasNotificationPAX.IsChecked; pas.NotificationPAX = checkBoxPasNotificationPAX.IsChecked;
} }
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PASA);
} }
private void checkBoxPasNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e) private void checkBoxPasNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)

2
ENI2/DetailViewControls/OverViewDetailControl.xaml
View File

@ -151,7 +151,7 @@
<MultiDataTrigger> <MultiDataTrigger>
<MultiDataTrigger.Conditions> <MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=Elements, Converter={util:CutoffConverter}, ConverterParameter=0}" Value="True" /> <Condition Binding="{Binding Path=Elements, Converter={util:CutoffConverter}, ConverterParameter=0}" Value="True" />
<Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PAS}" /> <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PASA}" />
</MultiDataTrigger.Conditions> </MultiDataTrigger.Conditions>
<Setter Property="Background" Value="Yellow" /> <Setter Property="Background" Value="Yellow" />
</MultiDataTrigger> </MultiDataTrigger>

6
ENI2/ENI2.csproj
View File

@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ENI2</RootNamespace> <RootNamespace>ENI2</RootNamespace>
<AssemblyName>ENI2</AssemblyName> <AssemblyName>ENI2Test</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -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>3</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>7.14.0.%2a</ApplicationVersion> <ApplicationVersion>7.2.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

4
ENI2/Excel/DakosyUtil.cs
View File

@ -74,7 +74,7 @@ namespace ENI2.Excel
{ if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL)) if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
{ if (ScanBPOL(message, reader)) ExcelReader.SaveMessage(message); } { if (ScanBPOL(message, reader)) ExcelReader.SaveMessage(message); }
if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW)) if ((message.MessageNotificationClass == Message.NotificationClass.CREWA) && notificationClasses.Contains(Message.NotificationClass.CREWA))
{ if (ScanCREW(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanCREW(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD)) if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
{ if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
@ -92,7 +92,7 @@ namespace ENI2.Excel
{ if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD)) if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
{ if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS)) if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA))
{ if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD)) if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
{ if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }

4
ENI2/Excel/ExcelUtil.cs
View File

@ -84,7 +84,7 @@ namespace ENI2.Excel
{ if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL)) if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
{ if (ScanBPOL(message, messages, messageCore, reader)) ExcelReader.SaveMessage(message); } { if (ScanBPOL(message, messages, messageCore, reader)) ExcelReader.SaveMessage(message); }
if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW)) if ((message.MessageNotificationClass == Message.NotificationClass.CREWA) && notificationClasses.Contains(Message.NotificationClass.CREWA))
{ if (ScanCREW(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; } { if (ScanCREW(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD)) if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
{ if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
@ -102,7 +102,7 @@ namespace ENI2.Excel
{ if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD)) if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
{ if (ScanNOA_NOD(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanNOA_NOD(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS)) if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA))
{ if (ScanPAS(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; } { if (ScanPAS(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD)) if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
{ if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; } { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }

4
ENI2/Excel/ExcelWriter.cs
View File

@ -76,7 +76,7 @@ namespace ENI2.Excel
this.WriteItineraries(bpol); this.WriteItineraries(bpol);
} }
break; break;
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
this.WriteCREW(message, true, isRefSheet); this.WriteCREW(message, true, isRefSheet);
break; break;
case Message.NotificationClass.CREWD: case Message.NotificationClass.CREWD:
@ -111,7 +111,7 @@ namespace ENI2.Excel
case Message.NotificationClass.NOA_NOD: case Message.NotificationClass.NOA_NOD:
if (message.Elements[0] is NOA_NOD noa_nod) this.WriteNOA_NOD(noa_nod, core.IsTransit, isRefSheet); if (message.Elements[0] is NOA_NOD noa_nod) this.WriteNOA_NOD(noa_nod, core.IsTransit, isRefSheet);
break; break;
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
this.WritePAS(message, true, isRefSheet); this.WritePAS(message, true, isRefSheet);
break; break;
case Message.NotificationClass.PASD: case Message.NotificationClass.PASD:

2
ENI2/MainWindow.xaml
View File

@ -10,7 +10,7 @@
xmlns:util="clr-namespace:ENI2.Util" xmlns:util="clr-namespace:ENI2.Util"
xmlns:local="clr-namespace:ENI2" xmlns:local="clr-namespace:ENI2"
mc:Ignorable="d" mc:Ignorable="d"
Title="ENI 2" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" Title="ENI 2 Testversion" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing"
SourceInitialized="Window_SourceInitialized"> SourceInitialized="Window_SourceInitialized">
<Window.CommandBindings> <Window.CommandBindings>

8
ENI2/Report/ReportDocument.cs
View File

@ -373,9 +373,9 @@ namespace ENI2.Report
switch (message.MessageNotificationClass) switch (message.MessageNotificationClass)
{ {
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
case Message.NotificationClass.CREWD: case Message.NotificationClass.CREWD:
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
case Message.NotificationClass.PASD: case Message.NotificationClass.PASD:
case Message.NotificationClass.TOWA: case Message.NotificationClass.TOWA:
case Message.NotificationClass.TOWD: case Message.NotificationClass.TOWD:
@ -418,11 +418,11 @@ namespace ENI2.Report
switch(message.MessageNotificationClass) switch(message.MessageNotificationClass)
{ {
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
case Message.NotificationClass.CREWD: case Message.NotificationClass.CREWD:
CreateCrewTable(document, message); CreateCrewTable(document, message);
return; return;
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
case Message.NotificationClass.PASD: case Message.NotificationClass.PASD:
CreatePassengerTable(document, message); CreatePassengerTable(document, message);
return; return;

4
ENI2/Util/UIHelper.cs
View File

@ -172,8 +172,8 @@ namespace ENI2.Util
aMessage.ENINotificationDetailIndex = 9; aMessage.ENINotificationDetailIndex = 9;
break; break;
case Message.NotificationClass.BPOL: case Message.NotificationClass.BPOL:
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
case Message.NotificationClass.CREWD: case Message.NotificationClass.CREWD:
case Message.NotificationClass.PASD: case Message.NotificationClass.PASD:
aMessage.ENINotificationIconString = "../Resources/policeman_german.png"; aMessage.ENINotificationIconString = "../Resources/policeman_german.png";

4
bsmd.dakosy/Request.cs
View File

@ -270,7 +270,7 @@ namespace bsmd.dakosy
} }
} }
break; break;
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
{ {
if (aMessage.Elements.Count > 0) if (aMessage.Elements.Count > 0)
{ {
@ -425,7 +425,7 @@ namespace bsmd.dakosy
vList.Visit[0].NAME = new NAME(); vList.Visit[0].NAME = new NAME();
vList.Visit[0].NAME.NameOfMaster = name.NameOfMaster; vList.Visit[0].NAME.NameOfMaster = name.NameOfMaster;
break; break;
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
{ {
if (aMessage.Elements.Count > 0) if (aMessage.Elements.Count > 0)
{ {

4
bsmd.database/DBManager.cs
View File

@ -1002,8 +1002,8 @@ namespace bsmd.database
case Message.NotificationClass.PRE72H: result = new PRE72H(); break; case Message.NotificationClass.PRE72H: result = new PRE72H(); break;
case Message.NotificationClass.MDH: result = new MDH(); break; case Message.NotificationClass.MDH: result = new MDH(); break;
case Message.NotificationClass.WAS: result = new WAS(); break; case Message.NotificationClass.WAS: result = new WAS(); break;
case Message.NotificationClass.CREW: result = new CREW(); break; case Message.NotificationClass.CREWA: result = new CREW(); break;
case Message.NotificationClass.PAS: result = new PAS(); break; case Message.NotificationClass.PASA: result = new PAS(); break;
case Message.NotificationClass.BPOL: result = new BPOL(); break; case Message.NotificationClass.BPOL: result = new BPOL(); break;
case Message.NotificationClass.TOWA: result = new TOWA(); break; case Message.NotificationClass.TOWA: result = new TOWA(); break;
case Message.NotificationClass.TOWD: result = new TOWD(); break; case Message.NotificationClass.TOWD: result = new TOWD(); break;

24
bsmd.database/Message.cs
View File

@ -44,8 +44,8 @@ namespace bsmd.database
NotificationClass.SEC, NotificationClass.SEC,
NotificationClass.PRE72H, NotificationClass.PRE72H,
NotificationClass.BPOL, NotificationClass.BPOL,
NotificationClass.CREW, NotificationClass.CREWA,
NotificationClass.PAS, NotificationClass.PASA,
NotificationClass.MDH, NotificationClass.MDH,
NotificationClass.HAZA, NotificationClass.HAZA,
NotificationClass.HAZD, NotificationClass.HAZD,
@ -87,8 +87,8 @@ namespace bsmd.database
PRE72H, PRE72H,
MDH, MDH,
WAS, WAS,
CREW, // 20 CREWA, // 20
PAS, PASA,
BPOL, BPOL,
TOWA, TOWA,
TOWD, TOWD,
@ -610,10 +610,10 @@ namespace bsmd.database
{ {
case NotificationClass.BKRA: case NotificationClass.BKRA:
case NotificationClass.BKRD: case NotificationClass.BKRD:
case NotificationClass.CREW: case NotificationClass.CREWA:
case NotificationClass.CREWD: case NotificationClass.CREWD:
case NotificationClass.LADG: case NotificationClass.LADG:
case NotificationClass.PAS: case NotificationClass.PASA:
case NotificationClass.PASD: case NotificationClass.PASD:
case NotificationClass.SERV: case NotificationClass.SERV:
case NotificationClass.STO: case NotificationClass.STO:
@ -693,9 +693,9 @@ namespace bsmd.database
case NotificationClass.BKRA: return 5; case NotificationClass.BKRA: return 5;
case NotificationClass.BKRD: return 5; case NotificationClass.BKRD: return 5;
case NotificationClass.LADG: return 36; case NotificationClass.LADG: return 36;
case NotificationClass.CREW: return 40; case NotificationClass.CREWA: return 40;
case NotificationClass.CREWD: return 40; case NotificationClass.CREWD: return 40;
case NotificationClass.PAS: return 40; case NotificationClass.PASA: return 40;
case NotificationClass.PASD: return 40; case NotificationClass.PASD: return 40;
case NotificationClass.TOWA: return 5; case NotificationClass.TOWA: return 5;
case NotificationClass.TOWD: return 5; case NotificationClass.TOWD: return 5;
@ -826,8 +826,8 @@ namespace bsmd.database
{ {
switch (this.MessageNotificationClass) switch (this.MessageNotificationClass)
{ {
case NotificationClass.CREW: case NotificationClass.CREWA:
case NotificationClass.PAS: case NotificationClass.PASA:
return true; return true;
default: default:
return false; return false;
@ -934,9 +934,9 @@ namespace bsmd.database
/// </summary> /// </summary>
private bool CanDoBulkSave() private bool CanDoBulkSave()
{ {
if(this.MessageNotificationClass == NotificationClass.CREW || if(this.MessageNotificationClass == NotificationClass.CREWA ||
this.MessageNotificationClass == NotificationClass.CREWD || this.MessageNotificationClass == NotificationClass.CREWD ||
this.MessageNotificationClass == NotificationClass.PAS || this.MessageNotificationClass == NotificationClass.PASA ||
this.MessageNotificationClass == NotificationClass.PASD) this.MessageNotificationClass == NotificationClass.PASD)
{ {
foreach (DatabaseEntity subEntity in this.Elements) foreach (DatabaseEntity subEntity in this.Elements)

2
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("7.14.0")] [assembly: AssemblyInformationalVersion("7.2.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2023 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2023 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("7.14.0.*")] [assembly: AssemblyVersion("7.2.0.*")]

4
bsmd.database/ValidationRule.cs
View File

@ -65,7 +65,7 @@ namespace bsmd.database
_validationFields.AddRange(GetFieldsForClass(typeof(BRKD), true, Message.NotificationClass.BKRD)); _validationFields.AddRange(GetFieldsForClass(typeof(BRKD), true, Message.NotificationClass.BKRD));
_validationFields.AddRange(GetFieldsForClass(typeof(BPOL), false, Message.NotificationClass.BPOL)); _validationFields.AddRange(GetFieldsForClass(typeof(BPOL), false, Message.NotificationClass.BPOL));
_validationFields.AddRange(GetFieldsForClass(typeof(CallPurpose), true, null)); _validationFields.AddRange(GetFieldsForClass(typeof(CallPurpose), true, null));
_validationFields.AddRange(GetFieldsForClass(typeof(CREW), true, Message.NotificationClass.CREW)); _validationFields.AddRange(GetFieldsForClass(typeof(CREW), true, Message.NotificationClass.CREWA));
_validationFields.AddRange(GetFieldsForClass(typeof(Customer), false, null)); _validationFields.AddRange(GetFieldsForClass(typeof(Customer), false, null));
_validationFields.AddRange(GetFieldsForClass(typeof(HAZ), false, Message.NotificationClass.HAZA)); _validationFields.AddRange(GetFieldsForClass(typeof(HAZ), false, Message.NotificationClass.HAZA));
@ -89,7 +89,7 @@ namespace bsmd.database
_validationFields.AddRange(GetFieldsForClass(typeof(MDH), false, Message.NotificationClass.MDH)); _validationFields.AddRange(GetFieldsForClass(typeof(MDH), false, Message.NotificationClass.MDH));
_validationFields.AddRange(GetFieldsForClass(typeof(NAME), false, Message.NotificationClass.NAME)); _validationFields.AddRange(GetFieldsForClass(typeof(NAME), false, Message.NotificationClass.NAME));
_validationFields.AddRange(GetFieldsForClass(typeof(NOA_NOD), false, Message.NotificationClass.NOA_NOD)); _validationFields.AddRange(GetFieldsForClass(typeof(NOA_NOD), false, Message.NotificationClass.NOA_NOD));
_validationFields.AddRange(GetFieldsForClass(typeof(PAS), true, Message.NotificationClass.PAS)); _validationFields.AddRange(GetFieldsForClass(typeof(PAS), true, Message.NotificationClass.PASA));
_validationFields.AddRange(GetFieldsForClass(typeof(POBA), false, Message.NotificationClass.POBA)); _validationFields.AddRange(GetFieldsForClass(typeof(POBA), false, Message.NotificationClass.POBA));
_validationFields.AddRange(GetFieldsForClass(typeof(POBD), false, Message.NotificationClass.POBD)); _validationFields.AddRange(GetFieldsForClass(typeof(POBD), false, Message.NotificationClass.POBD));
_validationFields.AddRange(GetFieldsForClass(typeof(PortArea), true, null)); _validationFields.AddRange(GetFieldsForClass(typeof(PortArea), true, null));

6
bsmd.dbh/RequestUtil.cs
View File

@ -26,7 +26,7 @@ namespace bsmd.dbh
{ {
Root root = new Root(); Root root = new Root();
root.Version = RootVersion.Item72; root.Version = RootVersion.Item72;
root.SourceDocumentVersion = "7.1"; root.SourceDocumentVersion = "7.2";
root.Timestamp = DateTime.Now; root.Timestamp = DateTime.Now;
string filenameComponent; string filenameComponent;
@ -463,7 +463,7 @@ namespace bsmd.dbh
#region CREWA #region CREWA
case Message.NotificationClass.CREW: // this is CREWA case Message.NotificationClass.CREWA:
{ {
RootCREWA rootCREW = new RootCREWA(); RootCREWA rootCREW = new RootCREWA();
@ -549,7 +549,7 @@ namespace bsmd.dbh
#region PASA #region PASA
case Message.NotificationClass.PAS: // this is PASA case Message.NotificationClass.PASA:
{ {
RootPASA rootPAS = new RootPASA(); RootPASA rootPAS = new RootPASA();
rootPAS.Passenger = new RootPASAPassenger[message.Elements.Count]; rootPAS.Passenger = new RootPASAPassenger[message.Elements.Count];

10
bsmd.hisnord/NSWResponse.cs
View File

@ -206,10 +206,10 @@ namespace bsmd.hisnord
case Message.NotificationClass.WAS: case Message.NotificationClass.WAS:
lookupName = wasNS + "WASResponse"; lookupName = wasNS + "WASResponse";
break; break;
case Message.NotificationClass.CREW: case Message.NotificationClass.CREWA:
lookupName = crewNS + "CREWResponse"; lookupName = crewNS + "CREWResponse";
break; break;
case Message.NotificationClass.PAS: case Message.NotificationClass.PASA:
lookupName = pasNS + "PASResponse"; lookupName = pasNS + "PASResponse";
break; break;
case Message.NotificationClass.BPOL: case Message.NotificationClass.BPOL:
@ -294,8 +294,7 @@ namespace bsmd.hisnord
foreach(XElement anElem in elem) foreach(XElement anElem in elem)
{ {
MessageViolation mv = new MessageViolation(); MessageViolation mv = new MessageViolation();
int vCode = -1; if (!Int32.TryParse(anElem.Element(vCodeName).Value, out int vCode))
if (!Int32.TryParse(anElem.Element(vCodeName).Value, out vCode))
_log.WarnFormat("cannot convert violation code to int: {0}", anElem.Element(vCodeName).Value); _log.WarnFormat("cannot convert violation code to int: {0}", anElem.Element(vCodeName).Value);
else else
mv.ViolationCode = vCode; mv.ViolationCode = vCode;
@ -311,8 +310,7 @@ namespace bsmd.hisnord
foreach (XElement anElem in elem) foreach (XElement anElem in elem)
{ {
MessageError me = new MessageError(); MessageError me = new MessageError();
int eCode = -1; if (!Int32.TryParse(anElem.Element(eCodeName).Value, out int eCode))
if (!Int32.TryParse(anElem.Element(eCodeName).Value, out eCode))
_log.WarnFormat("cannot convert error code to int: {0}", anElem.Element(eCodeName).Value); _log.WarnFormat("cannot convert error code to int: {0}", anElem.Element(eCodeName).Value);
else else
me.ErrorCode = eCode; me.ErrorCode = eCode;

4
bsmd.hisnord/Request.cs
View File

@ -1375,7 +1375,7 @@ namespace bsmd.hisnord
#region PASA #region PASA
if (message.MessageNotificationClass == Message.NotificationClass.PAS) if (message.MessageNotificationClass == Message.NotificationClass.PASA)
{ {
if (message.Reset) if (message.Reset)
{ {
@ -1513,7 +1513,7 @@ namespace bsmd.hisnord
#region CREWA #region CREWA
if (message.MessageNotificationClass == Message.NotificationClass.CREW) if (message.MessageNotificationClass == Message.NotificationClass.CREWA)
{ {
if (message.Reset) if (message.Reset)
{ {

2
misc/info_deployment.txt
View File

@ -7,3 +7,5 @@ Auswahl über "Select from Store.."
5) Release Build einstellen 5) Release Build einstellen
6) komplett neu bauen (clean!) 6) komplett neu bauen (clean!)
7) In Description bei Product name "ENI" statt "ENI Testversion" 7) In Description bei Product name "ENI" statt "ENI Testversion"
8) MainWindow.xaml: "ENI 2 Testversion" -> "ENI 2"
9) ENI2 Project Properties -> Application -> Assembly Name: "ENI2Test" -> "ENI2"