From 5f31148e4e112683966d8d2abe13db64775bd3fd Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 3 Jul 2022 19:49:16 +0000 Subject: [PATCH] --- AyaNovaQBI/Map.cs | 7 ++++--- AyaNovaQBI/MapSelectQBItem.cs | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/AyaNovaQBI/Map.cs b/AyaNovaQBI/Map.cs index 2cc0e3e..1fa3021 100644 --- a/AyaNovaQBI/Map.cs +++ b/AyaNovaQBI/Map.cs @@ -80,11 +80,12 @@ namespace AyaNovaQBI MapSelectQBItem s = new MapSelectQBItem(); s.QBItems = _qb; - string SelectedQBItem = string.Empty; + if (s.ShowDialog() == DialogResult.Cancel) return; - else - SelectedQBItem = s.SelectedQBItem.ToString(); + + var QBItemName = s.SelectedQBItemName; + var QBItemId = s.SelectedQBItemId; s.Dispose(); var selectedAyaNovaIds = new List(); foreach (DataGridViewRow r in gridAya.SelectedRows) diff --git a/AyaNovaQBI/MapSelectQBItem.cs b/AyaNovaQBI/MapSelectQBItem.cs index bf764a4..3c72e29 100644 --- a/AyaNovaQBI/MapSelectQBItem.cs +++ b/AyaNovaQBI/MapSelectQBItem.cs @@ -16,14 +16,15 @@ namespace AyaNovaQBI { InitializeComponent(); } - public string SelectedQBItem => cbQBItems.SelectedValue.ToString(); - // public string SelectedQBItemName => cbQBItems.selected.ToString(); + public ComboBox SelectCombo => cbQBItems; + public string SelectedQBItemName => ((DataRowView)cbQBItems.SelectedItem).Row[0].ToString(); + public string SelectedQBItemId => ((DataRowView)cbQBItems.SelectedItem).Row[1].ToString(); public DataTable QBItems { get; set; } private void MapSelectQBItem_Load(object sender, EventArgs e) { cbQBItems.DataSource = QBItems; - cbQBItems.DisplayMember = "FullName"; - //cbQBItems.ValueMember = "ID"; + cbQBItems.DisplayMember = "name"; + cbQBItems.ValueMember = "id"; btnCancel.Text = util.AyaTranslations["Cancel"]; btnOK.Text = util.AyaTranslations["OK"]; }