diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml b/ENI2/DetailViewControls/WasteDetailControl.xaml
index 2f4b38f8..35c6fbb9 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml
@@ -11,131 +11,177 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d"
d:DesignHeight="600" d:DesignWidth="800">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 063b9eaa..02050ddc 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -23,6 +23,7 @@ namespace ENI2.DetailViewControls
private Message _wasMessage;
private WAS _was;
+ private Message _wasRcptMessage;
private static readonly string[] _wasteDeliveryList =
{
@@ -91,6 +92,7 @@ namespace ENI2.DetailViewControls
foreach (Message aMessage in this.Messages)
{
if (aMessage.MessageNotificationClass == Message.NotificationClass.WAS) { this._wasMessage = aMessage; this.ControlMessages.Add(aMessage); }
+ if(aMessage.MessageNotificationClass == Message.NotificationClass.WAS_RCPT) { this._wasRcptMessage = aMessage; this.ControlMessages.Add(aMessage); }
}
#region init WAS
@@ -127,8 +129,72 @@ namespace ENI2.DetailViewControls
this.checkBoxValidExemption.Unchecked += CheckBoxValidExemption_Checked;
#endregion
+ #region init WAS_RCPT
+
+ if(this._wasRcptMessage == null)
+ {
+ this._wasRcptMessage = this.Core.CreateMessage(Message.NotificationClass.WAS_RCPT);
+ this.Messages.Add(this._wasRcptMessage);
+ }
+
+ this.dataGridWasteReceipt.Initialize();
+ this.dataGridWasteReceipt.ItemsSource = this._wasRcptMessage.Elements;
+ this.dataGridWasteReceipt.AddingNewItem += DataGridWasteReceipt_AddingNewItem;
+ this.dataGridWasteReceipt.EditRequested += DataGridWasteReceipt_EditRequested;
+ this.dataGridWasteReceipt.DeleteRequested += DataGridWasteReceipt_DeleteRequested;
+ this.dataGridWasteReceipt.CreateRequested += DataGridWasteReceipt_CreateRequested;
+
+ #endregion
+
}
+ #region Waste receipt grid event handler
+
+ private void DataGridWasteReceipt_CreateRequested()
+ {
+ EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
+ epd.WAS_RCPT = new WAS_RCPT();
+ epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
+ epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
+
+ epd.AddClicked += () =>
+ {
+ epd.CopyValuesToEntity();
+ if (!this._wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
+ this._wasRcptMessage.Elements.Add(epd.WAS_RCPT);
+ this.dataGridWaste.Items.Refresh();
+ epd.WAS_RCPT = new WAS_RCPT();
+ epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
+ epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
+ this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
+ };
+
+ if (epd.ShowDialog() ?? false)
+ {
+ if (!this._wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
+ _wasRcptMessage.Elements.Add(epd.WAS_RCPT);
+ this.dataGridWaste.Items.Refresh();
+ this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
+ }
+ }
+
+ private void DataGridWasteReceipt_DeleteRequested(DatabaseEntity obj)
+ {
+ throw new NotImplementedException();
+ }
+
+ private void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
+ {
+ throw new NotImplementedException();
+ }
+
+ private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+
#region Waste grid event handler
private void DataGridWaste_CreateRequested()
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 520424ff..8cf758cf 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
true
publish.html
0
- 6.9.19.0
+ 7.0.0.0
false
true
true
@@ -230,6 +230,9 @@
LocodeControl.xaml
+
+ EditWasteReceiptDialog.xaml
+
@@ -618,6 +621,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml b/ENI2/EditControls/EditWasteReceiptDialog.xaml
new file mode 100644
index 00000000..307c5a4d
--- /dev/null
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
new file mode 100644
index 00000000..5417176d
--- /dev/null
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2017- schick Informatik
+// Description: Waste receipts bearbeiten..
+//
+
+using System;
+using System.Windows;
+
+using bsmd.database;
+using ENI2.Controls;
+
+namespace ENI2.EditControls
+{
+ ///
+ /// Interaction logic for EditWasteReceiptDialog.xaml
+ ///
+ public partial class EditWasteReceiptDialog : EditWindowBase
+ {
+ public EditWasteReceiptDialog()
+ {
+ InitializeComponent();
+ Loaded += EditWasteReceiptDialog_Loaded;
+ AddClicked += () => { /* this.comboBoxWasteCode.Focus(); */ };
+ }
+
+ public WAS_RCPT WAS_RCPT { get; set; }
+
+ private void EditWasteReceiptDialog_Loaded(object sender, RoutedEventArgs e)
+ {
+ /*
+ Dictionary codeDict = new Dictionary();
+ for (int i = 0; i < WAS.RequiredCodes.Length; i++)
+ {
+ codeDict[WAS.RequiredCodes[i]] = string.Format("{0} - {1}", WAS.RequiredCodes[i], WAS.RequiredTypes[i]);
+ }
+ this.comboBoxWasteCode.ItemsSource = codeDict;
+ this.comboBoxWasteCode.SelectedValue = this.Waste.WasteType;
+ this.textBoxDescription.Text = this.Waste.WasteDescription;
+ this.doubleUpDownAmountWasteDischargedLastPort.Value = this.Waste.WasteDisposedAtLastPort_MTQ;
+ this.doubleUpDownAmountDisposed.Value = this.Waste.WasteDisposalAmount_MTQ;
+ this.doubleUpDownAmountGeneratedTilNextPort.Value = this.Waste.WasteAmountGeneratedTillNextPort_MTQ;
+ this.doubleUpDownAmountRetained.Value = this.Waste.WasteAmountRetained_MTQ;
+ this.doubleUpDownMaxCapacity.Value = this.Waste.WasteCapacity_MTQ;
+ this.locodePortOfDeliveryRemainingWaste.LocodeValue = this.Waste.WasteDisposalPort;
+ */
+
+ OKClicked += EditWasteReceiptDialog_OKClicked;
+ this.AddVisible = true;
+ }
+ public void CopyValuesToEntity()
+ {
+ // copy back
+ /*
+ if (this.comboBoxWasteCode.SelectedValue != null)
+ this.Waste.WasteType = (int)this.comboBoxWasteCode.SelectedValue;
+ else
+ this.Waste.WasteType = null;
+ this.Waste.WasteDescription = this.textBoxDescription.Text?.Trim();
+ this.Waste.WasteDisposedAtLastPort_MTQ = this.doubleUpDownAmountWasteDischargedLastPort.Value;
+ this.Waste.WasteDisposalAmount_MTQ = this.doubleUpDownAmountDisposed.Value;
+ this.Waste.WasteAmountGeneratedTillNextPort_MTQ = this.doubleUpDownAmountGeneratedTilNextPort.Value;
+ this.Waste.WasteAmountRetained_MTQ = this.doubleUpDownAmountRetained.Value;
+ this.Waste.WasteCapacity_MTQ = this.doubleUpDownMaxCapacity.Value;
+ this.Waste.WasteDisposalPort = this.locodePortOfDeliveryRemainingWaste.LocodeValue;
+ */
+ }
+
+ private void EditWasteReceiptDialog_OKClicked()
+ {
+ this.CopyValuesToEntity();
+ }
+
+ }
+}
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 486e8153..5da4564b 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -850,6 +850,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Amount waste received (MTQ).
+ ///
+ public static string textAmountWasteReceived_MTQ {
+ get {
+ return ResourceManager.GetString("textAmountWasteReceived_MTQ", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Anchored.
///
@@ -2389,6 +2398,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Identification number.
+ ///
+ public static string textIdentificationNumber {
+ get {
+ return ResourceManager.GetString("textIdentificationNumber", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Identifier.
///
@@ -3676,6 +3694,24 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Port reception facility name.
+ ///
+ public static string textPortReceptionFacilityName {
+ get {
+ return ResourceManager.GetString("textPortReceptionFacilityName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Port reception facility provider name.
+ ///
+ public static string textPortReceptionFacilityProviderName {
+ get {
+ return ResourceManager.GetString("textPortReceptionFacilityProviderName", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Ports of call of the last 30 days.
///
@@ -4630,6 +4666,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Treatment facility provider name.
+ ///
+ public static string textTreatmentFacilityProviderName {
+ get {
+ return ResourceManager.GetString("textTreatmentFacilityProviderName", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Type.
///
@@ -4927,6 +4972,24 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Waste delivery date from.
+ ///
+ public static string textWasteDeliveryDateFrom {
+ get {
+ return ResourceManager.GetString("textWasteDeliveryDateFrom", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Waste delivery date to.
+ ///
+ public static string textWasteDeliveryDateTo {
+ get {
+ return ResourceManager.GetString("textWasteDeliveryDateTo", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Waste disposal service providers.
///
@@ -4972,6 +5035,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Waste receipt.
+ ///
+ public static string textWasteReceipt {
+ get {
+ return ResourceManager.GetString("textWasteReceipt", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Waste amount retained on board.
///
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index e7d27511..96162c7e 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1759,4 +1759,28 @@
Excel export
+
+ Amount waste received (MTQ)
+
+
+ Identification number
+
+
+ Port reception facility name
+
+
+ Port reception facility provider name
+
+
+ Treatment facility provider name
+
+
+ Waste delivery date from
+
+
+ Waste delivery date to
+
+
+ Waste receipt
+
\ No newline at end of file
diff --git a/SQL/Update_6.x_To_7.0.sql b/SQL/Update_6.x_To_7.0.sql
index 7020f238..d639ba61 100644
--- a/SQL/Update_6.x_To_7.0.sql
+++ b/SQL/Update_6.x_To_7.0.sql
@@ -100,4 +100,13 @@ GO
ALTER TABLE [dbo].[IMDGPosition]
ADD [Class7MaxActivity_Unit] TINYINT NULL;
+GO
+
+PRINT N'Altering [dbo].[PAS]...';
+
+GO
+ALTER TABLE [dbo].[PAS]
+ ADD [EmergencyCare] NVARCHAR (255) NULL,
+ [EmergencyContactNumber] NVARCHAR (99) NULL;
+
GO
\ No newline at end of file
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index d7645db5..3e7ae4b5 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -119,6 +119,12 @@ namespace bsmd.database
[ENI2Validation]
public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
+ [ENI2Validation]
+ public bool? NotificationSchengen { get; set; }
+
+ [ENI2Validation]
+ public bool? NotificationPAX { get; set; }
+
public string Identifier { get; set; }
public string SublistCollectionKey { get { return "crew"; } }
@@ -157,6 +163,8 @@ namespace bsmd.database
scmd.Parameters.AddWithValue("@P13", this.IsDeparture);
scmd.Parameters.AddWithNullableValue("@P14", this.CrewMemberIdentityDocumentIssuingState);
scmd.Parameters.AddWithNullableValue("@P15", this.CrewMemberIdentityDocumentExpiryDate);
+ scmd.Parameters.AddWithNullableValue("@P16", this.NotificationSchengen);
+ scmd.Parameters.AddWithNullableValue("@P17", this.NotificationPAX);
if (this.IsNew)
{
@@ -165,8 +173,8 @@ namespace bsmd.database
scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, CrewMemberLastName, CrewMemberFirstName, " +
"CrewMemberPlaceOfBirth, CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality,CrewMemberIdentityDocumentType, " +
"CrewMemberIdentityDocumentId, CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, " +
- "CrewMemberIdentityDocumentIssuingState, CrewMemberIdentityDocumentExpiryDate) " +
- "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15 )", this.Tablename);
+ "CrewMemberIdentityDocumentIssuingState, CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX) " +
+ "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17 )", this.Tablename);
}
else
{
@@ -175,7 +183,7 @@ namespace bsmd.database
"CrewMemberPlaceOfBirth = @P4, CrewMemberDateOfBirth = @P5, CrewMemberGender = @P6, CrewMemberNationality = @P7, "+
"CrewMemberIdentityDocumentType = @P8, CrewMemberIdentityDocumentId = @P9, CrewMemberVisaNumber = @P10, " +
"CrewMemberDuty = @P11, Identifier = @P12, IsDeparture = @P13, CrewMemberIdentityDocumentIssuingState = @P14, " +
- "CrewMemberIdentityDocumentExpiryDate = @P15 WHERE Id = @ID", this.Tablename);
+ "CrewMemberIdentityDocumentExpiryDate = @P15, NotificationSchengen = @P16, NotificationPAX = @P17 WHERE Id = @ID", this.Tablename);
}
}
@@ -184,7 +192,7 @@ namespace bsmd.database
string query = string.Format("SELECT Id, CrewMemberLastName, CrewMemberFirstName, CrewMemberPlaceOfBirth, " +
"CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality, CrewMemberIdentityDocumentType, CrewMemberIdentityDocumentId, " +
"CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, CrewMemberIdentityDocumentIssuingState, " +
- "CrewMemberIdentityDocumentExpiryDate FROM {0}", this.Tablename);
+ "CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX FROM {0}", this.Tablename);
switch (filter)
{
@@ -226,6 +234,8 @@ namespace bsmd.database
if (!reader.IsDBNull(12)) crew.IsDeparture = reader.GetBoolean(12);
if (!reader.IsDBNull(13)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(13);
if (!reader.IsDBNull(14)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(14);
+ if (!reader.IsDBNull(15)) crew.NotificationSchengen = reader.GetBoolean(15);
+ if (!reader.IsDBNull(16)) crew.NotificationPAX = reader.GetBoolean(16);
result.Add(crew);
}
@@ -249,7 +259,7 @@ namespace bsmd.database
string query = string.Format("SELECT Id, CrewMemberLastName, CrewMemberFirstName, CrewMemberPlaceOfBirth, " +
"CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality, CrewMemberIdentityDocumentType, CrewMemberIdentityDocumentId, " +
"CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, CrewMemberIdentityDocumentIssuingState, " +
- "CrewMemberIdentityDocumentExpiryDate FROM {0}", this.Tablename);
+ "CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX FROM {0}", this.Tablename);
switch (filter)
{
diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs
index 811bd41c..34c73de5 100644
--- a/bsmd.database/Message.cs
+++ b/bsmd.database/Message.cs
@@ -96,8 +96,9 @@ namespace bsmd.database
HAZD,
AGNT,
STO, // DK - only
- CREWD, // DK - only
- PASD // DK - only
+ CREWD,
+ PASD,
+ WAS_RCPT
}
public enum MessageStatus
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index 14b4ff69..10d515d2 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -128,6 +128,23 @@ namespace bsmd.database
[ENI2Validation]
public DateTime? PassengerIdentityDocumentExpiryDate { get; set; }
+ [ENI2Validation]
+ public bool? NotificationSchengen { get; set; }
+
+ [ENI2Validation]
+ public bool? NotificationPAX { get; set; }
+
+ [ENI2Validation]
+ [ReportDisplayName("Emergency care")]
+ [MaxLength(255)]
+ public string EmergencyCare { get; set; }
+
+ [ENI2Validation]
+ [ReportDisplayName("Emergency contact number")]
+ [MaxLength(99)]
+ public string EmergencyContactNumber { get; set; }
+
+
public string Identifier { get; set; }
public string SublistCollectionKey { get { return "pas"; } }
@@ -170,6 +187,10 @@ namespace bsmd.database
scmd.Parameters.AddWithValue("@P15", this.IsDeparture);
scmd.Parameters.AddWithNullableValue("@P16", this.PassengerIdentityDocumentIssuingState);
scmd.Parameters.AddWithNullableValue("@P17", this.PassengerIdentityDocumentExpiryDate);
+ scmd.Parameters.AddWithNullableValue("@P18", this.NotificationSchengen);
+ scmd.Parameters.AddWithNullableValue("@P19", this.NotificationPAX);
+ scmd.Parameters.AddWithNullableValue("@P20", this.EmergencyCare);
+ scmd.Parameters.AddWithNullableValue("@P21", this.EmergencyContactNumber);
if (this.IsNew)
{
@@ -178,8 +199,9 @@ namespace bsmd.database
scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, PassengerLastName, PassengerFirstName, " +
"PassengerPlaceOfBirth, PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, " +
"PassengerIdentityDocumentId, PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation," +
- "PassengerInTransit, Identifier, IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate) " +
- "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17 )",
+ "PassengerInTransit, Identifier, IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, " +
+ "NotificationSchengen, NotificationSchengen, EmergencyCare, EmergencyContactNumber) " +
+ "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17, @P18, @P19, @P20, @P21 )",
this.Tablename);
}
else
@@ -190,7 +212,8 @@ namespace bsmd.database
"PassengerNationality = @P7, PassengerIdentityDocumentType = @P8, PassengerIdentityDocumentId = @P9, " +
"PassengerVisaNumber = @P10, PassengerPortOfEmbarkation = @P11, PassengerPortOfDisembarkation = @P12, " +
"PassengerInTransit = @P13, IsDeparture = @P15, Identifier = @P14, PassengerIdentityDocumentIssuingState = @P16, " +
- "PassengerIdentityDocumentExpiryDate = @P17 WHERE Id = @ID", this.Tablename);
+ "PassengerIdentityDocumentExpiryDate = @P17, NotificationSchengen = @P18, NotificationPAX = @P19, " +
+ "EmergencyCare = @P20, EmergencyContactNumber = @P21 WHERE Id = @ID", this.Tablename);
}
}
@@ -199,7 +222,8 @@ namespace bsmd.database
string query = string.Format("SELECT Id, PassengerLastName, PassengerFirstName, PassengerPlaceOfBirth, " +
"PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, PassengerIdentityDocumentId, " +
"PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation, PassengerInTransit, Identifier, " +
- "IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate FROM {0}",
+ "IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, NotificationSchengen, " +
+ "NotificationPAX, EmergencyCare, EmergencyContactNumber FROM {0}",
this.Tablename);
switch (filter)
@@ -244,6 +268,10 @@ namespace bsmd.database
if (!reader.IsDBNull(14)) pas.IsDeparture = reader.GetBoolean(14);
if (!reader.IsDBNull(15)) pas.PassengerIdentityDocumentIssuingState = reader.GetString(15);
if (!reader.IsDBNull(16)) pas.PassengerIdentityDocumentExpiryDate = reader.GetDateTime(16);
+ if (!reader.IsDBNull(17)) pas.NotificationSchengen = reader.GetBoolean(17);
+ if (!reader.IsDBNull(18)) pas.NotificationPAX = reader.GetBoolean(18);
+ if (!reader.IsDBNull(19)) pas.EmergencyCare = reader.GetString(19);
+ if (!reader.IsDBNull(20)) pas.EmergencyContactNumber = reader.GetString(20);
result.Add(pas);
}
reader.Close();
@@ -284,7 +312,8 @@ namespace bsmd.database
string query = string.Format("SELECT Id, PassengerLastName, PassengerFirstName, PassengerPlaceOfBirth, " +
"PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, PassengerIdentityDocumentId, " +
"PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation, PassengerInTransit, Identifier, IsDeparture, " +
- "PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate FROM {0}",
+ "PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX, " +
+ "EmergencyCare, EmergencyContactNumber FROM {0}",
this.Tablename);
switch (filter)
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 89505aa6..6e8330e2 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.9.19")]
+[assembly: AssemblyInformationalVersion("7.0.0")]
[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
[assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index a0faa9b5..ee7ffbc1 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
using System.Reflection;
-[assembly: AssemblyVersion("6.9.19.*")]
+[assembly: AssemblyVersion("7.0.0.*")]
diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 68f97f70..bf6f8ef1 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -15,7 +15,7 @@ namespace bsmd.database
[TypeConverter(typeof(MessageClassConverter))]
[JsonConverter(typeof(NoTypeConverterJsonConverter))]
- public class WAS_RCPT : DatabaseEntity, ISublistContainer
+ public class WAS_RCPT : DatabaseEntity, ISublistContainer, ISublistElement
{
public WAS_RCPT()
{
@@ -95,6 +95,14 @@ namespace bsmd.database
#endregion
+ #region ISublistElement implementation
+
+ public string Identifier { get; set; }
+
+ public string SublistCollectionKey { get { return "was_rcpt"; } }
+
+ #endregion
+
#region DatabaseEntity implementation
public override void PrepareSave(IDbCommand cmd)