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

Korrekturen nach Test Christin I

Browse Source
This commit is contained in:
Daniel Schick 2023-01-04 15:36:48 +01:00
parent 09faf3ad81
commit d5d0045adb
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ENI2/DetailRootControl.xaml.cs
View File

@ -893,11 +893,15 @@ namespace ENI2
#endregion #endregion
#region 4.1.23 no CREW effects warning for DE #region 4.1.23 no CREW effects warning for DE
if (crewaMessage != null)
{ {
MessageViolation mv = crewaMessage.ViolationList.Find((x) => x.PropertyName.Equals("Effects") && (x.ViolationCode == (int)ValidationCode.TRUNCATE)); MessageViolation mv = crewaMessage.ViolationList.Find((x) => x.PropertyName.Equals("Effects") && (x.ViolationCode == (int)ValidationCode.TRUNCATE));
if ((mv != null) && !Core.IsDK) if ((mv != null) && !Core.IsDK)
crewaMessage.ViolationList.Remove(mv); crewaMessage.ViolationList.Remove(mv);
}
if(crewdMessage != null)
{
MessageViolation mvd = crewdMessage.ViolationList.Find((x) => x.PropertyName.Equals("Effects") && (x.ViolationCode == (int)ValidationCode.TRUNCATE)); MessageViolation mvd = crewdMessage.ViolationList.Find((x) => x.PropertyName.Equals("Effects") && (x.ViolationCode == (int)ValidationCode.TRUNCATE));
if ((mvd != null) && !Core.IsDK) if ((mvd != null) && !Core.IsDK)
crewdMessage.ViolationList.Remove(mvd); crewdMessage.ViolationList.Remove(mvd);

12
ENI2/EditControls/VisitIdDialog.xaml.cs
View File

@ -25,12 +25,12 @@ namespace ENI2.EditControls
} }
private void VisitIdDialog_Loaded(object sender, RoutedEventArgs e) private void VisitIdDialog_Loaded(object sender, RoutedEventArgs e)
{ {
this.OKClicked += VisitIdDialog_OKClicked; this.OKClicked += VisitIdDialog_OKClicked;
List<KeyValuePair<bsmd.database.Message.NSWProvider, string>> comboDataSource = new List<KeyValuePair<bsmd.database.Message.NSWProvider, string>>() List<KeyValuePair<Message.NSWProvider, string>> comboDataSource = new List<KeyValuePair<Message.NSWProvider, string>>()
{ {
new KeyValuePair<bsmd.database.Message.NSWProvider, string>( Message.NSWProvider.DUDR, "HIS-Nord" ), new KeyValuePair<Message.NSWProvider, string>( Message.NSWProvider.DUDR, "HIS-Nord" ),
new KeyValuePair<bsmd.database.Message.NSWProvider, string>( Message.NSWProvider.DBH, "DBH" ), new KeyValuePair<Message.NSWProvider, string>( Message.NSWProvider.DBH, "DBH" ),
new KeyValuePair<Message.NSWProvider, string>(Message.NSWProvider.DBH_MAERSK, "DBH / Maersk") new KeyValuePair<Message.NSWProvider, string>(Message.NSWProvider.DBH_MAERSK, "DBH / Maersk")
}; };
@ -118,8 +118,8 @@ namespace ENI2.EditControls
isComplete &= this.datePickerETA.SelectedDate.HasValue; // ETA isComplete &= this.datePickerETA.SelectedDate.HasValue; // ETA
bool imo_OR_eni = ((doubleUpDownIMO.Value.HasValue) && (doubleUpDownIMO.Value >= 1000000) && (doubleUpDownIMO.Value <= 9999999)) || bool imo_OR_eni = (doubleUpDownIMO.Value.HasValue && (doubleUpDownIMO.Value >= 1000000) && (doubleUpDownIMO.Value <= 9999999)) ||
((doubleUpDownENI.Value.HasValue) && (doubleUpDownENI.Value >= 100000) && (doubleUpDownENI.Value <= 99999999)); (doubleUpDownENI.Value.HasValue && (doubleUpDownENI.Value >= 100000) && (doubleUpDownENI.Value <= 99999999));
isComplete &= imo_OR_eni; isComplete &= imo_OR_eni;

4
ENI2/MainWindow.xaml.cs
View File

@ -410,7 +410,7 @@ namespace ENI2
MessageCore newCore = new MessageCore(); MessageCore newCore = new MessageCore();
VisitIdDialog visitIdDialog = new VisitIdDialog(); VisitIdDialog visitIdDialog = new VisitIdDialog();
visitIdDialog.Core = newCore; visitIdDialog.Core = newCore;
visitIdDialog.Closed += (senderDialog, closeArgs) => visitIdDialog.Closed += (senderDialog, closeArgs) =>
{ {
VisitIdDialog closedDialog = senderDialog as VisitIdDialog; VisitIdDialog closedDialog = senderDialog as VisitIdDialog;
@ -435,7 +435,7 @@ namespace ENI2
bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity); bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity);
// watchdog registrieren // watchdog registrieren
this._dbWatchDog.Register(closedDialog.Core); this._dbWatchDog.Register(closedDialog.Core);
// Wartedialog anzeigen // Wartedialog anzeigen
ShowIdDialog showIdDialog = new ShowIdDialog(closedDialog.Core); ShowIdDialog showIdDialog = new ShowIdDialog(closedDialog.Core);

2
bsmd.database/Message.cs
View File

@ -173,7 +173,7 @@ namespace bsmd.database
public enum NSWProvider public enum NSWProvider
{ {
[Description("Unspecified")] [Description("Unspecified")]
UNDEFINED, UNDEFINED,
DBH, DBH,

2
bsmd.database/MessageCore.cs
View File

@ -212,8 +212,6 @@ namespace bsmd.database
{ {
get get
{ {
if ((int)_initialHIS > 3) // pre 7.0 declarations may have "Test-" HIS set
return _initialHIS - 3;
return _initialHIS; return _initialHIS;
} }
set set