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

HIS-Nord Versende / Empfangslogik Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2017-08-13 16:26:58 +00:00
parent 24c9d697f0
commit ec9a113a1c
10 changed files with 1499 additions and 1281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
View File

@ -56,7 +56,7 @@
<DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding CrewMemberNationality, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textCrewFunctionOnBoard}" Binding="{Binding CrewMemberDuty, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding CrewMemberPlaceOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yy\}}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding CrewMemberDateOfBirth, Mode=TwoWay, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding CrewMemberIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding CrewMemberIdentityDocumentId, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding CrewMemberVisaNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
@ -79,7 +79,7 @@
<DataGridTextColumn Header="{x:Static p:Resources.textPortOfDisembarkation}" Binding="{Binding PassengerPortOfDisembarkation}" 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.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yy\}}" 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.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" />
<DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" />

11
ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
View File

@ -47,6 +47,17 @@ namespace ENI2.DetailViewControls
this.RegisterTextboxChange(this.textBoxPlannedWorks, Message.NotificationClass.PRE72H);
this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H);
this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
this.checkBoxTanker.Checked += CheckBoxTanker_Checked;
this.checkBoxTanker.Unchecked += CheckBoxTanker_Checked;
}
private void CheckBoxTanker_Checked(object sender, RoutedEventArgs e)
{
bool isTanker = this.checkBoxTanker.IsChecked ?? false;
this.doubleUpDownVolumeOfCargo.IsEnabled = isTanker;
this.comboBoxTankerHullConfig.IsEnabled = isTanker;
this.comboBoxConditionCargoBallastTanks.IsEnabled = isTanker;
this.textBoxNatureOfCargo.IsEnabled = isTanker;
}
public override void Initialize()

12
ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml
View File

@ -49,21 +49,21 @@
<Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="3" Content="{x:Static p:Resources.textInmarsatCallNumber}" Margin="0,0,10,0" />
<TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalAlignment="Center"/>
<TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" />
<ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
<TextBox Name="textBoxCallsign" Grid.Column="4" Grid.Row="1" Text="{Binding CallSign}" Margin="2" VerticalAlignment="Center" />
<ComboBox Name="comboBoxTransportMode" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="2" SelectedValue="{Binding TransportMode}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
<ComboBox Name="comboBoxFlag" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="2" SelectedValue="{Binding Flag}" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True" StaysOpenOnEdit="True" IsTextSearchEnabled="False" />
<enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" LocodeValue="{Binding PortOfRegistry}" />
<xctk:IntegerUpDown Name="integerUpDownGrossTonnage" Grid.Column="1" Grid.Row="4" Margin="2" Value="{Binding GrossTonnage}" ShowButtonSpinner="False"/>
<Label Content="t" Grid.Column="2" Grid.Row="4" />
<xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Column="1" Grid.Row="5" Margin="2" Value="{Binding LengthOverall_MTR}" ShowButtonSpinner="False" />
<Label Content="m" Grid.Column="2" Grid.Row="5" />
<TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center"/>
<enictrl:LocodeControl x:Name="locodePortOfRegistry" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" LocodeValue="{Binding PortOfRegistry}" />
<xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" />
<Label Content="m" Grid.Column="5" Grid.Row="5" />
<TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalAlignment="Center"/>
<TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" VerticalAlignment="Center" Margin="2" Text="{Binding InmarsatCallNumber}" />
</Grid>
<GroupBox Name="groupBoxISMCompany" Header="{x:Static p:Resources.textISMCompany}" Grid.Row="1">
<Grid>
@ -90,11 +90,11 @@
<Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="3" Content="{x:Static p:Resources.textCity}" Margin="0,0,10,0" />
<TextBox VerticalAlignment="Center" Name="textBoxCompanyName" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyName}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxStreetNumber" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyStreetAndNumber}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxPostalCode" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="1" Margin="2" Text="{Binding ISMCompanyPostalCode}" MaxLength="24" />
<TextBox VerticalAlignment="Center" Name="textBoxCountry" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCountry}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxCompanyId" Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyId}" MaxLength="100" />
<TextBox VerticalAlignment="Center" Name="textBoxCity" Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="2" Text="{Binding ISMCompanyCity}" MaxLength="100" />
</Grid>
</GroupBox>

2
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,7 +35,7 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>3.6.12.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

1
ENI-2/ENI2/ENI2/MainWindow.xaml.cs
View File

@ -307,6 +307,7 @@ namespace ENI2
if (closedDialog.Core.PoC.Equals("ZZNOK"))
closedDialog.Core.IsTransit = true;
closedDialog.Core.Incoming = true;
closedDialog.Core.DefaultReportingPartyId = this.userEntity.Id;
DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(closedDialog.Core);

BIN
Stundensheet.xlsx
View File

Binary file not shown.

16
nsw/HIS-NORD/Transmitter-Tool/client.log
View File

@ -228,3 +228,19 @@
17.06.2017 10:14:59 Client started
-----------------------------
17.06.2017 10:15:00 wrong Version of XML file
-----------------------------
13.08.2017 09:39:02 Client started
-----------------------------
13.08.2017 09:39:03 wrong Version of XML file
13.08.2017 09:39:04 wrong Version of XML file
13.08.2017 09:39:04 wrong Version of XML file
13.08.2017 09:39:04 wrong Version of XML file
13.08.2017 09:39:05 wrong Version of XML file
13.08.2017 09:39:05 wrong Version of XML file
13.08.2017 09:39:05 wrong Version of XML file
13.08.2017 09:39:05 wrong Version of XML file
13.08.2017 09:39:06 wrong Version of XML file
13.08.2017 09:39:06 wrong Version of XML file
13.08.2017 09:39:07 wrong Version of XML file
13.08.2017 09:39:07 wrong Version of XML file
13.08.2017 09:39:07 wrong Version of XML file

