Merge pull request 'Development' (#803) from Development into master

Merging changes from dev into master after successful testing.

.gitignore

@@ -401,4 +401,5 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
-*AssemblyInfo.cs
+*AssemblyInfo.cs
+/PROMS/Baseline/Baseline.sln

PROMS/Baseline/frmBaseline.cs

@@ -503,7 +503,7 @@ namespace Baseline
 			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
 			// sort the list of file list
 			Array.Sort((string[])fileList);
-			return fileList.First(); // the PDF file that we what should be top of the list then.
+			return fileList.FirstOrDefault(); // the PDF file that we what should be top of the list then.
 		}
 
 		/// <summary>

PROMS/Formats/Formats.csproj

@@ -179,6 +179,7 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
+    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -5547,6 +5547,12 @@ ELSE PRINT 'Function: ve_GetItemDerivedApplicability Error on Creation'
 GO
 
 -------
+
+-- =============================================
+-- Author:		Matthew Schill
+-- Modify date: 07/14/2026
+-- Description:	Reworked ve_GetParentItem for Performance improvement
+-- =============================================
 /****** Object:  UserDefinedFunction [dbo].[vefn_GetParentItem]    Script Date: 03/28/2012 17:58:48 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[ve_GetParentItem]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
     DROP FUNCTION [ve_GetParentItem];
@@ -5555,35 +5561,46 @@ GO
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
        Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
-CREATE FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
+CREATE OR ALTER FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
 WITH EXECUTE AS OWNER
 AS
 BEGIN
 DECLARE @ParentID int;
-WITH Itemz([ItemID],[IsFound]) as
+WITH Itemz([ItemID]) as
 (
-select ii.itemid,0 from items ii where ii.itemid = @ItemID
+select ii.itemid from items ii WITH (NOLOCK) where ii.itemid = @ItemID
 union all
-select ii.previousid,0 from items ii
+select ii.previousid from items ii WITH (NOLOCK)
 join itemz zz on ii.itemid = zz.itemid
 where ii.previousid is not null
-and zz.isfound = 0
-union all
-select ii.itemid,1
-from parts pp
-join itemz zz on pp.itemid = zz.itemid
-join items ii on ii.contentid = pp.contentid
 )
-select top 1 @ParentID = itemid from itemz
-where isfound = 1 OPTION (MAXRECURSION 10000)
+select top 1 @ParentID = ii.itemid 
+from itemz
+inner join parts pp WITH (NOLOCK) on pp.itemid = itemz.itemid
+inner join items ii WITH (NOLOCK) on ii.contentid = pp.contentid
+OPTION (MAXRECURSION 10000)
+
 RETURN @ParentID
 END
+
 GO
 
 IF (@@Error = 0) PRINT 'ScalerFunction [vefn_GetParentItem] Succeeded'
 ELSE PRINT 'ScalerFunction [vefn_GetParentItem] Error on Creation'
 go
 
+IF EXISTS (SELECT * FROM dbo.sysIndexes WHERE name like 'IX_PartsItemID')
+	DROP INDEX [IX_PartsItemID] ON [dbo].[tblParts];
+GO
+
+CREATE NONCLUSTERED INDEX IX_PartsItemID
+ON [dbo].[tblParts] ([ItemID] ASC)
+INCLUDE([ContentID],[DeleteStatus],[FromType]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+
+PRINT 'Added IX_PartsItemID Index.  Speeds up Getting Parent Items'
+GO
+
 /****** Object:  UserDefinedFunction [dbo].[vefn_CanTransitionBeCreated]    Script Date: 10/14/2012 02:03:30 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_CanTransitionBeCreated]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
 	DROP FUNCTION [vefn_CanTransitionBeCreated];
@@ -25051,8 +25068,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '06/29/2026 7:00 AM'
-	set @RevDescription = 'Update to Grid Deletion Audits'
+	set @RevDate = '07/16/2026 8:30 AM'
+	set @RevDescription = 'Reworked ve_GetParentItem for Performance improvement'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2148,7 +2148,7 @@ namespace VEPROMS
 						//C2019-036 View Only mode work with Checked Out Procedures
 						// View Only Mode is no longer checked out, so no longer has an OwnerID
 						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -3578,6 +3578,7 @@ namespace VEPROMS
 			{
 				if (parameter.StartsWith("/P="))
 				{
+					BaseLnSettings.blBaseLine = true;
 					MSWordToPDF.Automatic = true;
 					PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter
 					string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
@@ -3623,7 +3624,7 @@ namespace VEPROMS
 						}
 						ranAuto = true;
 					}
-
+					BaseLnSettings.blBaseLine = false;
 					if (ranAuto)
 					{
 						this.Close();

PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs

@@ -1258,7 +1258,7 @@ namespace VEPROMS.CSLA.Library
 
 				int lastStart = sel == null ? 0 : sel.Start;
 
-				while (sel != null)
+                while (sel != null)
 				{
 					if (!string.IsNullOrEmpty(sel.Text))
 					{
@@ -1438,7 +1438,7 @@ namespace VEPROMS.CSLA.Library
 
 					lastStart = sel.Start;
 
-					sel = FindRO();
+                    sel = FindRO();
 
 					if (sel != null && !string.IsNullOrEmpty(sel.Text) && sel.Start == lastStart)
 					{
@@ -2124,22 +2124,22 @@ namespace VEPROMS.CSLA.Library
 			bool executeResult = false;
 			LBSelection sel = null;
 
-			while (!executeResult)
+            while (!executeResult)
 			{
 				sel = MyApp.Selection;
 				LBFind find = sel.Find;
 				find.ClearFormatting();
 
-				// Search string format - this is MSWord wildcard format
-				// If you do a search in MSWord, make sure wildcard box is checked and then press the
-				// Special button to see the definitions of the various wildcards
-				// [<] - Less-Than Character
-				// [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
-				// - Dash
-				// [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
-				//		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
-				// [>] - Greater-Than Character
-				find.Text = "[<][!<> -]@-[!<>]@[>]";
+                // Search string format - this is MSWord wildcard format
+                // If you do a search in MSWord, make sure wildcard box is checked and then press the
+                // Special button to see the definitions of the various wildcards
+                // [<] - Less-Than Character
+                // [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
+                // - Dash            
+                // [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
+                //		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
+                // [>] - Greater-Than Character
+                find.Text = "[<][!<> -]@-[!<>]@[>]";
 				find.Wrap = LBWdFindWrap.wdFindContinue;
 				find.MatchCase = false;
 				find.MatchWholeWord = false;
@@ -2159,14 +2159,18 @@ namespace VEPROMS.CSLA.Library
 				{
 					tryagain = false;
 					executeResult = find.Execute();
-					// B2022-053 if the found text does not begin with a "<" and end with a ">", then
-					//           move past that text and try the Word Find function again.
-					// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
-					// B2022-098: [JPR] ROs not being resolved in Word Sections
+                    // B2022-053 if the found text does not begin with a "<" and end with a ">", then
+                    //           move past that text and try the Word Find function again.
+                    // B2022-088: [JPR] Find Doc Ro button not working in Word Sections
+                    // B2022-098: [JPR] ROs not being resolved in Word Sections
+                    // B2026-070: When there is a  less-then sign (<) followed by a numeric value in a Word attachment (inside of a table), PROMS thinks the user put in an RO token will generate an RO not found error in the following table row who's text contains <U-Name>.
 					if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
-					{
-						sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
-						tryagain = true;
+                    {
+                        int location = sel.Start + sel.Text.Length - 1; //do not do this inline - this needs captured before WholeStory
+
+                        sel.WholeStory();
+                        sel.MoveStart(LBWdUnits.wdCharacter, location);
+                        tryagain = true;
 					}
 				} while (tryagain);
 
@@ -2191,7 +2195,7 @@ namespace VEPROMS.CSLA.Library
 					sel.MoveStart(LBWdUnits.wdCharacter, 1);
 					executeResult = false;
 				}
-			}
+            }
 
 			if (executeResult) return sel;
 

PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs

@@ -262,8 +262,10 @@ namespace VEPROMS.CSLA.Library
                     if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
                     {
                         dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
-                        SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                     }
+					// B2026-066 moved this out of if statement above
+					// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
+                    SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                 }
             }
 
@@ -326,7 +328,9 @@ namespace VEPROMS.CSLA.Library
 		//           all of the calls aways set the flags to not update the RO values
 		public static ROFst UpdateRoFst(RODbInfo rdi, DocVersion docver, ROFstInfo origROFst, ROFstInfoProgressBarRefresh myProgressBarRefresh)
 		{
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
+            ROWorkingDraftAsk.ClearWorkingDrafts();
+
+            if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
 
 			int origFSTid = origROFst.ROFstID;
 

PROMS/VEPROMS.CSLA.Library/Session/ROWorkingDraftAsk.cs

@@ -0,0 +1,18 @@
+
+using System.Collections.Generic;
+
+namespace VEPROMS.CSLA.Library
+{
+    public static class ROWorkingDraftAsk
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Keeping Collections Not ReadOnly")]
+        private static List<int> WorkingDrafts = new List<int>();
+
+        public static void AddWorkingDrafts(int wd) => WorkingDrafts.Add(wd);
+
+        public static void ClearWorkingDrafts() => WorkingDrafts.Clear();
+
+        public static bool ContainsWorkingDraft(int wd) => WorkingDrafts.Contains(wd);
+
+    }
+}

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -396,6 +396,7 @@
     <Compile Include="Minimal\UserReports.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session\ROWorkingDraftAsk.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />
     <Compile Include="VEObjects\VETreeNode.cs" />
   </ItemGroup>

PROMS/Volian.Base.Library/BaseLnSettings.cs

@@ -0,0 +1,8 @@
+
+namespace Volian.Base.Library
+{
+	public static class BaseLnSettings
+	{
+		public static bool blBaseLine { get; set; } = false;
+	}
+}

PROMS/Volian.Base.Library/Volian.Base.Library.csproj

@@ -90,6 +90,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BaseLnSettings.cs" />
     <Compile Include="BigNum.cs" />
     <Compile Include="ByteArrayCompare.cs" />
     <Compile Include="DebugPrint.cs" />

PROMS/Volian.Controls.Library/DSOTabPanel.cs

@@ -613,7 +613,15 @@ namespace Volian.Controls.Library
             _In_DSOTabPanel_Enter = false;
             _MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem;
             // B2018-070 Position the text cursor - Activate MS Word Panel
-            _MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
+            try
+            {
+                _MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
+            }
+            catch 
+            {
+                //B2026-067 - Do nothing if cannot Position cursor
+            }
+
         }
         #endregion
         #region Public Methods

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -643,16 +643,15 @@ namespace Volian.Controls.Library
                 if (_docVersionInfo != null && fstid != -1 && fstid != MyROFSTLookup.RofstID)
                 {
                     string message = string.Empty;
-                    if (_progressBar?.Text != "Cannot check-out Working Draft" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
+                    if (_progressBar?.Text != "RO Check Paused - Other Users In Set" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
                     {
-                        FlexibleMessageBox.Show(this, message, "Working Draft Has Items Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                        FinalProgressBarMessage = "Cannot check-out Working Draft";
+                        FinalProgressBarMessage = "RO Check Paused - Other Users In Set";
                     }
                     else if (!MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
                     {
                         //do nothing - is still checked out
                     }
-                    else if (changedDocVersion && !askedAboutchangedDocVersion)
+                    else if (changedDocVersion && !askedAboutchangedDocVersion && !ROWorkingDraftAsk.ContainsWorkingDraft(_docVersionInfo.VersionID))
                     {
                             if (MessageBox.Show($"There exists a newer ROFST for this RO database that was loaded for other sets.\r\n\r\nDo you want to update this set's ROs to be consistent/use the latest loaded ROFST?", "Load ROs", MessageBoxButtons.YesNo) == DialogResult.Yes)
                             {
@@ -671,10 +670,13 @@ namespace Volian.Controls.Library
                                 updatedROs = true;
 
                                 askedAboutchangedDocVersion = false;
+                                ROWorkingDraftAsk.ClearWorkingDrafts();
                             }
                             else
                             {
                                 askedAboutchangedDocVersion = true;
+                                if (!ROWorkingDraftAsk.ContainsWorkingDraft(_docVersionInfo.VersionID)) 
+                                    ROWorkingDraftAsk.AddWorkingDrafts(_docVersionInfo.VersionID);
                             }
 
                     }
@@ -716,7 +718,7 @@ namespace Volian.Controls.Library
                 if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
 
                 //doc version would have updated (if needed) so reset flag
-                if (_progressBar?.Text != "Cannot check-out Working Draft")
+                if (_progressBar?.Text != "RO Check Paused - Other Users In Set")
                 {
                     changedDocVersion = false;
                 }

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -15,6 +15,8 @@ using System.Linq;
 
 namespace Volian.Controls.Library
 {
+#pragma warning disable IDE1006 // Naming Styles
+#pragma warning disable IDE0044 // Add readonly modifier
     public partial class DisplaySearch : UserControl
     {
         #region Public Events/Handlers
@@ -24,14 +26,12 @@ namespace Volian.Controls.Library
 
 		private void OnPrintRequest(DisplaySearchEventArgs args)
 		{
-			if (PrintRequest != null)
-				PrintRequest(this, args);
+            PrintRequest?.Invoke(this, args);
         }
 
 		private void OnSearchComplete(DisplaySearchEventArgs args)
 		{
-			if (SearchComplete != null)
-				SearchComplete(this, args);
+            SearchComplete?.Invoke(this, args);
         }
 
 		#endregion
@@ -218,8 +218,10 @@ namespace Volian.Controls.Library
 			{
 				if (_TmrRefresh == null)
 				{
-					_TmrRefresh = new Timer();
-					_TmrRefresh.Interval = 1000;
+                    _TmrRefresh = new Timer
+                    {
+                        Interval = 1000
+                    };
                     _TmrRefresh.Tick += _TmrRefresh_Tick;
 				}
 				return _TmrRefresh;
@@ -324,7 +326,6 @@ namespace Volian.Controls.Library
 			{
 				if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2])
 				{    // RO Search
-					ROFSTLookup.rochild[] chld = null;
                     ROFSTLookup.rochild ch;
 					if (cmboTreeROs.SelectedNode != null)
 					{
@@ -336,18 +337,16 @@ namespace Volian.Controls.Library
 						}
 						else
 						{
-							if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rodbi)
+                            if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rodbi db)
                             {
-								ROFSTLookup.rodbi db = (ROFSTLookup.rodbi)cmboTreeROs.SelectedNode.Tag;
-                                return _MyRODbID.ToString() + ":" + string.Format("{0}", db.dbiID.ToString("X4"));
+                                return $"{_MyRODbID.ToString()}:{string.Format("{0}", db.dbiID.ToString("X4"))}";
                             }
-							else if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rochild)
+                            else if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rochild roch)
                             {
-								ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
-								chld = ch.children;
+                                ROFSTLookup.rochild[] chld = roch.children;
                                 // build a list of ROs to search
                                 // B2022-118: remove the ending comma otherwise query will fail
-                                string strRtnStr = _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
+                                string strRtnStr = $"{_MyRODbID.ToString()}:{GetROsToSearch(chld)}";
                                 if (strRtnStr.EndsWith(","))
                                     strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
                                 return strRtnStr;
@@ -391,7 +390,6 @@ namespace Volian.Controls.Library
 			cmbResultsStyle.Enabled = false;
 			tabSearchTypes.SelectedTabChanged += new TabStrip.SelectedTabChangedEventHandler(tabSearchTypes_SelectedTabChanged);
 			// Don't do this here.  If you do then the /DB parameter has not yet been set, which will cause the database menu to be displayed
-			//SetupContextMenu(); // so that the symbol list is available without selecting a procedure set or procedure
 		}
 
 		#endregion
@@ -447,20 +445,6 @@ namespace Volian.Controls.Library
 				}
 				btnSearch.Enabled = (cbxTranCategory.Items.Count > 0); // B2017-038 disable search button if no format selected
 																	   //enable-disable doc version nodes based on version type if selected
-				if (cbxTranVersion.SelectedIndex > -1)
-				{
-					if (dicExpandedFolderNodes.Count > 0)
-					{
-						foreach (DevComponents.AdvTree.Node n in dicExpandedFolderNodes.Keys)
-						{
-							DocVersionInfo dvi = (DocVersionInfo)n.Tag;
-							if (cbxTranVersion.Tag.ToString().Contains(dvi.VersionID.ToString()))
-								n.Enabled = true;
-							else
-								n.Enabled = false;
-						}
-					}
-				}
 				//setup transition format versions
 				this.Cursor = Cursors.WaitCursor;
 				if (myFormatVersionList == null)
@@ -475,6 +459,10 @@ namespace Volian.Controls.Library
 							versionID: group.Max(x => x.VersionID)
 						)).OrderBy(y => y.Title).ToList();
 
+                    //B2026-055 – Transition Search Improvements
+                    //Added an All option to allow resetting of the enabling/disabling tree options
+                    cbxTranVersion.Items.Add(new FormatVersion("All", -1, -1));
+
                     foreach (FormatVersion fv in fvlst)
 					{
 						cbxTranVersion.Items.Add(fv);
@@ -504,32 +492,6 @@ namespace Volian.Controls.Library
 
 		public void cbxTranFormat_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			#region 1st cut
-			//if (cbxTranFormat.SelectedItem.ToString() == "All")
-			//{
-			//  cbxTranCategory.Items.Clear();
-			//  cbxTranCategory.Items.Add("All");
-			//  cbxTranCategory.Items.Add("Internal");
-			//  cbxTranCategory.Items.Add("External");
-			//  cbxTranCategory.Items.Add("Outside");
-			//  cbxTranCategory.SelectedIndex = 0;
-			//}
-			//else if (cbxTranFormat.SelectedItem.ToString().Contains("{Proc"))
-			//{
-			//  cbxTranCategory.Items.Clear();
-			//  cbxTranCategory.Items.Add("All");
-			//  cbxTranCategory.Items.Add("External");
-			//  cbxTranCategory.Items.Add("Outside");
-			//  cbxTranCategory.SelectedIndex = 0;
-			//}
-			//else
-			//{
-			//  cbxTranCategory.Items.Clear();
-			//  cbxTranCategory.Items.Add("Internal");
-			//  cbxTranCategory.SelectedIndex = 0;
-			//}
-			#endregion
-
 			#region 2nd cut
 			if (cbxTranFormat.SelectedItem.ToString().Contains("{Proc"))
 			{
@@ -564,31 +526,16 @@ namespace Volian.Controls.Library
 
 			cbxTranVersion.Tag = versionList;
 			cbxTranFormatFillIn(versionList);
-			if (dicExpandedFolderNodes.Count > 0)
-			{
-				foreach (DevComponents.AdvTree.Node n in dicExpandedFolderNodes.Keys)
-				{
-					FolderInfo fi = (FolderInfo)n.Tag;
-					// if this folder has a docversion, use its id:
-					string svid = null;
-					if (fi.FolderDocVersionCount > 0)
-						svid = fi.FolderDocVersions[0].VersionID.ToString();
-					if (cbxTranVersion.Tag.ToString().Contains(svid))
-						n.Enabled = true;
-					else
-						n.Enabled = false;
-				}
-			}
 
-			List<DevComponents.AdvTree.Node> uncheckNodes = new List<Node>();
+			List<DevComponents.AdvTree.Node> uncheckNodes = new List<DevComponents.AdvTree.Node>();
 			foreach (DevComponents.AdvTree.Node n in dicSelectedFolderNodes.Keys)
 			{
-				FolderInfo fi = (FolderInfo)n.Tag;          // this was crashing in old version of code
+				FolderInfo fi = n.Tag as FolderInfo;          // this was crashing in old version of code
 															// if this folder has a docversion, use its id:
 				string svid = null;
-				if (fi.FolderDocVersionCount > 0)
+				if (fi?.FolderDocVersionCount > 0)
 					svid = fi.FolderDocVersions[0].VersionID.ToString();
-				if (svid != null && !versionList.Contains(svid))
+                if (svid != null && !string.IsNullOrEmpty(versionList) && !versionList.Split(',').Contains(svid))
 					uncheckNodes.Add(n);
 				else
 					n.Enabled = true;
@@ -614,13 +561,17 @@ namespace Volian.Controls.Library
 					dicSelectedFolderNodes.Clear();
 				}
 			}
+
+            //B2026-055 – Transition Search Improvements
+			//Update Enabling/Disabling of Tree Elements
+            TraverseTree(advTreeProcSets.Nodes[0], cbxTranVersion.Tag?.ToString().Split(','));
+
             this.Cursor = Cursors.Default;
 		}
 
 		// C2020-033: Update the search panel for Incoming transitions.  This gets called from the tree view & the ribbon
 		public void UpdateSearchIncTransResults()
 		{
-			//IncTransSelectedCount = 0;
 			tabSearchTypes.SelectedTab = tabSearchTypes.Tabs[4];
 
 			lbSrchResultsIncTrans.DataSource = null;
@@ -697,13 +648,6 @@ namespace Volian.Controls.Library
 				DevComponents.AdvTree.Node newnode;
 				advTreeStepTypes.Nodes.Clear();
 				// Add a dummy node for searching Word Sections (MS Word sections)
-				//newnode = new DevComponents.AdvTree.Node();
-				//newnode.Text = "Word Sections";
-				//newnode.Selectable = true;
-				//newnode.CheckBoxAlignment = DevComponents.AdvTree.eCellPartAlignment.NearCenter;
-				//newnode.CheckBoxStyle = eCheckBoxStyle.CheckBox;
-				//newnode.CheckBoxThreeState = false;
-				//newnode.CheckBoxVisible = true;
 				newnode = NewAdvTreeNode("WORD Sections", true, true);      // C2020-010: Change Accessory Sections to Word Sections
 				wordSectionTreeNode = newnode;
 				// C2021-028: RNO Only search, disable Word section tree node
@@ -721,16 +665,6 @@ namespace Volian.Controls.Library
 					StepData sd = sdl[sdr.Index]; // get the step type record
 					string parentName = sd.ParentType; // this gets the parent of the this step/substep type
 
-					//Console.WriteLine("{0} {1} - {2}", parentName,sd.Type,sdr.Name);
-					//newnode = new DevComponents.AdvTree.Node();
-					//newnode.Text = sdr.Name;
-					//newnode.Name = sd.Type; // this needed for the FindNodeByName() function
-					//newnode.Tag = sd;
-					//newnode.Selectable = true;
-					//newnode.CheckBoxAlignment = DevComponents.AdvTree.eCellPartAlignment.NearCenter;
-					//newnode.CheckBoxStyle = eCheckBoxStyle.CheckBox;
-					//newnode.CheckBoxThreeState = false;
-					//newnode.CheckBoxVisible = true;
 					if (parentName.Equals("Base"))
 					{
 						newnode = NewAdvTreeNode(sdr.Name, true, true);
@@ -824,8 +758,7 @@ namespace Volian.Controls.Library
 		//C2023-010: Select all child nodes when a subtype is selected
 		private void pnode_selected(object sender, EventArgs e)
 		{
-			DevComponents.AdvTree.Node pnode = sender as DevComponents.AdvTree.Node;
-			if (pnode != null && pnode.HasChildNodes)
+            if (sender is DevComponents.AdvTree.Node pnode && pnode.HasChildNodes)
             {
                 CheckTreeNodeChildren(pnode.Nodes);
             }
@@ -840,18 +773,21 @@ namespace Volian.Controls.Library
 			int fiCount = fi.ChildFolderCount;
 			advTreeProcSets.Nodes.Clear();
 			lstCheckedDocVersions.Clear();
-			topnode = new DevComponents.AdvTree.Node();
-			topnode.Text = "Available Procedure Sets";
-			topnode.Tag = fi;
-			topnode.DataKey = fi.FolderID;
+            topnode = new DevComponents.AdvTree.Node
+            {
+                Text = "Available Procedure Sets",
+                Tag = fi,
+                DataKey = fi.FolderID
+            };
             advTreeProcSets.Nodes.Add(topnode);
-			//advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert);
 
             //B2023-076: Adding option to select all procedure sets
-			DevComponents.AdvTree.Node selectAllNode = new Node();
-			selectAllNode.Text = SelectAllProcedureSetsText;
-			selectAllNode.Tag = SelectAllProcedureSetsText;
-			selectAllNode.CheckBoxVisible = true;
+            DevComponents.AdvTree.Node selectAllNode = new Node
+            {
+                Text = SelectAllProcedureSetsText,
+                Tag = SelectAllProcedureSetsText,
+                CheckBoxVisible = true
+            };
             selectAllNode.NodeClick += new EventHandler(AllProcedureSets_clicked);
 			topnode.Nodes.Add(selectAllNode);
 
@@ -859,18 +795,22 @@ namespace Volian.Controls.Library
 			{
 				foreach (FolderInfo fic in fi.SortedChildFolders)
 				{
-					DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
-					newnode.Text = fic.ToString();
-					newnode.Tag = fic;
-					newnode.DataKey = fi.FolderID;
+                    DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node
+                    {
+                        Text = fic.ToString(),
+                        Tag = fic,
+                        DataKey = fi.FolderID
+                    };
                     AddCheckBox(true, newnode);//C2016-045 Allow Folders to be selected.
 					cntnd++;
 					if (fic.ChildFolderCount > 0 || fic.FolderDocVersionCount > 0)      // allow for '+' for tree expansion
 					{
 						if (fic.ChildFolderCount > 0)           // B2017-176: Do not display the Working Draft node (don't create dummy for expander)
 						{
-							DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node();
-							tnt.Text = DummyNodeText;
+                            DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node
+                            {
+                                Text = DummyNodeText
+                            };
                             newnode.Nodes.Add(tnt);
 						}
 						topnode.Nodes.Add(newnode);
@@ -879,10 +819,12 @@ namespace Volian.Controls.Library
 			}
 			else
 			{
-				DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
-				newnode.Text = fi.ToString();
-				newnode.Tag = fi;
-				newnode.DataKey = fi.FolderID;
+                DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node
+                {
+                    Text = fi.ToString(),
+                    Tag = fi,
+                    DataKey = fi.FolderID
+                };
                 AddCheckBox(true, newnode);//C2016-045 Allow Folders to be selected.
 				topnode.Nodes.Add(newnode);
 				lstCheckedDocVersions.Add(Mydocversion);
@@ -893,8 +835,10 @@ namespace Volian.Controls.Library
 			{
 				cntnd++;
 				fi = Mydocversion.MyFolder;
-				topnode = new DevComponents.AdvTree.Node();
-				topnode.Text = fi.ToString();
+                topnode = new DevComponents.AdvTree.Node
+                {
+                    Text = fi.ToString()
+                };
                 advTreeProcSets.Nodes.Add(topnode);
 				topnode.Tag = fi;
 				topnode.DataKey = fi.FolderID;
@@ -929,43 +873,48 @@ namespace Volian.Controls.Library
 				{
 					foreach (FolderInfo fic in fi.SortedChildFolders)
 					{
-						DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node();
-						newnode.Text = fic.ToString();
-						newnode.Tag = fic;
-						newnode.DataKey = fic.FolderID;
+                        DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node
+                        {
+                            Text = fic.ToString(),
+                            Tag = fic,
+                            DataKey = fic.FolderID
+                        };
                         par.Nodes.Add(newnode);
 						AddCheckBox(true, newnode);//C2016-045 Allow Folders to be selected.
 						newnode.Enabled = true;
+
                         if (fic.ChildFolderCount > 0)       // B2017-176: Only expand if folder has folders (not working draft nodes)
 						{
-							DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node();
-							tnt.Text = DummyNodeText;
+                            DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node
+                            {
+                                Text = DummyNodeText
+                            };
                             newnode.Nodes.Add(tnt);
                             // B2017-176: Only expand if folder has folders (not working draft nodes): the following was moved from the code
                             //  that would check if this should be enabled if seraching for transition types.  The transition controls
                             //  had a list of associated docversions, so needed to get the docversion in the folder:
-							if (tabSearchTypes.SelectedTab == tabTranSearch)
+                            if (tabSearchTypes.SelectedTab == tabTranSearch && !dicSelectedFolderNodes.ContainsKey(newnode))
+                                dicSelectedFolderNodes.Add(newnode, false);
+                        }
+
+                        if (tabSearchTypes.SelectedTab == tabTranSearch)
                         {
-								if (!dicSelectedFolderNodes.ContainsKey(newnode)) dicSelectedFolderNodes.Add(newnode, false);
-								// get the docversion for this folder, if it has one and determine whether it is enabled for transitions:
-								string svid = null;
-								if (fic.FolderDocVersionCount > 0)
-									svid = fic.FolderDocVersions[0].VersionID.ToString();
-								newnode.Enabled = svid != null && cbxTranVersion.Tag != null ? cbxTranVersion.Tag.ToString().Contains(svid) : false;
+                            //B2026-055 – Transition Search Improvements
+                            //Update Enabling/Disabling of Tree Elements
+                            TraverseTree(advTreeProcSets.Nodes[0], cbxTranVersion.Tag?.ToString().Split(','));
                         }
                     }
 				}
 			}
 		}
-		}
 
 		public void AdvTree_AfterExpandorCollapse(object sender, AdvTreeNodeEventArgs e)
 		{
 			Node bottomNode = BottomTreeNode(cmboTreeROs.AdvTree.Nodes);
-			Node lastNode = cmboTreeROs.AdvTree.Nodes[cmboTreeROs.AdvTree.Nodes.Count - 1];
+            _ = cmboTreeROs.AdvTree.Nodes[cmboTreeROs.AdvTree.Nodes.Count - 1]; //LastNode
 
 			int top = cmboTreeROs.AdvTree.Nodes[0].Bounds.Top;
-			int bottom = bottomNode.Bounds.Bottom + 5;
+			int bottom;
 			int hScrollBarHeight = cmboTreeROs.AdvTree.HScrollBar != null ? cmboTreeROs.AdvTree.HScrollBar.Height : 0;
 			bottom = bottomNode.Bounds.Bottom + 5;
 			cmboTreeROs.AdvTree.Size = new Size(cmboTreeROs.AdvTree.Size.Width, Math.Min(525, bottom - top + hScrollBarHeight));
@@ -974,12 +923,9 @@ namespace Volian.Controls.Library
 			{
 				int yLookFor = (bottom - cmboTreeROs.AdvTree.Size.Height) + 2 * hScrollBarHeight;
 				Node topNode = FindTreeNodeAt(cmboTreeROs.AdvTree.Nodes, yLookFor);
-				if (topNode != null)
-				{
-					topNode.EnsureVisible();
+				topNode?.EnsureVisible();
 			}
 		}
-		}
 
 		#endregion
 
@@ -988,8 +934,10 @@ namespace Volian.Controls.Library
 		public void SetupAnnotationSearch(AnnotationDetails annotationDetails, DisplayTabControl tc)
 		{
 			_AnnotationDetails = annotationDetails;
-			List<AnnotationTypeSearch> annoTypes = new List<AnnotationTypeSearch>();
-			annoTypes.Add(new AnnotationTypeSearch("All Annotations", string.Empty));
+			List<AnnotationTypeSearch> annoTypes = new List<AnnotationTypeSearch>
+            {
+                new AnnotationTypeSearch("All Annotations", string.Empty)
+            };
 			AnnotationTypeInfoList annoList = AnnotationTypeInfoList.Get();
 			foreach (AnnotationTypeInfo ati in annoList)
 				annoTypes.Add(new AnnotationTypeSearch(ati.Name, ati.TypeID.ToString()));
@@ -1056,14 +1004,15 @@ namespace Volian.Controls.Library
 
 				foreach (Symbol sym in sl)
 				{
-					DevComponents.DotNetBar.ButtonItem btnCM = new DevComponents.DotNetBar.ButtonItem();
-
-					btnCM.Text = string.Format("{0}", (char)sym.Unicode);
+                    DevComponents.DotNetBar.ButtonItem btnCM = new DevComponents.DotNetBar.ButtonItem
+                    {
+                        Text = string.Format("{0}", (char)sym.Unicode),
                         // to name button use unicode rather than desc, desc may have spaces or odd chars
-					btnCM.Name = "btnCM" + sym.Unicode.ToString();
-					btnCM.Tooltip = sym.Desc;
-					btnCM.Tag = string.Format(@"{0}", sym.Unicode);
-					btnCM.FontBold = true;
+                        Name = $"btnCM{sym.Unicode.ToString()}",
+                        Tooltip = sym.Desc,
+                        Tag = string.Format(@"{0}", sym.Unicode),
+                        FontBold = true
+                    };
                     btnCM.Click += new System.EventHandler(btnSym_Click);
 					galSymbols.SubItems.Add(btnCM);
 				}
@@ -1112,9 +1061,11 @@ namespace Volian.Controls.Library
 		private DevComponents.AdvTree.Node NewAdvTreeNode(string nodetext, bool selectable, bool chxbxvisable)
 		{
 			DevComponents.AdvTree.Node newnode;
-			newnode = new DevComponents.AdvTree.Node();
-			newnode.Text = nodetext;
-			newnode.Selectable = selectable;
+            newnode = new DevComponents.AdvTree.Node
+            {
+                Text = nodetext,
+                Selectable = selectable
+            };
             AddCheckBox(chxbxvisable, newnode);//C2016-045 Allow Folders to be selected.
 			return newnode;
 		}
@@ -1161,7 +1112,7 @@ namespace Volian.Controls.Library
 			// folder properties dialog
 			bool allowNonAdmin = IncTranCvtPerm();
 			List<int> itmsEditable = new List<int>();   // return this list
-			int listCount = 0;
+            int listCount;
             if (all)  // Check all in list
 			{
 				listCount = _SearchResults.Count;
@@ -1185,14 +1136,13 @@ namespace Volian.Controls.Library
 			// not all can be converted to text. If count of itmsEditable & lbis are different some cannot be edited.
 			if (itmsEditable.Count == 0)
 			{
-				FlexibleMessageBox.Show("You do not have permission to edit any of the procedures, sections, and/or steps" + (all ? "." : " that are selected."),
+				FlexibleMessageBox.Show($"You do not have permission to edit any of the procedures, sections, and/or steps{(all ? "." : " that are selected.")}",
 						"Convert Transition to Text", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				return null;
 			}
 			else if (itmsEditable.Count != listCount)
 			{
-				DialogResult ans = FlexibleMessageBox.Show("You only have permission to edit some of the procedures, sections, and/or steps that are selected.procedures, sections, and/or steps" + (all ? "." : " that are selected.") +
-					"\r\n\r\n Should the conversion of the transitions to text continue?",
+				DialogResult ans = FlexibleMessageBox.Show($"You only have permission to edit some of the procedures, sections, and/or steps that are selected.procedures, sections, and/or steps{(all ? "." : " that are selected.")}\r\n\r\n Should the conversion of the transitions to text continue?",
 							"Convert Transition to Text", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 				if (ans == DialogResult.No) return null;
 			}
@@ -1213,7 +1163,7 @@ namespace Volian.Controls.Library
 		private void btnTranCvtSelToTxt_Click(object sender, EventArgs e)
 		{
             // First see if all selected can be converted, i.e. user has permission to edit 
-			List<ListBoxItem> lbis = lbSrchResultsIncTrans.CheckedItems;
+            _ = lbSrchResultsIncTrans.CheckedItems;
             List<int> itmsEditable = TranCvtCheckPermission(false);
 			if (itmsEditable == null || itmsEditable.Count == 0) return;
 			TranCvtToTxt(itmsEditable);
@@ -1446,8 +1396,10 @@ namespace Volian.Controls.Library
 						{
 							ROFSTLookup.rodbi db = dbs[i];
 
-							DevComponents.AdvTree.Node tn = new DevComponents.AdvTree.Node(db.dbiTitle);
-							tn.Tag = db;
+                            DevComponents.AdvTree.Node tn = new DevComponents.AdvTree.Node(db.dbiTitle)
+                            {
+                                Tag = db
+                            };
                             cmboTreeROs.Nodes.Add(tn);
 
 							AddDummyGroup(db, tn);
@@ -1500,17 +1452,14 @@ namespace Volian.Controls.Library
 			if (tn.HasChildNodes && tn.Nodes[0].Text != DummyNodeText) return;  // already loaded.
 			if (tn.HasChildNodes && tn.Nodes[0].Text == DummyNodeText) tn.Nodes[0].Remove();
 
-			ROFSTLookup.rochild[] chld = null;
-
-			if (tn.Tag is ROFSTLookup.rodbi)
+            ROFSTLookup.rochild[] chld;
+            if (tn.Tag is ROFSTLookup.rodbi db)
             {
-				ROFSTLookup.rodbi db = (ROFSTLookup.rodbi)tn.Tag;
                 MyROFSTLookup.LoadChildren(ref db);
                 chld = db.children;
             }
-			else if (tn.Tag is ROFSTLookup.rochild)
+            else if (tn.Tag is ROFSTLookup.rochild ch)
             {
-				ROFSTLookup.rochild ch = (ROFSTLookup.rochild)tn.Tag;
                 MyROFSTLookup.LoadChildren(ref ch);
                 chld = ch.children;
             }
@@ -1529,8 +1478,6 @@ namespace Volian.Controls.Library
 				for (int i = 0; i < chld.Length; i++)
 				{
 					ProgressBar_SetValue(i);
-					DevComponents.AdvTree.Node tmp = null;
-
                     ROFSTLookup.rochild roc = chld[i];
 
                     // if this is a group, i.e. type 0, add a dummy node
@@ -1554,10 +1501,13 @@ namespace Volian.Controls.Library
 					}
 
 
+                    Node tmp;
                     if (roc.value == null)
                     {
-						tmp = new DevComponents.AdvTree.Node(roc.title);
-						tmp.Tag = roc;
+                        tmp = new DevComponents.AdvTree.Node(roc.title)
+                        {
+                            Tag = roc
+                        };
 
                         int index = FindIndex(tn.Nodes, tmp.Text);
                         tn.Nodes.Insert(index, tmp);
@@ -1567,8 +1517,10 @@ namespace Volian.Controls.Library
                     }
                     else
                     {
-						tmp = new DevComponents.AdvTree.Node(roc.title);
-						tmp.Tag = roc;
+                        tmp = new DevComponents.AdvTree.Node(roc.title)
+                        {
+                            Tag = roc
+                        };
 
                         if (roc.roid.Length == 16)
                         {
@@ -1608,9 +1560,8 @@ namespace Volian.Controls.Library
 			{
 				cbxFndUnLnkROVals.Enabled = false;
 			}
-			else if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rochild)
+			else if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rochild ro)
             {
-				ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
                 // B2022-026 RO Memory Reduction code - check children length
                 cbxFndUnLnkROVals.Enabled = (ro.children == null || ro.children.Length <= 0);
             }
@@ -1632,12 +1583,7 @@ namespace Volian.Controls.Library
 			bool keeplooking = true;
 			//build a stack (bread crumb trail) of where is procedure set came from within the tree.
 			Stack<string> crumbs = new Stack<string>();
-			//crumbs.Push(Mydocversion.Name); // ex: "working draft"
-			//crumbs.Push(Mydocversion.MyFolder.Name); // ex: "Emergency Procedures"
-			//crumbs.Push(Mydocversion.MyFolder.MyParent.Name); // ex: "STPNOC-South Texas"
-			//crumbs.Push(advTreeProcSets.Nodes[0].Text); //top node of my tree
 
-			//crumbs.Push(Mydocversion.Name); // ex: "working draft"
 			crumbs.Push(Mydocversion.MyFolder.Name); // ex: "Emergency Procedures"
 			FolderInfo fi = Mydocversion.MyFolder.MyParent;
 			while (fi != null)
@@ -1822,13 +1768,11 @@ namespace Volian.Controls.Library
 		//	item to be clicked and to turn on/off the btnTranCvtSelToTxt button for converting selected to test.
 		private void lbSrchResultsIncTrans_ItemClicked(object sender, EventArgs e)
 		{
-			ListBoxItem lbi = sender as ListBoxItem;
-			if (lbi != null)
+            if (sender is ListBoxItem lbi)
             {
                 ItemBindingData ibd = lbi.Tag as ItemBindingData;
-				ItemInfo ii = ibd.DataItem as ItemInfo;
                 bool allowNonAdmin = IncTranCvtPerm();
-				if (lbi.CheckState == CheckState.Checked && ii != null)
+                if (lbi.CheckState == CheckState.Checked && ibd.DataItem is ItemInfo ii)
                 {
                     if (!allowNonAdmin && !UserInfo.CanEdit(MyUserInfo, ii.MyDocVersion))
                     {
@@ -2039,11 +1983,8 @@ namespace Volian.Controls.Library
 				bool includeSpecialChars = (TextSearchString != @"\?"); // true;
 																		// Build list of selected types that were searched
 				string typstr = null;
-				foreach (string s in lstCheckedStepTypesStr) typstr = typstr == null ? s : typstr + ", " + s;
-				TypesSelected = "Filtered By:  " + ((typstr != null) ? typstr : "All Step Types");
-				//TypesSelected = "Step Types Searched: " + ((typstr != null) ? typstr : "all step types");
-				//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "all step types");
-				//TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types";
+				foreach (string s in lstCheckedStepTypesStr) typstr = typstr == null ? s : $"{typstr}, {s}";
+				TypesSelected = $"Filtered By:  {typstr ?? "All Step Types"}";
 				string unitPrefix = string.Empty;
 				if (Mydocversion != null)
 					unitPrefix = Mydocversion.DocVersionConfig.Unit_ProcedureNumber;
@@ -2063,11 +2004,8 @@ namespace Volian.Controls.Library
 						}
 						else
 						{
-							//string typstr = null;
-							//foreach (string s in lstCheckedStepTypesStr) typstr = typstr==null?s:typstr + ", " + s;
-							//ReportTitle = "Search for Selected Types"; //"Proms - Search by Type: " + typstr;
 							ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr;
-							TypesSelected = "Filtered By:  " + typstr;
+							TypesSelected = $"Filtered By:  {typstr}";
 							SearchString = null;
 								// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
 							SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
@@ -2076,47 +2014,18 @@ namespace Volian.Controls.Library
 					}
 					else
 					{
-						//if (textSearchString.Equals(string.Empty))
-						//{
-						//  MessageBox.Show("Please enter some search text, then click the Search button", "No Search Text");
-						//  cbxTextSearchText.Focus();
-						//}
-						//else
-						//{
-						//ReportTitle = string.Format("Proms - {0} Search for '{1}'", cbxBooleanTxtSrch.Checked ? "Boolean" : "Text", TextSearchString);
 						ReportTitle = string.Format("Search for '{0}'", TextSearchString);
 
-						// C2020-009: Search - Allow search 'By Word'. 
 						string byWordPrefix = string.Empty;
 						string byWordSuffix = string.Empty;
 						if (cbxByWord.Checked)
 						{
-							// Generate a prefix & suffix to be used in the sql query around the search string.
-							// If the search string starts (prefix)/ends(suffix) with a number, then use an expression that 
-							// does not allow the preceding/following text to have a number, '.', letter or other rtf 
-							// commands.  If the search string starts/ends with a letter, then use an expression that does not
-							// find the preceding/following text that is text, i.e. a letter.
-							if (Regex.IsMatch(TextSearchString, @"^[\d\.]"))        // starts with a number or '.' decimal pt
-							{
-								byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
-							}
-							else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter
-							{
-								byWordPrefix = @"[^a-zA-Z]";
-							}
-							if (Regex.IsMatch(TextSearchString, @"[\d\.]$"))        // ends with a number or decimal
-							{
-								byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
-							}
-							else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter
-							{
-								byWordSuffix = @"[^a-zA-Z]";
-							}
+							byWordPrefix = GetByWordSettings(TextSearchString, true);
+							byWordSuffix = GetByWordSettings(TextSearchString, false);
 						}
-						SearchString = TextSearchString;
-						//TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types";
-						//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
-							// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+
+							SearchString = TextSearchString;
+
 						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
 
 						cmbResultsStyleIndex = 3;  // display step text in results
@@ -2129,7 +2038,6 @@ namespace Volian.Controls.Library
 				{
 					LastSearchWasAnnotations = true; // B2019-119 only refresh annotation search results if an annotation search was done
 					SearchString = null;
-					//ReportTitle = string.Format("Proms - Annotation Search for '{0}'", cbxTextSearchAnnotation.Text);
 					if (cbxTextSearchAnnotation.Text == null || cbxTextSearchAnnotation.Text == string.Empty)
 					{
 						ReportTitle = string.Format("Find {0}{1}", cbxAnnoTypes.Text, (cbxAnnoTypes.SelectedIndex > 0) ? " Annotations" : string.Empty);
@@ -2138,14 +2046,8 @@ namespace Volian.Controls.Library
 					{
 						ReportTitle = string.Format("Search {0}{1} For '{2}'", cbxAnnoTypes.Text, (cbxAnnoTypes.SelectedIndex > 0) ? " Annotations" : string.Empty, cbxTextSearchAnnotation.Text);
 					}
-					//ReportTitle = string.Format("Search Annotations for '{0}'", cbxTextSearchAnnotation.Text);
-					//string srchStr = ConvertSpecialChars(cbxTextSearchAnnotation.Text);//cbxTextSearchAnnotation.Text;
-					//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
-
-					//SearchResults = ItemInfoList.GetListFromAnnotationSearch(dviSearchList, typeSearchList, textSearchString, srchStr, cbxCaseSensitiveAnnoText.Checked);
 
 					SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked, unitPrefix);
-					//UpdateAnnotationSearchResults();
 					cmbResultsStyleIndex = 2;  // display annotation text in results
 											   // C2019-001: Search in RNO steps only
 					if (cbxRnoOnlyAnnot.Checked) GetInRNOResults();
@@ -2153,14 +2055,12 @@ namespace Volian.Controls.Library
 				else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2]) // RO Search
 				{
 					SearchString = null;
-					//ReportTitle = "Proms - Referenced Object Search";
 					ReportTitle = string.Format("Search For Referenced Object:\n{0}", cmboTreeROs.Text);
-					//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
 
 					if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
 					{
-						// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
-						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
+
+						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, GetByWordSettings(ROSearchList, true), GetByWordSettings(ROSearchList, false));
 						cmbResultsStyleIndex = 3;  // display step text in results
 					}
 					else
@@ -2175,22 +2075,37 @@ namespace Volian.Controls.Library
 				{
 					ReportTitle = string.Format("Search For Transitions: Transition Type: {0}, Transition Category: {1}", cbxTranFormat.SelectedItem, cbxTranCategory.SelectedItem);
 					string docVersionList = string.Empty;
+					bool bypassSearch = false;
 					if (lstCheckedDocVersions.Count == 0)
 						docVersionList = cbxTranVersion.Tag.ToString();
 					else
 					{
-						string sep = string.Empty;
-						foreach (DocVersionInfo dvi in lstCheckedDocVersions)
+                        //B2026-055 – Transition Search Improvements
+                        //Changed matching to take Filtered Formats into account if both tree
+						//Items selected and Format dropdown filtered
+                        if (string.IsNullOrEmpty(cbxTranVersion.Tag?.ToString()))
 						{
-							docVersionList += sep + dvi.VersionID.ToString();
-							sep = ",";
+                            docVersionList = string.Join(",", lstCheckedDocVersions.Select(y => y.VersionID.ToString()));
+                        }
+						else
+						{ 
+							var fromatversionslst = cbxTranVersion.Tag.ToString().Split(',').Select(int.Parse);
+							var selectedversionlst = lstCheckedDocVersions.Select(y => y.VersionID);
+							docVersionList = string.Join(",", fromatversionslst.Intersect(selectedversionlst));
+
+                            if (string.IsNullOrEmpty(docVersionList))
+                            {
+                                bypassSearch = true;
+                                FlexibleMessageBox.Show("No Matches Found.", "Search");
                             }
                         }
+                    }
 					// B2018-134 to search specifically for Outside Transitions, set docVeronList to empty string so that all procedure sets are considered
-					if (cbxTranCategory.SelectedItem.ToString() == "Outside")
+					if (cbxTranCategory.SelectedItem?.ToString() == "Outside")
 						docVersionList = string.Empty;
 					// added TypeSearchList for bug fix B2015-055
-					SearchResults = ItemInfoList.GetListFromTransitionSearch(docVersionList, cbxTranFormat.SelectedIndex - 1, cbxTranCategory.SelectedItem.ToString() == "All" ? string.Empty : cbxTranCategory.SelectedItem.ToString(), TypeSearchList);
+					if (cbxTranFormat.SelectedIndex == -1) cbxTranFormatFillIn(docVersionList);
+                    if (!bypassSearch) SearchResults = ItemInfoList.GetListFromTransitionSearch(docVersionList, cbxTranFormat.SelectedIndex - 1, cbxTranCategory.SelectedItem?.ToString() == "All" ? string.Empty : (cbxTranCategory.SelectedItem?.ToString() ?? string.Empty), TypeSearchList);
 					cmbResultsStyleIndex = 3;  // display step text in results
 											   // C2019-001: Search in RNO steps only
 					if (cbxRnoOnlyTrans.Checked) GetInRNOResults();
@@ -2247,18 +2162,60 @@ namespace Volian.Controls.Library
 				string tmpmsg = (cbxBooleanTxtSrch.Checked && ex.Message.Contains("Syntax error") && ex.Message.Contains("full-text search")) ?
 					"Place \"\" around words that you are searching for, so that parser can better understand what you are trying to find" :
 					ex.Message;
-				FlexibleMessageBox.Show(tmpmsg, "Search Error: " + ex.GetType().Name);
+				FlexibleMessageBox.Show(tmpmsg, $"Search Error: {ex.GetType().Name}");
 			}
 			finally
 			{
 				Cursor = savcursor;
 			}
-			//Console.WriteLine("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds);
 			OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
-			//if (VlnSettings.DebugMode)
-			//    MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds));
 		}
+		private string GetByWordSettings(string ss, bool checkstart)
+		{
 
+			// C2020-009: Search - Allow search 'By Word'. 
+
+			//	// Generate a prefix & suffix to be used in the sql query around the search string.
+			//	// If the search string starts (prefix)/ends(suffix) with a number, then use an expression that 
+			//	// does not allow the preceding/following text to have a number, '.', letter or other rtf 
+			//	// commands.  If the search string starts/ends with a letter, then use an expression that does not
+			//	// find the preceding/following text that is text, i.e. a letter.
+
+			if (ss.Length > 0)
+			{
+				//checking start
+				if (checkstart)
+				{
+					// starts with a number or '.' decimal pt
+					if (char.IsNumber(ss, 0) || ss[0] == '.')
+					{
+						return @"[^0-9a-zA-Z.vbpi:\\-]";
+					}
+					// starts with a letter
+					else if (char.IsLetter(ss, 0))
+					{
+						return @"[^a-zA-Z]";
+					}
+				}
+				//checking end
+				else
+				{
+					// ends with a number or '.' decimal pt
+					if (char.IsNumber(ss, ss.Length - 1) || ss[ss.Length - 1] == '.')
+					{
+						return @"[^0-9a-zA-Z.vbpi:\\-]";
+					}
+					// ends with a letter
+					else if (char.IsLetter(ss, ss.Length - 1))
+					{
+						return @"[^a-zA-Z]";
+					}
+				}
+			}
+
+			//default
+			return string.Empty;
+		}
 		private void ClearResults()     // B2021-103 if no results when RNO only, clear results list.  (moved from btnSearch_Click)
 		{
 			if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
@@ -2317,7 +2274,7 @@ namespace Volian.Controls.Library
 					if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText;
 				}
 
-				if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = "None - [" + ii.DisplayText + "]";
+				if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = $"None - [{ii.DisplayText}]";
 				else
 				{
 					hasAnnot = true;
@@ -2467,7 +2424,7 @@ namespace Volian.Controls.Library
 			//C2025-005 Find Step Elements
 			//Need to refresh the Doc List and Available Step Types
 			//if All Procedure Sets was selected
-			if (n.Tag == SelectAllProcedureSetsText)
+			if (n.Tag is string txt && txt == SelectAllProcedureSetsText)
 			{
 				if (n.Checked)
 				{
@@ -2518,7 +2475,6 @@ namespace Volian.Controls.Library
 		{
 			if (tn.Checked)
 			{
-				//tn.Style = DevComponents.AdvTree.NodeStyles.Apple;      // sets green background on selected folder(s)
 				//B2023-112:  Don't crash if on top 'All' node (did not have associated folder)
 				FolderInfo fi = tn.Tag as FolderInfo;
 				// if this folder has a docversion, use its id:
@@ -2565,8 +2521,10 @@ namespace Volian.Controls.Library
 			lstCheckedStepTypesStr.Clear();
 			foreach (string str in strs)
 			{
-				Node newnode = new DevComponents.AdvTree.Node();
-				newnode.Text = str;
+                Node newnode = new DevComponents.AdvTree.Node
+                {
+                    Text = str
+                };
                 advTreeStepTypes.Nodes.Add(newnode);
 			}
 			buildStepTypePannelTitle();
@@ -2655,17 +2613,24 @@ namespace Volian.Controls.Library
 		private void cbxTranFormatFillIn(string vid)
 		{
 			vid = vid.IndexOf(",") < 0 ? vid : vid.Substring(0, cbxTranVersion.Tag.ToString().IndexOf(","));
+            //B2026-055 – Transition Search Improvements
+            //Change the order of items happening
+			//previous order was causing an error when clicked downdownlist to
+			//show all items and then didn't select an item in the list
+            cbxTranFormat.Items.Clear();
+            cbxTranFormat.Items.Add("All");
 
+			if (!string.IsNullOrEmpty(vid))
+			{
                 DocVersionInfo dvi = DocVersionInfo.Get(int.Parse(vid));
                 TransTypeList ttl = dvi.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList;
 
-			cbxTranFormat.Items.Clear();
-			cbxTranFormat.Items.Add("All");
 
                 for (int i = 0; i < ttl.MaxIndex; i++)
                 {
                     cbxTranFormat.Items.Add(new TransItem(ttl[i].TransMenu.Replace("?.", string.Empty), ttl[i].TransFormat.Replace("?.", string.Empty)));
                 }
+            }
 
 			cbxTranFormat.SelectedIndex = 0;
 			cbxTranCategory.Items.Clear();
@@ -2715,9 +2680,9 @@ namespace Volian.Controls.Library
 
 			if (advTreeStepTypes.Nodes.Count == 1 && n.Checked)
 			{
-				if (n.Tag is DocVersionInfo) // Only set MyDocVersion if it is a DocVersion
+				if (n.Tag is DocVersionInfo info) // Only set MyDocVersion if it is a DocVersion
 				{
-					Mydocversion = (DocVersionInfo)n.Tag;
+					Mydocversion = info;
 					StartAdvTreeStepTypesFillIn();// B2016-258 Hang after selecting a procedure if the Step Type panel is open on the search panel
 				}
 			}
@@ -2742,8 +2707,6 @@ namespace Volian.Controls.Library
 
 			if (n.Checked)
 			{
-				//n.Style = DevComponents.AdvTree.NodeStyles.Apple;		// B2023-112: coloring of proc set tree nodes was not working correctly
-
 				if (sd == null)
 				{
 					//C2023-010: Since the tag is null for Word Sections and HLS types, we need to determine which one has been selected.  Word sections we need
@@ -2872,7 +2835,7 @@ namespace Volian.Controls.Library
 
 				xpStepTypes.TitleStyle.BackColor1.Color = saveXpStepTypeTitleColor;
 			}
-			else //lstCheckedStepTypes.Count > 0
+			else
 			{
 				// show how many selected whether panel is expanded or not
 				xpStepTypes.TitleText = string.Format("{0} Step Element{1} Selected", lstCheckedStepTypes.Count, (lstCheckedStepTypes.Count > 1) ? "s" : string.Empty); // B2018-132 changed second {0} to {1}
@@ -2944,7 +2907,6 @@ namespace Volian.Controls.Library
 		private bool OnlyWordSectTypeSel()
 		{
 			// B2021-100: Enable/disable the RNO Only checkbox & WORD Sections tree node in Step Elements to Search.
-			//	lstCheckedStepTypes[x] = 0 for Word sections:
 			if (lstCheckedStepTypes != null && lstCheckedStepTypes.Count == 1 && lstCheckedStepTypes[0] == 0)
 				return true;
 
@@ -3143,11 +3105,6 @@ namespace Volian.Controls.Library
 				lbSrchResults.DataSource = null;
 				lbSrchResults.Items.Clear();
 				toolTip1.SetToolTip(lbSrchResults, null);
-				string unitPrefix = string.Empty;
-				if (Mydocversion != null)
-					unitPrefix = Mydocversion.DocVersionConfig.Unit_ProcedureNumber;
-				if (unitPrefix.EndsWith("#"))
-					unitPrefix = unitPrefix.Replace("#", string.Empty);
 				Cursor = Cursors.WaitCursor;
 
 				try   // B2021-045: don't crash if xml file cannot be loaded.
@@ -3177,7 +3134,7 @@ namespace Volian.Controls.Library
 							Node tnode = advTreeProcSets.FindNodeByDataKey(folderID);
 							if (tnode != null) tnode.Checked = true;
 						}
-						Mydocversion = tmpdvi == null ? fromLoadFiledvi : tmpdvi;
+						Mydocversion = tmpdvi ?? fromLoadFiledvi;
 					}
 
 					AdvTreeStepTypesFillIn();
@@ -3200,10 +3157,10 @@ namespace Volian.Controls.Library
 						}
 
 						string typstr = null;
-						foreach (string s in lstCheckedStepTypesStr) typstr = typstr == null ? s : typstr + ", " + s;
-						TypesSelected = "Filtered By:  " + ((typstr != null) ? typstr : "All Step Types");
+						foreach (string s in lstCheckedStepTypesStr) typstr = typstr == null ? s : $"{typstr}, {s}";
+						TypesSelected = $"Filtered By:  {typstr ?? "All Step Types"}";
 						ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr;
-						TypesSelected = "Filtered By:  " + typstr;
+						TypesSelected = $"Filtered By:  {typstr}";
 						advTreeStepTypes.RefreshItems();
 						buildStepTypePannelTitle();
 					}
@@ -3296,7 +3253,7 @@ namespace Volian.Controls.Library
 							}
 					}
 				}
-				catch (Exception ex)
+				catch (Exception)
                 {
 					FlexibleMessageBox.Show("An error occurred while reading the xml file.\r\n\r\nThis can happen when the file selected for the Load is not saved\r\n" +
 						"from a PROMS Search or if some of the steps no longer exist.", "Search Load Failed", MessageBoxButtons.OK);
@@ -3476,6 +3433,46 @@ namespace Volian.Controls.Library
 			}
         }
 
+        //B2026-055 – Transition Search Improvements
+        //Update Enabling/Disabling of Tree Elements
+        public bool TraverseTree(DevComponents.AdvTree.Node node, string[] versions)
+        {
+            bool result = true;
+			int numhiddenchildnodes = 0;
+
+            // Recursively call this method for each child node
+            foreach (DevComponents.AdvTree.Node childNode in node.Nodes)
+            {
+                if (!TraverseTree(childNode, versions))
+                {
+                    numhiddenchildnodes++;
+                }
+            }
+
+            // Process the current node (e.g., enable it if it is contained)
+
+            //Select all always shows
+            //also Enable Dummy Nodes by default
+            if (versions == null || (versions.Length == 1 && string.IsNullOrEmpty(versions[0])) || node.Tag == null || (node.Tag is string txt && txt == SelectAllProcedureSetsText))
+			{
+                node.Enabled = true;
+                return true;
+            }
+            //if all child nodes are hidden, hide the parent
+            else if (numhiddenchildnodes == node.Nodes.Count)
+            { 
+				result = false; 
+			}
+
+            FolderInfo fi = (FolderInfo)node.Tag;
+            if (fi.FolderDocVersionCount > 0)
+            {
+                result = versions.Contains(fi.FolderDocVersions[0].VersionID.ToString());
+            }
+
+            node.Enabled = result;
+            return result;
+        }
         private void btnCopySearchResults_Click(object sender, EventArgs e)
 		{
 			ICollection<ItemInfo> myList = lbSrchResults.DataSource as ICollection<ItemInfo>;
@@ -3541,7 +3538,6 @@ namespace Volian.Controls.Library
 		private bool IncTransCvtAllToTextPerm()
 		{
 			if (_SearchResults == null) return false;
-			int cnt = 0;
 			bool allowNonAdmin = IncTranCvtPerm();
 			foreach (ItemInfo ii in _SearchResults)
 			{
@@ -3657,6 +3653,8 @@ namespace Volian.Controls.Library
 				}
 		}
 	}
+#pragma warning restore IDE1006 // Naming Styles
+#pragma warning restore IDE0044 // Add readonly modifier
 
     #endregion
 

PROMS/Volian.Controls.Library/EditItem.cs

@@ -3684,15 +3684,14 @@ namespace Volian.Controls.Library
 		{
 			ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
 
-			string accpgid = accpageid;
-			
-			//B2022 - 083: Support Conditional RO Values
-			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+			//B2022-083: Support Conditional RO Values
+			//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
+			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid.Replace(@"\u8209?", "-"), multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 
 			if (roc.value == null)
 			{
-				accpgid = accpgid.Replace(@"\u8209?", "-");
-				roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				// try again but this time with the unicode dash
+				roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 			}
 
 			if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1659,14 +1659,14 @@ i = 0;
 		private string ROLookup(string accpageid, string multiid, string deflt, string overrideChild)
 		{
 			ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, overrideChild);
-			
-			string accpgid = accpageid;
-			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+
+			//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
+			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpageid.Replace(@"\u8209?", "-") + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 
 			if (roc.value == null)
 			{
-				accpgid = accpgid.Replace(@"\u8209?", "-");
-				roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				// try again but this time with the unicode dash
+				roc = myLookup.GetROChildByAccPageID("<" + accpageid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 			}
 
 			if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019

PROMS/XYPlots/XYPlots.cs

@@ -6,6 +6,7 @@ using System.Windows.Forms;
 using System.Text;
 using System.Drawing;
 using System.Text.RegularExpressions;
+using Volian.Base.Library;
 using VG;
 
 namespace XYPlots
@@ -282,9 +283,12 @@ namespace XYPlots
 		{
 			if (!File.Exists(FileName))
 			{
-				// File does not exist, show error message
-				MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File");
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					// File does not exist, show error message
+					MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File");
+					return false;
+				}
 			}
 			// Open the X/Y Plot file
 			try
@@ -293,9 +297,12 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				// cannot open the x/y plot file
-				MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					// cannot open the x/y plot file
+					MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
+					return false;
+				}
 			}
 			int blen = (int)XYPlotFile.Length;
 			int bread = 0;
@@ -309,8 +316,11 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
+					return false;
+				}	
 			}
 			try
 			{
@@ -318,8 +328,11 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
+					return false;
+				}
 			}
 			StringBuilder sb = new StringBuilder();
 			for (int i = 0; i < bbuf.Length; i++)
@@ -446,7 +459,7 @@ namespace XYPlots
 			char retval;
 			StringBuilder Lbuff = new StringBuilder();
 			retval = NextChar();
-			if (retval != '"' && retval != '\x1C') // open double quote
+			if (retval != '"' && retval != '\x1C' && !BaseLnSettings.blBaseLine) // open double quote
 				MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot");
 			retval = NextChar();
 			while (retval != 0 && retval != '\n')
@@ -1440,7 +1453,10 @@ namespace XYPlots
 		}
 		private void PrintStackError(string relation, int limit)
 		{
-			MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
+			if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+			{
+				MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
+			}
 		}
 		private void SavePosition()
 		{
@@ -1658,8 +1674,11 @@ namespace XYPlots
 		}
 		private void err_exit(string msg, string msg2)
 		{
-			MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
-			Environment.Exit(255);
+			if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+			{
+				MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
+				Environment.Exit(255);
+			}
 		}
 		private void FindBoxesinArea(int ptval, int flag)
 		{
@@ -1916,7 +1935,7 @@ namespace XYPlots
 		{
 			// MSWord enters left and right double-quotes when you press the double-quote key
 			//B2017 - Replace left and right double-quotes with normal double-quotes
-			PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"');
+			 PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"');
 			LoadBuffFromString(PlotCommands);
 				Setup();
 //#if DEBUG
@@ -1991,10 +2010,14 @@ namespace XYPlots
 						AxisLabel[1] = getint();
 						break;
 					default:
-						if (PrevCommand.Equals(null))
-							MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
-						else
-							MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command");
+						if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline.
+						{
+							if (PrevCommand.Equals(null))
+								MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
+							else
+								MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command");
+							break;
+						}
 						break;
 				}
 				PrevCommand = Command;

PROMS/XYPlots/XYPlots.csproj

@@ -176,6 +176,10 @@
       <Project>{52D74078-3822-410E-889B-464BD21AAB9E}</Project>
       <Name>VG</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Volian.Base.Library\Volian.Base.Library.csproj">
+      <Project>{aeee9fd1-6892-45e2-a67e-418c06d46ff9}</Project>
+      <Name>Volian.Base.Library</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />