From 003874be8fe164b24ce0f9d293386285ae45fcc5 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 17 Aug 2020 15:32:51 +0000 Subject: [PATCH] B2020-107: Search Save/Load (continued) --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 1 + PROMS/Volian.Controls.Library/DisplaySearch.cs | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 15eab6e0..b6be265e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2633,6 +2633,7 @@ namespace VEPROMS.CSLA.Library public int SearchAnnotationID { get { return _SearchAnnotationID; } + set { _SearchAnnotationID = value; } } internal string _SearchAnnotationText; public string SearchAnnotationText diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 06498b51..8dc60eac 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -2164,6 +2164,8 @@ namespace Volian.Controls.Library private void btnLoadSearchResults_Click(object sender, System.EventArgs e) { _fromLoad = true; + _LoadingList = true; + ofdSearchResults.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS"; if (ofdSearchResults.ShowDialog(this) == DialogResult.OK) { lbSrchResults.DataSource = null; @@ -2276,7 +2278,11 @@ namespace Volian.Controls.Library int itemID = int.Parse(nd.Attributes.GetNamedItem("id").InnerText); ItemInfo ii = ItemInfo.Get(itemID); // B2020-107: The following was needed to set the Step Path result type for annotations - if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; + if (ii.SearchAnnotationText == null && ii.ItemAnnotations != null) + { + ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; + ii.SearchAnnotationID = ii.ItemAnnotations[0].AnnotationID; + } SearchResults.AddItemInfo(ii); } lbSrchResults.DataSource = SearchResults; @@ -2305,6 +2311,7 @@ namespace Volian.Controls.Library } Cursor = Cursors.Default; } + _LoadingList = false; } private void btnSaveSearchResults_Click(object sender, System.EventArgs e) @@ -2315,6 +2322,7 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show(this, "Saving Referenced Objects and Transitions searches is under construction.", "Under Construction", MessageBoxButtons.OK); return; } + sfdSearchResults.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS"; if (sfdSearchResults.ShowDialog(this) == DialogResult.OK) { int k = sfdSearchResults.FilterIndex;