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

8.3.5: weitere Korrekturen und ganz kleine Schritte bei der Validierung

Browse Source
This commit is contained in:
Daniel Schick 2017-11-15 19:10:59 +00:00
parent 24f52940ba
commit 5c2892e1eb
25 changed files with 295 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/App.config
View File

@ -26,12 +26,12 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.4/LockingService/LockingService.svc</value--> <value>http://192.168.2.4/LockingService/LockingService.svc</value>
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value> <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value--> <value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
<value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value> <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

6
ENI-2/ENI2/ENI2/App.xaml.cs
View File

@ -39,6 +39,11 @@ namespace ENI2
public static ServiceClient LockingServiceClient { get { return _lockingServiceClient; } } public static ServiceClient LockingServiceClient { get { return _lockingServiceClient; } }
public static void RestartLockingService()
{
_lockingServiceClient = new ServiceClient("BasicHttpBinding_IService", ENI2.Properties.Settings.Default.LockingServerAddress);
}
public static SplashScreenWindow SplashScreen { get { return _splashScreenWindow; } } public static SplashScreenWindow SplashScreen { get { return _splashScreenWindow; } }
public static Guid? UserId { get { return _userId; } set { _userId = value; } } public static Guid? UserId { get { return _userId; } set { _userId = value; } }
@ -93,6 +98,7 @@ namespace ENI2
{ {
string errorMessage = string.Format("An unhandled exception occurred: {0}\r\n{1}", e.Exception.Message, e.Exception.StackTrace); string errorMessage = string.Format("An unhandled exception occurred: {0}\r\n{1}", e.Exception.Message, e.Exception.StackTrace);
MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error); MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
// TODO: Dieser Fehler muss irgendwohin gesendet / gespeichert werden
e.Handled = true; e.Handled = true;
} }

2
ENI-2/ENI2/ENI2/DetailBaseControl.cs
View File

@ -166,7 +166,7 @@ namespace ENI2
protected void RegisterDateTimePickerChange(Xceed.Wpf.Toolkit.DateTimePicker dateTimePicker, Message.NotificationClass notificationClass) protected void RegisterDateTimePickerChange(Xceed.Wpf.Toolkit.DateTimePicker dateTimePicker, Message.NotificationClass notificationClass)
{ {
this._dpDateTimePicker.AddValueChanged(dateTimePicker, this.controlContentChanged); this._dpDateTimePicker.AddValueChanged(dateTimePicker, this.controlContentChanged);
this._controlClassDict[dateTimePicker] = notificationClass; this._controlClassDict[dateTimePicker] = notificationClass;
} }

31
ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
View File

