From ec9a113a1c1ea7ebcd29d73ca62068030c01e083 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 13 Aug 2017 16:26:58 +0000 Subject: [PATCH] HIS-Nord Versende / Empfangslogik Korrekturen --- .../BorderPoliceDetailControl.xaml | 4 +- .../PSC72hDetailControl.xaml.cs | 13 +- .../ShipDataDetailControl.xaml | 12 +- ENI-2/ENI2/ENI2/ENI2.csproj | 2 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 1 + Stundensheet.xlsx | Bin 32589 -> 32671 bytes nsw/HIS-NORD/Transmitter-Tool/client.log | 16 + nsw/Source/bsmd.dbh/Request.cs | 2 +- nsw/Source/bsmd.hisnord/NSWResponse.cs | 85 +- nsw/Source/bsmd.hisnord/Request.cs | 2645 +++++++++-------- 10 files changed, 1499 insertions(+), 1281 deletions(-) diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index abcf9a76..5a2d8167 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -56,7 +56,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs index c02f49e1..b5ce9ea7 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs @@ -46,7 +46,18 @@ namespace ENI2.DetailViewControls this.RegisterTextboxChange(this.textBoxPlannedOperations, Message.NotificationClass.PRE72H); this.RegisterTextboxChange(this.textBoxPlannedWorks, Message.NotificationClass.PRE72H); this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H); - this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H); + this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H); + this.checkBoxTanker.Checked += CheckBoxTanker_Checked; + this.checkBoxTanker.Unchecked += CheckBoxTanker_Checked; + } + + private void CheckBoxTanker_Checked(object sender, RoutedEventArgs e) + { + bool isTanker = this.checkBoxTanker.IsChecked ?? false; + this.doubleUpDownVolumeOfCargo.IsEnabled = isTanker; + this.comboBoxTankerHullConfig.IsEnabled = isTanker; + this.comboBoxConditionCargoBallastTanks.IsEnabled = isTanker; + this.textBoxNatureOfCargo.IsEnabled = isTanker; } public override void Initialize() diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml index 8198fd60..a7583f1d 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml @@ -49,21 +49,21 @@