From 3fc7bf4cea3843ecc6c3e35f0e5fc3286c35370d Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 23 Jul 2020 09:02:07 +0000 Subject: [PATCH] Lfd. kleinere Korrekturen (RM von Basti) --- ENI-2/ENI2/ENI2/App.config | 8 ++++---- ENI-2/ENI2/ENI2/Controls/POListControl.xaml | 4 ++-- .../ENI2/ENI2/Controls/POListControl.xaml.cs | 6 ++++-- .../PortNotificationDetailControl.xaml | 2 +- Stundensheet.xlsx | Bin 44554 -> 44658 bytes nsw/Source/bsmd.POService/POService.cs | 2 +- .../bsmd.database/PortOfCallLast30Days.cs | 1 + .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index fbb9572e..bf37c193 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - - http://heupferd/bsmd.LockingService/LockingService.svc + http://192.168.2.24/LockingService/LockingService.svc + - - Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml index 5b80b8ab..07e87b8e 100644 --- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml +++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml @@ -13,7 +13,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs index 6cb09105..dced08f9 100644 --- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs @@ -28,7 +28,7 @@ namespace ENI2.Controls private readonly string[] _comboBoxEntries = { "All", - "Maersk BHV", + "Maersk BRV/WHV", "SeaGo BHV", "SeaGo WHV" }; @@ -203,7 +203,7 @@ namespace ENI2.Controls // suche auslösen this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict); // alle anderen Häfen weg - this.searchResult.RemoveAll(item => (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV"))); + this.searchResult.RemoveAll(item => !item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV") && !item.PoC.Equals("DEWVN")); // rückwärts iterieren um nach ETA und ATA zu filtern if (this.searchResult.Count > 0) @@ -221,6 +221,8 @@ namespace ENI2.Controls } } } + + searchResult.Sort((x, y) => DateTime.Compare(x.ATA ?? DateTime.MaxValue, y.ATA ?? DateTime.MaxValue)); this.dataGridPOCores.SelectedItem = null; this.filteredResult.AddRange(searchResult); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml index defe4282..d0959f01 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml @@ -67,7 +67,7 @@