@ -200,6 +200,9 @@ namespace ENI2
MessageBoxButton.YesNo, MessageBoxImage.Question); MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes) if (result == MessageBoxResult.Yes)
{ {
Util.UIHelper.SetBusyState();
DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl; DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl;
if (currentControl != null) if (currentControl != null)
{ {
@ -222,7 +225,7 @@ namespace ENI2
private void SaveMessage(Message message) private void SaveMessage(Message message)
{ {
if (message.IsDirty) if (message.IsDirty || message.IsNew)
{ {
if ((message.Status == Message.MessageStatus.ACCEPTED) && if ((message.Status == Message.MessageStatus.ACCEPTED) &&
((message.InternalStatus == Message.BSMDStatus.CONFIRMED) || (message.InternalStatus == Message.BSMDStatus.VIOLATION))) ((message.InternalStatus == Message.BSMDStatus.CONFIRMED) || (message.InternalStatus == Message.BSMDStatus.VIOLATION)))
@ -234,7 +237,24 @@ namespace ENI2
} }
message.ChangedBy = string.Format("{0} at {1}", userName, DateTime.Now); message.ChangedBy = string.Format("{0} at {1}", userName, DateTime.Now);
DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message); DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message);
message.SaveElements(); if (message.MessageNotificationClass == Message.NotificationClass.CREW)
{
foreach(CREW crew in message.Elements)
{
if (crew.IsNew || crew.IsDirty) DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(crew);
}
}
else if (message.MessageNotificationClass == Message.NotificationClass.PAS)
{
foreach(PAS pas in message.Elements)
{
if(pas.IsNew || pas.IsDirty) DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(pas);
}
}
else
{
message.SaveElements();
}
message.IsDirty = false; message.IsDirty = false;
} }
} }
@ -245,7 +265,10 @@ namespace ENI2
MessageBoxButton.YesNo, MessageBoxImage.Question); MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes) if (result == MessageBoxResult.Yes)
{ {
foreach(Message message in this._messages)
Util.UIHelper.SetBusyState();
foreach (Message message in this._messages)
{ {
this.SaveMessage(message); this.SaveMessage(message);
} }
@ -323,6 +346,8 @@ namespace ENI2
this._vViolations.Clear(); this._vViolations.Clear();
// TODO: clear highlighting // TODO: clear highlighting
Util.UIHelper.SetBusyState();
RuleEngine ruleEngine = new RuleEngine(); RuleEngine ruleEngine = new RuleEngine();
foreach (Message aMessage in _messages) foreach (Message aMessage in _messages)
{ {

10
ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
View File

@ -214,7 +214,7 @@ namespace ENI2.DetailViewControls
if(!this._pasMessage.Elements.Contains(epd.PAS)) if(!this._pasMessage.Elements.Contains(epd.PAS))
this._pasMessage.Elements.Add(epd.PAS); this._pasMessage.Elements.Add(epd.PAS);
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
epd.PAS = new PAS(); epd.PAS = new PAS();
epd.PAS.MessageHeader = this._pasMessage; epd.PAS.MessageHeader = this._pasMessage;
epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements); epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements);
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PAS);
@ -223,7 +223,7 @@ namespace ENI2.DetailViewControls
if (epd.ShowDialog() ?? false) if (epd.ShowDialog() ?? false)
{ {
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.PAS);
} }
@ -258,7 +258,7 @@ namespace ENI2.DetailViewControls
if(!_pasMessage.Elements.Contains(epd.PAS)) if(!_pasMessage.Elements.Contains(epd.PAS))
_pasMessage.Elements.Add(epd.PAS); _pasMessage.Elements.Add(epd.PAS);
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
epd.PAS = new PAS(); epd.PAS = new PAS();
epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements); epd.PAS.Identifier = PAS.GetNewIdentifier(_pasMessage.Elements);
epd.PAS.MessageHeader = _pasMessage; epd.PAS.MessageHeader = _pasMessage;
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PAS);
@ -268,6 +268,7 @@ namespace ENI2.DetailViewControls
{ {
if (!_pasMessage.Elements.Contains(epd.PAS)) if (!_pasMessage.Elements.Contains(epd.PAS))
_pasMessage.Elements.Add(epd.PAS); _pasMessage.Elements.Add(epd.PAS);
epd.PAS.IsDirty = true;
this.dataGridPassengerList.Items.Refresh(); this.dataGridPassengerList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.PAS); this.SublistElementChanged(Message.NotificationClass.PAS);
} }
@ -349,6 +350,7 @@ namespace ENI2.DetailViewControls
{ {
if (!_crewMessage.Elements.Contains(ecd.CREW)) if (!_crewMessage.Elements.Contains(ecd.CREW))
_crewMessage.Elements.Add(ecd.CREW); _crewMessage.Elements.Add(ecd.CREW);
ecd.CREW.IsDirty = true;
this.dataGridCrewList.Items.Refresh(); this.dataGridCrewList.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.CREW); this.SublistElementChanged(Message.NotificationClass.CREW);
} }
@ -422,6 +424,7 @@ namespace ENI2.DetailViewControls
if (!reader.IsDBNull(9)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 9); if (!reader.IsDBNull(9)) crew.CrewMemberVisaNumber = this.getValueAsString(reader, 9);
crew.MessageHeader = this._crewMessage; crew.MessageHeader = this._crewMessage;
crew.IsDirty = true;
crew.Identifier = CREW.GetNewIdentifier(this._crewMessage.Elements); crew.Identifier = CREW.GetNewIdentifier(this._crewMessage.Elements);
this._crewMessage.Elements.Add(crew); this._crewMessage.Elements.Add(crew);
importCrew.Add(crew); importCrew.Add(crew);
@ -500,6 +503,7 @@ namespace ENI2.DetailViewControls
if (!reader.IsDBNull(11)) pas.PassengerVisaNumber = this.getValueAsString(reader, 11); if (!reader.IsDBNull(11)) pas.PassengerVisaNumber = this.getValueAsString(reader, 11);
pas.MessageHeader = this._pasMessage; pas.MessageHeader = this._pasMessage;
pas.IsDirty = true;
pas.Identifier = PAS.GetNewIdentifier(this._pasMessage.Elements); pas.Identifier = PAS.GetNewIdentifier(this._pasMessage.Elements);
this._pasMessage.Elements.Add(pas); this._pasMessage.Elements.Add(pas);
importPassenger.Add(pas); importPassenger.Add(pas);

9
ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
View File

