From eaa45d813acde853c0b0446a1762e2ed5365b23f Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 8 Mar 2020 14:15:28 +0000 Subject: [PATCH] PO Number Basteleien --- .../ENI2/ENI2/Controls/POListControl.xaml.cs | 17 ++++++++++++ .../PortNotificationDetailControl.xaml | 13 ++++++++- .../PortNotificationDetailControl.xaml.cs | 25 ++++++++++++++++++ .../ENI2/Properties/Resources.Designer.cs | 9 +++++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 3 +++ Stundensheet.xlsx | Bin 43841 -> 43895 bytes 6 files changed, 66 insertions(+), 1 deletion(-) diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs index 2e72b9b6..eaa6a8a8 100644 --- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs @@ -3,6 +3,7 @@ // using System; +using System.Collections; using System.Collections.Generic; using System.Windows; using System.Windows.Controls; @@ -115,6 +116,22 @@ namespace ENI2.Controls editedCore.IsDirty = true; } } + if(e.Column == gridColumnGroup) + { + var el = e.EditingElement as ComboBox; + DictionaryEntry selectedItem = (DictionaryEntry) el.SelectedItem; + MessageCore.CoreFlags coreFlag = (MessageCore.CoreFlags) Enum.Parse(typeof(MessageCore.CoreFlags), selectedItem.Value.ToString()); + MessageCore editedCore = this.filteredResult[e.Row.GetIndex()]; + // clear all first + editedCore.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV); + editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV); + editedCore.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV); + if (coreFlag != MessageCore.CoreFlags.NONE) + { + editedCore.SetFlag(true, coreFlag); + } + editedCore.IsDirty = true; + } } } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml index b72cc59f..defe4282 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml @@ -8,9 +8,18 @@ xmlns:util="clr-namespace:ENI2.Util" xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" + xmlns:col="clr-namespace:System.Collections;assembly=mscorlib" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" d:DesignHeight="800" d:DesignWidth="800"> + + + + + + + + @@ -48,6 +57,7 @@