diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index 97f26563..08da99c4 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -75,6 +75,8 @@ + + @@ -108,6 +110,8 @@ + + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml index bb022dd7..683af440 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml @@ -135,6 +135,13 @@ + + + + + diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml index e28c9504..dc4dc757 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml @@ -8,7 +8,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textCrewMember}" Height="246" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> + Title="{x:Static p:Resources.textCrewMember}" Height="274" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> @@ -17,6 +17,7 @@ + @@ -34,6 +35,8 @@ diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs index d355e4ad..3d976075 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml.cs @@ -43,6 +43,9 @@ namespace ENI2.EditControls this.comboBoxIdDocType.SelectedIndex = this.CREW.CrewMemberIdentityDocumentType.HasValue ? this.CREW.CrewMemberIdentityDocumentType.Value : -1; this.textBoxIdDocNumber.Text = this.CREW.CrewMemberIdentityDocumentId; this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber; + this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; + this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState; + this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate; this.OKClicked += EditCREWDialog_OKClicked; this.AddVisible = true; } @@ -60,6 +63,8 @@ namespace ENI2.EditControls this.CREW.CrewMemberIdentityDocumentType = (this.comboBoxIdDocType.SelectedIndex == -1) ? null : (byte?)this.comboBoxIdDocType.SelectedIndex; this.CREW.CrewMemberIdentityDocumentId = this.textBoxIdDocNumber.Text.Trim(); this.CREW.CrewMemberVisaNumber = this.textBoxVisaNumber.Text.Trim(); + this.CREW.CrewMemberIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue; + this.CREW.CrewMemberIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate; } private void EditCREWDialog_OKClicked() diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs index df9ddf18..6ba205b8 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/EditIMDGDialog.xaml.cs @@ -74,7 +74,7 @@ namespace ENI2.EditControls this.locodeControlPortOfDischarge.LocodeValue = this.IMDG.PortOfDischarge; this.locodeControlPortOfLoading.LocodeValue = this.IMDG.PortOfLoading; - this.OKClicked += EditIMDGDialog_OKClicked; ; + this.OKClicked += EditIMDGDialog_OKClicked; this.AddVisible = true; } diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml index bd043da4..e40e216c 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml @@ -8,7 +8,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textIMSBCItem}" Height="330" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> + Title="{x:Static p:Resources.textIMSBCItem}" Height="358" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> @@ -19,6 +19,7 @@ + @@ -39,6 +40,7 @@ diff --git a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml.cs index 31ac39e1..70c38bc3 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/EditIMSBCDialog.xaml.cs @@ -42,6 +42,9 @@ namespace ENI2.EditControls this.locodePortOfDischarge.LocodeValue = this.IMSBC.PortOfDischarge; this.locodePortOfLoading.LocodeValue = this.IMSBC.PortOfLoading; + this.comboBoxIMOHazardClass.ItemsSource = GlobalStructures.imoHazardClasses; + this.comboBoxIMOHazardClass.SelectedIndex = (int)(this.IMSBC.IMOHazardClass ?? -1); + this.OKClicked += EditIMSBCDialog_OKClicked; this.AddVisible = true; } @@ -58,7 +61,8 @@ namespace ENI2.EditControls this.IMSBC.MHB = this.checkBoxMaterialHazardous.IsChecked; this.IMSBC.Quantity_KGM = this.doubleUpDownQuantity.Value; this.IMSBC.PortOfDischarge = this.locodePortOfDischarge.LocodeValue; - this.IMSBC.PortOfLoading = this.locodePortOfLoading.LocodeValue; + this.IMSBC.PortOfLoading = this.locodePortOfLoading.LocodeValue; + this.IMSBC.IMOHazardClass = (this.comboBoxIMOHazardClass.SelectedIndex == -1) ? null : ((int?)this.comboBoxIMOHazardClass.SelectedIndex); } private void EditIMSBCDialog_OKClicked() diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml index f696fa4e..e7814440 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml @@ -8,7 +8,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textPassenger}" Height="246" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> + Title="{x:Static p:Resources.textPassenger}" Height="274" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue"> @@ -17,6 +17,7 @@ + @@ -36,6 +37,8 @@ diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs index 51042205..b449acef 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml.cs @@ -45,6 +45,10 @@ namespace ENI2.EditControls this.locodePortOfEmbarkation.LocodeValue = this.PAS.PassengerPortOfEmbarkation; this.locodePortOfDisembarkation.LocodeValue = this.PAS.PassengerPortOfDisembarkation; this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit; + this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; + this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState; + this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate; + this.OKClicked += EditPasDialog_OKClicked; this.AddVisible = true; } @@ -64,6 +68,8 @@ namespace ENI2.EditControls this.PAS.PassengerPortOfEmbarkation = this.locodePortOfEmbarkation.LocodeValue; this.PAS.PassengerPortOfDisembarkation = this.locodePortOfDisembarkation.LocodeValue; this.PAS.PassengerInTransit = this.checkBoxTransitPassenger.IsChecked; + this.PAS.PassengerIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue; + this.PAS.PassengerIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate; } private void EditPasDialog_OKClicked() diff --git a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml index 68dcdf07..02bbff4c 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml @@ -22,7 +22,7 @@