2
nsw/Source/bsmd.dbh/Request.cs
View File

@ -831,7 +831,7 @@ namespace bsmd.dbh
choiceTypes2.Add(ItemsChoiceType2.ValidSanitaryControlExemptionOrCertificateOnBoard);
mdhItems.Add(mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false ? RootSECValidISSCOnBoard.Y : RootSECValidISSCOnBoard.N);
if (mdh.DateOfIssue.HasValue && !mdh.PlaceOfIssue.IsNullOrEmpty())
if (mdh.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false)
{
choiceTypes2.Add(ItemsChoiceType2.ValidSanitaryControlExemptionOrCertificate);
RootMDHValidSanitaryControlExemptionOrCertificate cert = new RootMDHValidSanitaryControlExemptionOrCertificate();

85
nsw/Source/bsmd.hisnord/NSWResponse.cs
View File

@ -41,7 +41,27 @@ namespace bsmd.hisnord
XNamespace agntNS = "http://api.national-single-window.de/agnt";
XNamespace vioNS = "http://api.national-single-window.de/violation";
XNamespace errNS = "http://api.national-single-window.de/error";
XNamespace secNS = "http://api.national-single-window.de/sec";
XNamespace statNS = "http://api.national-single-window.de/stat";
XNamespace noa_nodNS = "http://api.national-single-window.de/noanod";
XNamespace ataNS = "http://api.national-single-window.de/ata";
XNamespace atdNS = "http://api.national-single-window.de/atd";
XNamespace pobaNS = "http://api.national-single-window.de/poba";
XNamespace pobdNS = "http://api.national-single-window.de/pobd";
XNamespace nameNS = "http://api.national-single-window.de/name";
XNamespace tiefaNS = "http://api.national-single-window.de/tiefa";
XNamespace tiefdNS = "http://api.national-single-window.de/tiefd";
XNamespace bkraNS = "http://api.national-single-window.de/bkra";
XNamespace bkrdNS = "http://api.national-single-window.de/bkrd";
XNamespace infoNS = "http://api.national-single-window.de/info";
XNamespace servNS = "http://api.national-single-window.de/serv";
XNamespace pre72hNS = "http://api.national-single-window.de/pre72h";
XNamespace wasNS = "http://api.national-single-window.de/was";
XNamespace crewNS = "http://api.national-single-window.de/crew";
XNamespace pasNS = "http://api.national-single-window.de/pas";
XNamespace bpolNS = "http://api.national-single-window.de/bpol";
XNamespace towaNS = "http://api.national-single-window.de/towa";
XNamespace towdNS = "http://api.national-single-window.de/towa";
XName idName = "ConveyanceCode";
var elem = xml.Descendants(idName);
@ -91,6 +111,69 @@ namespace bsmd.hisnord
case Message.NotificationClass.AGNT:
lookupName = agntNS + "AGNTResponse";
break;
case Message.NotificationClass.SEC:
lookupName = secNS + "SECResponse";
break;
case Message.NotificationClass.STAT:
lookupName = statNS + "STATResponse";
break;
case Message.NotificationClass.NOA_NOD:
lookupName = noa_nodNS + "NOA_NODResponse";
break;
case Message.NotificationClass.ATA:
lookupName = ataNS + "ATAResponse";
break;
case Message.NotificationClass.ATD:
lookupName = atdNS + "ATDResponse";
break;
case Message.NotificationClass.POBA:
lookupName = pobaNS + "POBAResponse";
break;
case Message.NotificationClass.POBD:
lookupName = pobdNS + "POBDResponse";
break;
case Message.NotificationClass.NAME:
lookupName = nameNS + "NAMEResponse";
break;
case Message.NotificationClass.TIEFA:
lookupName = tiefaNS + "TIEFAResponse";
break;
case Message.NotificationClass.TIEFD:
lookupName = tiefdNS + "TIEFDResponse";
break;
case Message.NotificationClass.BKRA:
lookupName = bkraNS + "BKRAResponse";
break;
case Message.NotificationClass.BKRD:
lookupName = bkrdNS + "BKRDResponse";
break;
case Message.NotificationClass.INFO:
lookupName = infoNS + "INFOResponse";
break;
case Message.NotificationClass.SERV:
lookupName = servNS + "SERVResponse";
break;
case Message.NotificationClass.PRE72H:
lookupName = pre72hNS + "PRE72HResponse";
break;
case Message.NotificationClass.WAS:
lookupName = wasNS + "WASResponse";
break;
case Message.NotificationClass.CREW:
lookupName = crewNS + "CREWResponse";
break;
case Message.NotificationClass.PAS:
lookupName = pasNS + "PASResponse";
break;
case Message.NotificationClass.BPOL:
lookupName = bpolNS + "BPOLResponse";
break;
case Message.NotificationClass.TOWA:
lookupName = towaNS + "TOWAResponse";
break;
case Message.NotificationClass.TOWD:
lookupName = towdNS + "TOWDResponse";
break;
default:
lookupName = "dontmatchmeplease";
break;

1463
nsw/Source/bsmd.hisnord/Request.cs
View File

File diff suppressed because it is too large Load Diff