@ -79,7 +79,7 @@ namespace ENI2.DetailViewControls
this.comboBoxInitialHis.ItemsSource = Util.EnumHelper.GetAllValuesAndDescription(typeof(Message.NSWProvider)); this.comboBoxInitialHis.ItemsSource = Util.EnumHelper.GetAllValuesAndDescription(typeof(Message.NSWProvider));
this.comboBoxInitialHis.DataContext = this.Core; this.comboBoxInitialHis.DataContext = this.Core;
Binding vtBinding = new Binding(); Binding vtBinding = new Binding();
vtBinding.Source = this.Core; vtBinding.Source = this.Core;
vtBinding.Path = this.Core.IsTransit ? new PropertyPath("TransitId") : new PropertyPath("VisitId"); vtBinding.Path = this.Core.IsTransit ? new PropertyPath("TransitId") : new PropertyPath("VisitId");
vtBinding.Mode = BindingMode.TwoWay; vtBinding.Mode = BindingMode.TwoWay;
@ -352,8 +352,11 @@ namespace ENI2.DetailViewControls
public void ShowLockedBy(ReportingParty reportingParty) public void ShowLockedBy(ReportingParty reportingParty)
{ {
this.stackPanelLock.Visibility = Visibility.Visible; if (reportingParty != null)
this.textBlockLockUserName.Text = reportingParty.FirstName + " " + reportingParty.LastName; {
this.stackPanelLock.Visibility = Visibility.Visible;
this.textBlockLockUserName.Text = reportingParty.FirstName + " " + reportingParty.LastName;
}
} }
#endregion #endregion

2
ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
View File

@ -49,7 +49,7 @@
<Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/> <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
</Grid> </Grid>
<enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1"> AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" /> <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
<DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" /> <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />

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

@ -35,8 +35,8 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion> <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>1</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>3.8.3.%2a</ApplicationVersion> <ApplicationVersion>3.8.5.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

24
ENI-2/ENI2/ENI2/SucheControl.xaml.cs
View File

