diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
index c54a3298..d8f54db7 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
@@ -82,6 +82,8 @@
+
+
@@ -120,6 +122,7 @@
+
@@ -160,6 +163,9 @@
+
+
+
@@ -200,6 +206,9 @@
+
+
+
diff --git a/ENI2/EditControls/EditCREWDialog.xaml b/ENI2/EditControls/EditCREWDialog.xaml
index dc4dc757..4f693102 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml
+++ b/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="274" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
+ Title="{x:Static p:Resources.textCrewMember}" Height="302" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
@@ -18,6 +18,7 @@
+
@@ -33,10 +34,12 @@
-
+
+
-
+
+
@@ -50,14 +53,16 @@
-
+
+
-
+
+
diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs
index 3d976075..889b7955 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -46,6 +46,9 @@ namespace ENI2.EditControls
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
+ this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
+ this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
+ this.textBoxEffects.Text = this.CREW.Effects;
this.OKClicked += EditCREWDialog_OKClicked;
this.AddVisible = true;
}
@@ -65,6 +68,8 @@ namespace ENI2.EditControls
this.CREW.CrewMemberVisaNumber = this.textBoxVisaNumber.Text.Trim();
this.CREW.CrewMemberIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue;
this.CREW.CrewMemberIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate;
+ this.CREW.CrewMemberCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
+ this.CREW.Effects = this.textBoxEffects.Text.Trim();
}
private void EditCREWDialog_OKClicked()
diff --git a/ENI2/EditControls/EditPasDialog.xaml b/ENI2/EditControls/EditPasDialog.xaml
index e7814440..54732625 100644
--- a/ENI2/EditControls/EditPasDialog.xaml
+++ b/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="274" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
+ Title="{x:Static p:Resources.textPassenger}" Height="330" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue">
@@ -18,6 +18,8 @@
+
+
@@ -32,13 +34,16 @@
-
+
+
-
+
-
+
-
+
+
+
@@ -52,17 +57,20 @@
-
+
+
-
+
-
+
-
+
+
+
diff --git a/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI2/EditControls/EditPasDialog.xaml.cs
index b449acef..5fd8d4ef 100644
--- a/ENI2/EditControls/EditPasDialog.xaml.cs
+++ b/ENI2/EditControls/EditPasDialog.xaml.cs
@@ -48,6 +48,10 @@ namespace ENI2.EditControls
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
+ this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
+ this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
+ this.textBoxEmergencyCare.Text = this.PAS.EmergencyCare;
+ this.textBoxEmergencyContactNumber.Text = this.PAS.EmergencyContactNumber;
this.OKClicked += EditPasDialog_OKClicked;
this.AddVisible = true;
@@ -70,7 +74,10 @@ namespace ENI2.EditControls
this.PAS.PassengerInTransit = this.checkBoxTransitPassenger.IsChecked;
this.PAS.PassengerIdentityDocumentIssuingState = (this.comboBoxIssuingState.SelectedValue == null) ? "" : (string)this.comboBoxIssuingState.SelectedValue;
this.PAS.PassengerIdentityDocumentExpiryDate = this.datePickerExpiryDate.SelectedDate;
- }
+ this.PAS.PassengerCountryOfBirth = (this.comboBoxCountryOfBirth.SelectedValue == null) ? "" : (string)this.comboBoxCountryOfBirth.SelectedValue;
+ this.PAS.EmergencyCare = this.textBoxEmergencyCare.Text.Trim();
+ this.PAS.EmergencyContactNumber = this.textBoxEmergencyContactNumber.Text.Trim();
+ }
private void EditPasDialog_OKClicked()
{
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index ef57c6ad..c2031d71 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -1588,6 +1588,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Country of birth.
+ ///
+ public static string textCountryOfBirth {
+ get {
+ return ResourceManager.GetString("textCountryOfBirth", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Created.
///
@@ -1993,6 +2002,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Effects.
+ ///
+ public static string textEffects {
+ get {
+ return ResourceManager.GetString("textEffects", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to E-Mail.
///
@@ -2002,6 +2020,24 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Emergency care.
+ ///
+ public static string textEmergencyCare {
+ get {
+ return ResourceManager.GetString("textEmergencyCare", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Emergency contact number.
+ ///
+ public static string textEmergencyContactNumber {
+ get {
+ return ResourceManager.GetString("textEmergencyContactNumber", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Emergency temperature.
///
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index 1834eb64..29713813 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1810,4 +1810,16 @@
Passenger departure
+
+ Country of birth
+
+
+ Effects
+
+
+ Emergency care
+
+
+ Emergency contact number
+
\ No newline at end of file