@ -11,6 +11,7 @@ using System.Windows.Media;
using bsmd.database; using bsmd.database;
using System.Windows.Data; using System.Windows.Data;
using log4net;
namespace ENI2 namespace ENI2
{ {
@ -19,9 +20,9 @@ namespace ENI2
/// </summary> /// </summary>
public partial class SucheControl : UserControl public partial class SucheControl : UserControl
{ {
private List<MessageCore> anmeldungen = new List<MessageCore>(); private List<MessageCore> anmeldungen = new List<MessageCore>();
private object searchLock = new object(); private object searchLock = new object();
private ILog _log = LogManager.GetLogger("SucheControl");
#region Construction #region Construction
@ -98,7 +99,26 @@ namespace ENI2
if (App.UserId.HasValue) if (App.UserId.HasValue)
{ {
// "locks" dazu abfragen // "locks" dazu abfragen
LockingServiceReference.CoreLock[] coreLocks = App.LockingServiceClient.GetLocks(); LockingServiceReference.CoreLock[] coreLocks = null;
bool retry = false;
RESTART:
try
{
coreLocks = App.LockingServiceClient.GetLocks();
}
catch(Exception ex)
{
// wenn das System lang lief ist der Service deallokiert? Wirft hier eine Exception. Ich würde an der Stelle den Client neu
// erzeugen und nochmal probieren, danach darüber laufen lassen..
if (!retry)
{
_log.ErrorFormat("LockingService:GetLocks(): {0}", ex.Message);
_log.Info("trying to restart the locking service client");
retry = true;
App.RestartLockingService();
goto RESTART;
}
}
Dictionary<Guid, bool?> coreLockUpdateDict = new Dictionary<Guid, bool?>(); Dictionary<Guid, bool?> coreLockUpdateDict = new Dictionary<Guid, bool?>();
for (int i = 0; i < coreLocks.Length; i++) for (int i = 0; i < coreLocks.Length; i++)
{ {

46
ENI-2/ENI2/ENI2/Util/GlobalStructures.cs
View File

@ -33,29 +33,29 @@ namespace ENI2.Util
public static byte[] ShipSecurityLevels = { 1, 2, 3 }; public static byte[] ShipSecurityLevels = { 1, 2, 3 };
public static Dictionary<int, string> Edifact8025 = new Dictionary<int, string> { public static Dictionary<int, string> Edifact8025 = new Dictionary<int, string> {
{1, "Cargo operations" }, {1, "1 Cargo operations" },
{2, "Passenger movement" }, {2, "2 Passenger movement" },
{3, "Taking bunkers" }, {3, "3 Taking bunkers" },
{4, "Changing crew" }, {4, "4 Changing crew" },
{5, "Goodwill visit" }, {5, "5 Goodwill visit" },
{6, "Taking supplies" }, {6, "6 Taking supplies" },
{7, "Repair" }, {7, "7 Repair" },
{8, "Laid-up" }, {8, "8 Laid-up" },
{9, "Awaiting orders" }, {9, "9 Awaiting orders" },
{10, "Miscellaneous" }, {10, "10 Miscellaneous" },
{11, "Crew movement" }, {11, "11 Crew movement" },
{12, "Cruise, leisure and recreation" }, {12, "12 Cruise, leisure and recreation" },
{13, "Under government order" }, {13, "13 Under government order" },
{14, "Quarantine inspection" }, {14, "14 Quarantine inspection" },
{15, "Refuge" }, {15, "15 Refuge" },
{16, "Unloading cargo" }, {16, "16 Unloading cargo" },
{17, "Loading cargo" }, {17, "17 Loading cargo" },
{18, "Repair in dry dock" }, {18, "18 Repair in dry dock" },
{19, "Repair in wet dock" }, {19, "19 Repair in wet dock" },
{20, "Cargo tank cleaning" }, {20, "20 Cargo tank cleaning" },
{21, "Means of transport customs clearance" }, {21, "21 Means of transport customs clearance" },
{22, "De-gassing" }, {22, "22 De-gassing" },
{23, "Waste disposal" } {23, "23 Waste disposal" }
}; };
public static string[] vesselClasses = public static string[] vesselClasses =

3
ENI-2/ENI2/ENI2/Util/UtcToLocalDateTimeConverter.cs
View File

@ -25,7 +25,10 @@ namespace ENI2.Util
{ {
DateTime? sourceVal = (DateTime?) value; DateTime? sourceVal = (DateTime?) value;
if (sourceVal.HasValue) if (sourceVal.HasValue)
{
//if(sourceVal.Value.)
return DateTime.SpecifyKind(sourceVal.Value, DateTimeKind.Utc).ToLocalTime(); return DateTime.SpecifyKind(sourceVal.Value, DateTimeKind.Utc).ToLocalTime();
}
else else
return null; return null;
} }

4
nsw/Source/SendNSWMessageService/NSWSendService.cs
View File

@ -143,6 +143,7 @@ namespace SendNSWMessageService
if (!XtraSendLogic.ShouldSendMessage(message)) if (!XtraSendLogic.ShouldSendMessage(message))
{ {
message.InternalStatus = Message.BSMDStatus.SUSPENDED; message.InternalStatus = Message.BSMDStatus.SUSPENDED;
message.ChangedBy = ""; // zurücksetzen für Overview
DBManager.Instance.Save(message); DBManager.Instance.Save(message);
continue; continue;
} }
@ -266,7 +267,7 @@ namespace SendNSWMessageService
} }
DBManager.Instance.Save(core); DBManager.Instance.Save(core);
#region old logic
/* /*
if ((core.InitialHIS == Message.NSWProvider.DUDR) || (core.InitialHIS == Message.NSWProvider.DUDR_TEST)) if ((core.InitialHIS == Message.NSWProvider.DUDR) || (core.InitialHIS == Message.NSWProvider.DUDR_TEST))
{ {
@ -475,6 +476,7 @@ namespace SendNSWMessageService
} }
} }
*/ */
#endregion
} }

2
nsw/Source/bsmd.ReportGenerator/ReportService.cs
View File

@ -286,7 +286,7 @@ namespace bsmd.ReportGenerator
List<string> attachments = new List<string>(); List<string> attachments = new List<string>();
attachments.Add(fullPath); attachments.Add(fullPath);
// BSMDMail.SendNSWReportWithAttachments(subject, attachments, rp.EMail); BSMDMail.SendNSWReportWithAttachments(subject, attachments, rp.UserEMail);
// remove // remove
if (Properties.Settings.Default.DeleteFileAfterSend) if (Properties.Settings.Default.DeleteFileAfterSend)

12
nsw/Source/bsmd.database/DBManager.cs
View File

@ -1107,11 +1107,17 @@ namespace bsmd.database
reader.Close(); reader.Close();
if (!core.ETA_NOA_NOD.HasValue && !core.IsTransit) if (!core.ETA_NOA_NOD.HasValue && !core.IsTransit)
core.ETA_NOA_NOD = core.ETA; {
// die Zeit aus MessageCore ist nur ein Datum. Daher verwendet er 00:00 als lokale Zeit, was z.B. nach 01:00 MET zur Anzeige konvertiert wird.
// Das darf in diesem Fall nicht sein, der Wert müsste also gefakt lokal gesetzt werden.. ouch hack
core.ETA_NOA_NOD = DateTime.SpecifyKind(core.ETA.Value, DateTimeKind.Local).ToUniversalTime();
}
if (!core.ETA_NOA_NOD.HasValue && core.IsTransit) if (!core.ETA_NOA_NOD.HasValue && core.IsTransit)
core.ETA_NOA_NOD = core.ETAKielCanal; {
core.ETA_NOA_NOD = DateTime.SpecifyKind(core.ETAKielCanal.Value, DateTimeKind.Local).ToUniversalTime();
}
} }
internal void LoadATA(MessageCore core) internal void LoadATA(MessageCore core)

2
nsw/Source/bsmd.database/DatabaseEntity.cs
View File

@ -22,7 +22,7 @@ namespace bsmd.database
{ {
protected Guid? id; protected Guid? id;
protected string tablename; protected string tablename;
private Guid instance_id = Guid.NewGuid(); // Comparison id in case entity has not been saved private Guid instance_id = Guid.NewGuid(); // Comparison id in case entity has not been saved
#region enum ValidationBlock #region enum ValidationBlock

46
nsw/Source/bsmd.database/MessageCore.cs
View File

@ -6,13 +6,14 @@ using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using log4net;
namespace bsmd.database namespace bsmd.database
{ {
public class MessageCore : DatabaseEntity, IComparable, IEquatable<MessageCore> public class MessageCore : DatabaseEntity, IComparable, IEquatable<MessageCore>
{ {
#region Fields #region (backing) Fields
private Guid? previous; private Guid? previous;
private Guid? next; private Guid? next;
@ -21,6 +22,10 @@ namespace bsmd.database
private Guid? customerId; private Guid? customerId;
private int? wetris_zz_56_datensatz_id; private int? wetris_zz_56_datensatz_id;
private static ILog _log = LogManager.GetLogger("MessageCore");
private string _visitId;
private string _transitId;
#endregion #endregion
@ -87,11 +92,40 @@ namespace bsmd.database
[MaxLength(25)] [MaxLength(25)]
[ENI2Validation] [ENI2Validation]
public string VisitId { get; set; } public string VisitId
{
get { return this._visitId; }
set {
if(value.IsNullOrEmpty() && !this._visitId.IsNullOrEmpty())
{
System.Diagnostics.StackTrace st = new System.Diagnostics.StackTrace();
_log.WarnFormat("Someones resetting the VISIT Id at {0}", st.ToString());
}
else
{
this._visitId = value;
}
}
}
[MaxLength(25)] [MaxLength(25)]
[ENI2Validation] [ENI2Validation]
public string TransitId { get; set; } public string TransitId
{
get { return this._transitId; }
set
{
if (value.IsNullOrEmpty() && !this._transitId.IsNullOrEmpty())
{
System.Diagnostics.StackTrace st = new System.Diagnostics.StackTrace();
_log.WarnFormat("Someones resetting the TRANSIT Id at {0}", st.ToString());
}
else
{
this._transitId = value;
}
}
}
/// <summary> /// <summary>
/// Display Property für ENI-2 /// Display Property für ENI-2
@ -279,10 +313,8 @@ namespace bsmd.database
{ {
SqlCommand scmd = cmd as SqlCommand; SqlCommand scmd = cmd as SqlCommand;
if (this.VisitId != null) scmd.Parameters.AddWithValue("@P1", this.VisitId); scmd.Parameters.AddWithNullableValue("@P1", this.VisitId);
else scmd.Parameters.AddWithValue("@P1", DBNull.Value); scmd.Parameters.AddWithNullableValue("@P2", this.TransitId);
if (this.TransitId != null) scmd.Parameters.AddWithValue("@P2", this.TransitId);
else scmd.Parameters.AddWithValue("@P2", DBNull.Value);
if (this.IMO != null) scmd.Parameters.AddWithValue("@P3", this.IMO); if (this.IMO != null) scmd.Parameters.AddWithValue("@P3", this.IMO);
else scmd.Parameters.AddWithValue("@P3", DBNull.Value); else scmd.Parameters.AddWithValue("@P3", DBNull.Value);
if (this.ENI != null) scmd.Parameters.AddWithValue("@P4", this.ENI); if (this.ENI != null) scmd.Parameters.AddWithValue("@P4", this.ENI);

2
nsw/Source/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("3.8.3")] [assembly: AssemblyInformationalVersion("3.8.5")]
[assembly: AssemblyCopyright("Copyright © 2014-2017 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2017 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

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

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

105
nsw/Source/bsmd.database/ValidationCondition.cs
View File

@ -58,6 +58,12 @@ namespace bsmd.database
message = ""; message = "";
bool conditionResult = false; bool conditionResult = false;
// Aus der List an Messages muss (irgendwie :-) ein Dictionary aufgebaut werden, mit dem man aus den Namen der Fieldnames auf
// den Wert bzw. die Liste an Werten (bei Listenklassen) kommt. Das ValidationField "weiß" schon ob es eine Listenklasse ist.
// das hier muss noch früher rein damit es nicht für jede Regel erneut erzeugt wird
ValidationRule.PrepareNameLookupDict(core, messages);
try try
{ {
// Bedingungen validieren // Bedingungen validieren
@ -65,53 +71,17 @@ namespace bsmd.database
foreach (ValidationCondition condition in cGroup.Conditions) foreach (ValidationCondition condition in cGroup.Conditions)
{ {
object[] otherargs = null; object[] otherargs = null;
// den aktuellen Wert bestimmen
if(!ValidationRule.ValidationFieldDict.ContainsKey(condition.FieldName)) if(!ValidationRule.ValidationFieldDict.ContainsKey(condition.FieldName))
{ {
// TODO: Warnung absetzen
continue; continue;
} }
ValidationField vf = ValidationRule.ValidationFieldDict[condition.FieldName]; ValidationField aFailedField = null;
bool conditionValid = condition.Evaluate(core, messages, out aFailedField);
// Wert aus den Daten auslesen
// Dabei muss unterschieden werden: 1. skalarer Wert
// 2. Wert eines Listenelements
//
// als Rückgabe würde dann benötigt der Name des Property, die beteiligte Klasse und natürlich der Identifier (Index) wenn es eine Listenposition war
//if(vf.)
//object value = vf.PropertyInfo.GetValue()
switch(condition.ConditionOperator)
{
case ConditionOperatorEnum.EQUAL:
break;
case ConditionOperatorEnum.NOT_EQUAL:
break;
case ConditionOperatorEnum.LESS:
break;
case ConditionOperatorEnum.GREATER:
break;
case ConditionOperatorEnum.NULL:
break;
case ConditionOperatorEnum.NOT_NULL:
break;
}
if (!conditionValid && aFailedField != null)
failedFieldList.Add(aFailedField);
string errorMessage = cGroup.ErrorMessage; string errorMessage = cGroup.ErrorMessage;
@ -214,6 +184,54 @@ namespace bsmd.database
#endregion #endregion
private bool Evaluate(MessageCore core, List<Message> messages, out ValidationField failedField)
{
bool result = false;
failedField = null;
if(ValidationRule.ValidationFieldDict.ContainsKey(this.FieldName))
{
// den Wert aus der Nachrichtenklasse lesen
ValidationField aValField = ValidationRule.ValidationFieldDict[this.FieldName];
// object value = aValField.PropertyInfo.GetValue()
// check type and evaluate with operator (local prop)
switch (this.ConditionOperator)
{
case ConditionOperatorEnum.EQUAL:
break;
case ConditionOperatorEnum.NOT_EQUAL:
break;
case ConditionOperatorEnum.LESS:
break;
case ConditionOperatorEnum.GREATER:
break;
case ConditionOperatorEnum.NULL:
break;
case ConditionOperatorEnum.NOT_NULL:
break;
}
// if failed set failedField to aValField
// else set result to true
}
return result;
}
#region hier ist das alte audius Zeugs
/// <summary> /// <summary>
/// evaluate logical group operator /// evaluate logical group operator
/// </summary> /// </summary>
@ -306,6 +324,8 @@ namespace bsmd.database
#endregion #endregion
#endregion
#region ICloneable implementation #region ICloneable implementation
public object Clone() public object Clone()
@ -482,7 +502,6 @@ namespace bsmd.database
#endregion #endregion
#region struct KeyValuePairS #region struct KeyValuePairS
[Serializable] [Serializable]

35
nsw/Source/bsmd.database/ValidationRule.cs
View File

@ -14,6 +14,7 @@ namespace bsmd.database
{ {
private static List<ValidationField> _validationFields = null; private static List<ValidationField> _validationFields = null;
private static Dictionary<string, ValidationField> _validationFieldDict = null; private static Dictionary<string, ValidationField> _validationFieldDict = null;
private static Dictionary<string, object> _lookupDict = null;
public ValidationRule() public ValidationRule()
{ {
@ -141,6 +142,40 @@ namespace bsmd.database
} }
#endregion
#region public static methods
public static object GetValueFromData(ValidationField field, Dictionary<string,Message> dataDict)
{
// hier könnte auch ein List<object> rauskommen bzw. ein Dict<Identifier,object> mit Werten..
return null;
}
public static void PrepareNameLookupDict(MessageCore core, List<Message> messages)
{
if(_lookupDict == null) _lookupDict = new Dictionary<string, object>();
_lookupDict.Clear();
foreach(Message message in messages)
{
// Das kann nicht richtig funktionieren da ich hier eigentlich AGNT und nicht Message mappen will :-(
_lookupDict[message.MessageNotificationClassDisplay] = message;
Type t = message.GetType();
foreach(Type intfType in t.GetInterfaces())
{
if(intfType == typeof(ISublistContainer))
System.Diagnostics.Trace.WriteLine("ISublistContainer: " + message.MessageNotificationClassDisplay);
}
}
}
#endregion #endregion
#region overrides #region overrides

2
nsw/Source/bsmd.database/XtraSendLogic.cs
View File

@ -57,7 +57,7 @@ namespace bsmd.database
HAZ haz = message.Elements[0] as HAZ; HAZ haz = message.Elements[0] as HAZ;
if (haz != null) if (haz != null)
{ {
if (haz.NoDPGOnBoardOnArrival ?? false) if (!haz.HasPositions) // 15.11.17: "Im Grunde müsste nicht das Feld NoDPG der Auslöser für Suspend sein, sondern wenn keine Position in einer der Tabellen enthalten ist."
{ {
message.StatusInfo = "Meldeklasse nicht versandt: Kein Gefahrgut deklariert"; message.StatusInfo = "Meldeklasse nicht versandt: Kein Gefahrgut deklariert";
return false; return false;

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

@ -109,7 +109,7 @@ namespace bsmd.dbh
{ {
if (message == null) return false; if (message == null) return false;
RootType rootType = RootType.DATA; RootType rootType = message.Reset ? RootType.RESET : RootType.DATA;
if (message.ReportingParty == null) if (message.ReportingParty == null)
{ {
@ -165,7 +165,7 @@ namespace bsmd.dbh
DBHWebReference.RootVisit rootVisit = new DBHWebReference.RootVisit(); DBHWebReference.RootVisit rootVisit = new DBHWebReference.RootVisit();
rootType = DBHWebReference.RootType.VISIT; rootType = DBHWebReference.RootType.VISIT;
if (message.MessageCore.IMO != null) if (!message.MessageCore.IMO.IsNullOrEmpty())
{ {
rootVisit.ItemElementName = DBHWebReference.ItemChoiceType.IMONumber; rootVisit.ItemElementName = DBHWebReference.ItemChoiceType.IMONumber;
rootVisit.Item = message.MessageCore.IMO; rootVisit.Item = message.MessageCore.IMO;
@ -195,7 +195,7 @@ namespace bsmd.dbh
rootType = DBHWebReference.RootType.TRANSIT; rootType = DBHWebReference.RootType.TRANSIT;
itemChoiceType2 = DBHWebReference.ItemChoiceType2.Transit; itemChoiceType2 = DBHWebReference.ItemChoiceType2.Transit;
if (message.MessageCore.IMO != null) if (!message.MessageCore.IMO.IsNullOrEmpty())
{ {
rootTransit.ItemElementName = DBHWebReference.ItemChoiceType1.IMONumber; rootTransit.ItemElementName = DBHWebReference.ItemChoiceType1.IMONumber;
rootTransit.Item = message.MessageCore.IMO; rootTransit.Item = message.MessageCore.IMO;

3
nsw/Source/bsmd.dbh/Response.cs
View File

@ -82,7 +82,8 @@ namespace bsmd.dbh
{ {
case dbh.response.RootType.VISIT: case dbh.response.RootType.VISIT:
// neue VISIT - ID // neue VISIT - ID
aMessage.MessageCore.VisitId = VisitId; if(!VisitId.IsNullOrEmpty())
aMessage.MessageCore.VisitId = VisitId;
aMessage.MessageCore.BSMDStatusInternal = MessageCore.BSMDStatus.PREPARE; aMessage.MessageCore.BSMDStatusInternal = MessageCore.BSMDStatus.PREPARE;
aMessage.SendSuccess = true; aMessage.SendSuccess = true;
DBManager.Instance.Save(aMessage.MessageCore); DBManager.Instance.Save(aMessage.MessageCore);

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

@ -824,7 +824,7 @@ namespace bsmd.hisnord
} }
if (sec.CurrentShipSecurityLevel.HasValue) if (sec.CurrentShipSecurityLevel.HasValue)
_sec.CurrentShipSecurityLevel = (posint13type)sec.CurrentShipSecurityLevel.Value; _sec.CurrentShipSecurityLevel = (posint13type) (sec.CurrentShipSecurityLevel.Value - 1);
List<object> secItems = new List<object>(); List<object> secItems = new List<object>();
List<ItemsChoiceType4> secItemNames = new List<ItemsChoiceType4>(); List<ItemsChoiceType4> secItemNames = new List<ItemsChoiceType4>();
@ -1175,6 +1175,7 @@ namespace bsmd.hisnord
was_items.Add(was.LastWasteDisposalDate.Value); was_items.Add(was.LastWasteDisposalDate.Value);
was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate); was_item_names.Add(ItemsChoiceType6.LastWasteDisposalDate);
} }
for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++) for (int i = 0; i < was.WasteDisposalServiceProvider.Count; i++)
{ {
if (!was.WasteDisposalServiceProvider[i].WasteDisposalServiceProviderName.IsNullOrEmpty()) if (!was.WasteDisposalServiceProvider[i].WasteDisposalServiceProviderName.IsNullOrEmpty())
@ -1183,6 +1184,7 @@ namespace bsmd.hisnord
was_item_names.Add(ItemsChoiceType6.WasteDisposalServiceProviderName); was_item_names.Add(ItemsChoiceType6.WasteDisposalServiceProviderName);
} }
} }
if (was.WasteDisposalDelivery.HasValue) if (was.WasteDisposalDelivery.HasValue)
{ {
was_items.Add((wastedeliverytype)was.WasteDisposalDelivery); was_items.Add((wastedeliverytype)was.WasteDisposalDelivery);
@ -1233,12 +1235,12 @@ namespace bsmd.hisnord
{ {
was_items.Add(ytype.Y); was_items.Add(ytype.Y);
was_item_names.Add(ItemsChoiceType6.ConfirmationOfCorrectnessAndSufficiency); was_item_names.Add(ItemsChoiceType6.ConfirmationOfCorrectnessAndSufficiency);
} }
hn_was.Items = was_items.ToArray();
hn_was.ItemsElementName = was_item_names.ToArray();
} }
hn_was.Items = was_items.ToArray();
hn_was.ItemsElementName = was_item_names.ToArray();
items1.Add(hn_was); items1.Add(hn_was);
items1ChoiceType.Add(Items1ChoiceType.WAS); items1ChoiceType.Add(Items1ChoiceType.WAS);

40
nsw/Source/bsmd.hisnord/Response.cs
View File

@ -124,13 +124,19 @@ namespace bsmd.hisnord
if(nswResponse.NotificationClass == Message.NotificationClass.VISIT) if(nswResponse.NotificationClass == Message.NotificationClass.VISIT)
{ {
if ((nswResponse.Status == "ACCEPTED") && !nswResponse.VisitId.IsNullOrEmpty()) if ((nswResponse.Status == "ACCEPTED") && !nswResponse.VisitId.IsNullOrEmpty())
{
_log.InfoFormat("Setting Visit-Id to {0} Core {1}", nswResponse.VisitId, core.Id);
core.VisitId = nswResponse.VisitId; core.VisitId = nswResponse.VisitId;
}
} }
if(nswResponse.NotificationClass == Message.NotificationClass.TRANSIT) if(nswResponse.NotificationClass == Message.NotificationClass.TRANSIT)
{ {
if ((nswResponse.Status == "ACCEPTED") && !nswResponse.TransitId.IsNullOrEmpty()) if ((nswResponse.Status == "ACCEPTED") && !nswResponse.TransitId.IsNullOrEmpty())
{
_log.InfoFormat("Setting Transit-Id to {0} Core {1}", nswResponse.TransitId, core.Id);
core.TransitId = nswResponse.TransitId; core.TransitId = nswResponse.TransitId;
}
} }
if(nswResponse.NotificationClass == Message.NotificationClass.STO) if(nswResponse.NotificationClass == Message.NotificationClass.STO)
@ -145,11 +151,9 @@ namespace bsmd.hisnord
_log.InfoFormat("Cancel rejected for {0}", core.DisplayId); _log.InfoFormat("Cancel rejected for {0}", core.DisplayId);
} }
} }
core.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED;
DBManager.Instance.Save(core);
bool aMessageStillInSENTstate = false;
// now find the message that was meant.. // now find the message that was meant..
foreach (Message aMessage in messages) foreach (Message aMessage in messages)
{ {
@ -159,15 +163,7 @@ namespace bsmd.hisnord
{ {
aMessage.ReceivedAt = nswResponse.ReceiveAt; aMessage.ReceivedAt = nswResponse.ReceiveAt;
bool isAccepted = (nswResponse.Status == "ACCEPTED"); bool isAccepted = (nswResponse.Status == "ACCEPTED");
if (aMessage.Reset && nswResponse.IsReset && isAccepted)
{
_log.InfoFormat("Message {0} RESET confirmed", aMessage.Id);
aMessage.SendSuccess = false;
}
if (nswResponse.IsReset && !aMessage.Reset)
aMessage.Reset = nswResponse.IsReset;
if(isAccepted) if(isAccepted)
{ {
@ -186,6 +182,15 @@ namespace bsmd.hisnord
aMessage.InternalStatus = Message.BSMDStatus.ERROR; aMessage.InternalStatus = Message.BSMDStatus.ERROR;
aMessage.StatusInfo = "Errors reported"; aMessage.StatusInfo = "Errors reported";
} }
if (aMessage.Reset && nswResponse.IsReset && isAccepted)
{
_log.InfoFormat("Message {0} RESET confirmed", aMessage.Id);
aMessage.SendSuccess = false; // bestätigter RESET setzt den grünen Buppel wieder zurück
}
if (nswResponse.IsReset && !aMessage.Reset)
aMessage.Reset = nswResponse.IsReset;
} }
#region Error / Violation handling #region Error / Violation handling
@ -226,7 +231,16 @@ namespace bsmd.hisnord
#endregion #endregion
} }
if (aMessage.InternalStatus == Message.BSMDStatus.SENT)
aMessageStillInSENTstate = true;
} }
if(!aMessageStillInSENTstate)
core.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED;
DBManager.Instance.Save(core);
} }
else else
{ {