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

Merging changes from development into master after successful testing.

PROMS/Formats/Formats.csproj

@@ -179,7 +179,6 @@
     <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/SQL/PROMStoCM.sql

@@ -1817,7 +1817,7 @@ ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete a
 		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
 		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
 		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		update ga set ga.contentauditid = (select max(auditid) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
 		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
 	end
 go

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -5547,12 +5547,6 @@ 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];
@@ -5561,46 +5555,35 @@ GO
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
        Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
-CREATE OR ALTER FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
+CREATE FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
 WITH EXECUTE AS OWNER
 AS
 BEGIN
 DECLARE @ParentID int;
-WITH Itemz([ItemID]) as
+WITH Itemz([ItemID],[IsFound]) as
 (
-select ii.itemid from items ii WITH (NOLOCK) where ii.itemid = @ItemID
+select ii.itemid,0 from items ii where ii.itemid = @ItemID
 union all
-select ii.previousid from items ii WITH (NOLOCK)
+select ii.previousid,0 from items ii
 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 = ii.itemid 
+select top 1 @ParentID = itemid from itemz
-from itemz
+where isfound = 1 OPTION (MAXRECURSION 10000)
-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];
@@ -25007,34 +24990,6 @@ IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber
 ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
 GO
 
-/*
-==========================================================================================================
- Author:		Matthew Schill
- Create Date:	06/29/2026
- Description:	Added an ISNULL check when setting GridAudits.contentauditid.
-    Was Causing Deletion of some Grids to fail.
-==========================================================================================================
-*/
-/****** Object:  Trigger [tr_Contents_Delete] ******/
-ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete as 
-	begin
-		update ii set DeleteStatus = (select max(DeleteID) from DeleteLog where SPID = @@spid), ActionDTS = getdate(),
-		UserID = (select top 1 UserID from DeleteLog where SPID = @@spid order by deleteid desc)
-		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
-		insert into ContentAudits(ContentID,Number,Text,Type,FormatID,Config,DTS,UserID,DeleteStatus,ActionDTS)
-		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
-		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
-		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
-		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
-	end
-go
-
--- Display the status of Trigger alter
-IF (@@Error = 0) PRINT 'Trigger Alteration: tr_Contents_Delete Succeeded'
-ELSE PRINT 'Trigger Alteration: tr_Contents_Delete Error on Creation'
-GO
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -25068,8 +25023,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/16/2026 8:30 AM'
+	set @RevDate = '05/26/2026 7:00 AM'
-	set @RevDescription = 'Reworked ve_GetParentItem for Performance improvement'
+	set @RevDescription = 'Get Most Recent Revision when Duplicates'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using static System.Net.Mime.MediaTypeNames;
 
 
 namespace VEPROMS.CSLA.Library
@@ -60,8 +61,7 @@ namespace VEPROMS.CSLA.Library
 		#region Structs / Internal Classes
 
 		[Serializable]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+		public struct roHdr
-        public struct roHdr
 		{
 			public int hSize;
 			public int hYear;
@@ -78,8 +78,7 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+		public struct rodbi
-        public struct rodbi
 		{
 			public int dbiID;
 			public int dbiType;
@@ -92,8 +91,7 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+		public struct rogrp
-        public struct rogrp
 		{
 			public string value;
 			public string appid;
@@ -104,8 +102,7 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+		public struct rochild
-        public struct rochild
 		{
 			public int ID;
 			public int ParentID;
@@ -136,7 +133,7 @@ namespace VEPROMS.CSLA.Library
 		private List<string> _baseAccPageKeys;
 
 		// RofstLookup/Conversion Variables
-		private readonly int _rofstID;
+		private int _rofstID;
 		private DocVersionInfo _myDocVersionInfo;
 		private int _selectedSlave;
 		private string _otherChild = string.Empty;
@@ -152,7 +149,7 @@ namespace VEPROMS.CSLA.Library
 		// B2022-107: Display Progress Bar Messages/Statuses when a new ROFST binary file is loaded into the database
 		private frmRofstLoadStatus _frmRofstLoadStatus = null;
 		private Dictionary<int, int> _dicRoCounts = null;
-		private readonly bool _showLoadingStatus = true;
+		private bool _showLoadingStatus = true;
 
 		private int _curRoCnt = 0;
 		private int _dbRoCnt = 0;
@@ -417,6 +414,7 @@ namespace VEPROMS.CSLA.Library
 
 			ROFSTLookup.rochild rc = RofstDataGetChildByAccPageID(_rofstID, accPageBase);
 
+			//if (rc.ID >=0 && rc.roid.Length < 16 && Regex.IsMatch(accPageKey, @".*\.[A-Z]") && rc.children != null && rc.children.Count() > 0)
 			if (rc.ID >= 0 && rc.roid.Length < 16 && !string.IsNullOrEmpty(accPageExt) && rc.children != null && rc.children.Count() > 0)
 			{
 				// Check if AccPageID/Key has a return value specific extension.  Try to find the RoChild record with the specific return value type, 
@@ -509,6 +507,8 @@ namespace VEPROMS.CSLA.Library
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
 
+			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
 			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
 			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 
@@ -681,10 +681,11 @@ namespace VEPROMS.CSLA.Library
 
 			if (minutes > 0) duration = string.Format("{0} min(s) ", minutes.ToString("n0"));
 			if (secs < 0) secs = 0.00;
-			duration += string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
+			duration = duration + string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
 
 			return duration;
 
+			//return string.Format("{0,10:#####0.00}", TimeSpan.FromTicks(DateTime.Now.Ticks - dtStart.Ticks).TotalSeconds);
 		}
 
         //C2026-008 Re-Architect RO.FST to include RO Modification date/time
@@ -1474,22 +1475,21 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertFst2Objects(byte[] ab)
 		{
-            ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr
+			ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr();
-            {
-                hSize = BitConverter.ToInt32(ab, 0),
-                hYear = BitConverter.ToInt16(ab, 4),
-                hMonth = ab[6],
-                hDay = ab[7],
-                hcYear = BitConverter.ToInt16(ab, 8),
-                hcMonth = ab[10],
-                hcDay = ab[11],
-                hcHour = ab[12],
-                hcMin = ab[13],
-                hcSec = ab[14],
-                hcHund = ab[15]
-            };
 
-            int hdrOffset = BitConverter.ToInt32(ab, 16);
+			roh.hSize = BitConverter.ToInt32(ab, 0);
+			roh.hYear = BitConverter.ToInt16(ab, 4);
+			roh.hMonth = ab[6];
+			roh.hDay = ab[7];
+			roh.hcYear = BitConverter.ToInt16(ab, 8);
+			roh.hcMonth = ab[10];
+			roh.hcDay = ab[11];
+			roh.hcHour = ab[12];
+			roh.hcMin = ab[13];
+			roh.hcSec = ab[14];
+			roh.hcHund = ab[15];
+
+			int hdrOffset = BitConverter.ToInt32(ab, 16);
 			int dbs = BitConverter.ToInt16(ab, hdrOffset + 4);
 
 			roh.myDbs = new ROFSTLookup.rodbi[dbs];
@@ -1525,13 +1525,12 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rogrp LoadGroup(byte[] ab, int offset, int tableID)
 		{
-            ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp
+			ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp();
-            {
-                ID = BitConverter.ToInt32(ab, offset),
-                ParentID = BitConverter.ToInt32(ab, offset + 4)
-            };
 
-            int numChildren = BitConverter.ToInt16(ab, offset + 8);
+			myGrp.ID = BitConverter.ToInt32(ab, offset);
+			myGrp.ParentID = BitConverter.ToInt32(ab, offset + 4);
+
+			int numChildren = BitConverter.ToInt16(ab, offset + 8);
 
 			if (numChildren > 0)
 			{
@@ -1661,7 +1660,7 @@ namespace VEPROMS.CSLA.Library
 					}
 
 					// Update Progress Bar Accordingly
-					if (_totalRoCnt > 0) _pctComplete += ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
+					if (_totalRoCnt > 0) _pctComplete = _pctComplete + ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
 
 					OnProgressChanged(displayText, Convert.ToInt32(_pctComplete), 100);
 				}
@@ -1721,13 +1720,15 @@ namespace VEPROMS.CSLA.Library
 		protected virtual void OnProgressChanged(string title, string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			_frmRofstLoadStatus?.UpdateProgress(title, displayText, curVal, maxVal);
+			if (_frmRofstLoadStatus != null)
+				_frmRofstLoadStatus.UpdateProgress(title, displayText, curVal, maxVal);
 		}
 
 		protected virtual void OnProgressChanged(string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			_frmRofstLoadStatus?.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
+			if (_frmRofstLoadStatus != null)
+				_frmRofstLoadStatus.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
 		}
 
 		#endregion
@@ -1738,22 +1739,21 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertToRoHdrObject(SafeDataReader dr, bool loadChildren)
 		{
-            ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr
+			ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr();
-            {
-                hSize = (int)dr.GetValue("hSize"),
-                hYear = (int)dr.GetValue("hYear"),
-                hMonth = (byte)dr.GetValue("hMonth"),
-                hDay = (byte)dr.GetValue("hDay"),
-                hcYear = (int)dr.GetValue("hcYear"),
-                hcMonth = (byte)dr.GetValue("hcMonth"),
-                hcDay = (byte)dr.GetValue("hcDay"),
-                hcHour = (byte)dr.GetValue("hcHour"),
-                hcMin = (byte)dr.GetValue("hcMin"),
-                hcSec = (byte)dr.GetValue("hcSec"),
-                hcHund = (byte)dr.GetValue("hcHund")
-            };
 
-            if (loadChildren)
+			rh.hSize = (int)dr.GetValue("hSize");
+			rh.hYear = (int)dr.GetValue("hYear");
+			rh.hMonth = (byte)dr.GetValue("hMonth");
+			rh.hDay = (byte)dr.GetValue("hDay");
+			rh.hcYear = (int)dr.GetValue("hcYear");
+			rh.hcMonth = (byte)dr.GetValue("hcMonth");
+			rh.hcDay = (byte)dr.GetValue("hcDay");
+			rh.hcHour = (byte)dr.GetValue("hcHour");
+			rh.hcMin = (byte)dr.GetValue("hcMin");
+			rh.hcSec = (byte)dr.GetValue("hcSec");
+			rh.hcHund = (byte)dr.GetValue("hcHund");
+
+			if (loadChildren)
 			{
 				rh.myDbs = RofstDataGetDatabases(_rofstID);
 			}
@@ -1763,18 +1763,17 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rodbi ConvertToRodbiObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-            ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi
+			ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi();
-            {
-                dbiID = (int)dr.GetValue("dbiID"),
-                dbiType = (int)dr.GetValue("dbiType"),
-                dbiAW = (int)dr.GetValue("dbiAW"),
-                dbiAP = (string)dr.GetValue("dbiAP"),
-                dbiTitle = (string)dr.GetValue("dbiTitle"),
-                ID = (int)dr.GetValue("ID"),
-                ParentID = (int)dr.GetValue("ParentID")
-            };
 
-            if (loadChildren || loadAllChildren)
+			rd.dbiID = (int)dr.GetValue("dbiID");
+			rd.dbiType = (int)dr.GetValue("dbiType");
+			rd.dbiAW = (int)dr.GetValue("dbiAW");
+			rd.dbiAP = (string)dr.GetValue("dbiAP");
+			rd.dbiTitle = (string)dr.GetValue("dbiTitle");
+			rd.ID = (int)dr.GetValue("ID");
+			rd.ParentID = (int)dr.GetValue("ParentID");
+
+			if (loadChildren || loadAllChildren)
 			{
 				rd.children = RofstDataGetChildrenByID(_rofstID, rd.dbiID, rd.ID, false, loadAllChildren);
 			}
@@ -1784,16 +1783,15 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rochild ConvertToRochildObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-            ROFSTLookup.rochild rc = new ROFSTLookup.rochild
+			ROFSTLookup.rochild rc = new ROFSTLookup.rochild();
-            {
-                ID = (int)dr.GetValue("ID"),
-                ParentID = (int)dr.GetValue("ParentID"),
-                type = (int)dr.GetValue("type"),
-                title = (string)dr.GetValue("title"),
-                roid = (string)dr.GetValue("roid")
-            };
 
-            if (!string.IsNullOrEmpty((string)dr.GetValue("appid")))
+			rc.ID = (int)dr.GetValue("ID");
+			rc.ParentID = (int)dr.GetValue("ParentID");
+			rc.type = (int)dr.GetValue("type");
+			rc.title = (string)dr.GetValue("title");
+			rc.roid = (string)dr.GetValue("roid");
+
+			if (!string.IsNullOrEmpty((string)dr.GetValue("appid")))
 			{
 				rc.appid = (string)dr.GetValue("AccPageID");
 
@@ -1813,14 +1811,13 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.RoExtension ConvertToRoExtensionObject(SafeDataReader dr)
 		{
-            ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension
+			ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension();
-            {
-                Offset = (int)dr.GetValue("Offset"),
-                RoidExt = (string)dr.GetValue("RoidExt"),
-                AccPageExt = (string)dr.GetValue("AccPageExt")
-            };
 
-            return re;
+			re.Offset = (int)dr.GetValue("Offset");
+			re.RoidExt = (string)dr.GetValue("RoidExt");
+			re.AccPageExt = (string)dr.GetValue("AccPageExt");
+
+			return re;
 		}
 
 		#endregion
@@ -1878,6 +1875,7 @@ namespace VEPROMS.CSLA.Library
 					// Instead of returning the RoChildBase object with a single RoReturnVal object attached, just return the single Ro ReturnValue object.
 					var roRetVal = child.children.First();
 
+					//child.title = roRetVal.title;
 					child.appid = roRetVal.appid;
 					child.roid = roRetVal.roid;
 					child.value = roRetVal.value;
@@ -2131,71 +2129,44 @@ namespace VEPROMS.CSLA.Library
 			return ProcessRO(match, multiRtnVal);
 		}
 
-        // Takes the RO text value and sees if a macro has been used.  
+		private string ProcessMacros(string str)
-        // If so it will perform the macro operation on the substring in the text value
+		{
-        // Note** Right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hard space
+			// Takes the RO text value and sees if a macro has been used.  
-        private static string ProcessMacros(string str)
+			// If so it will perform the macro operation on the substring in the text value
-        {
+			// Note** Right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hard space
 
-            if (string.IsNullOrEmpty(str) || str.ToUpper().IndexOf("@HSP(") < 0)
+			if (string.IsNullOrEmpty(str))
-                return str;
+				return str;
 
+			string rtnstr = str;
+			int indx;
 
-            string processingstr = str;  //holds current string being processed
+			while ((indx = rtnstr.ToUpper().IndexOf("@HSP(")) > -1)
-            int indx;                    //current position of @HSP( in string
+			{
-            int endpos = 0;              //end of last parens
+				string resstr = rtnstr.Substring(0, indx);
+				int endHsp = rtnstr.IndexOf(")", indx);
 
-            StringBuilder sb = new StringBuilder();
+				//B2026 - 002 handle if parens inside a HSP
-            Stack<char> endparens = new Stack<char>();
+				int startpos = indx + 5;
+				while (rtnstr.Substring(startpos, endHsp - startpos).Contains("("))
+				{
+					startpos = rtnstr.IndexOf("(", startpos + 1, endHsp - startpos) + 1;
+					endHsp = rtnstr.IndexOf(")", endHsp + 1);
+				}
 
-            while ((indx = processingstr.ToUpper().IndexOf("@HSP(")) > -1)
+				string tmpstr = rtnstr.Substring(indx + 5, endHsp - indx - 5);
-            {
-                sb.Append(processingstr.Substring(0, indx));   // initial string before @HSP(
 
-                for (int i = indx + 5; i < processingstr.Length; i++)
+				// B2017-012 Don't convert space to hard spaces for XY Plots.
-                {
+				if (!tmpstr.Contains("<<G")) tmpstr = tmpstr.Replace(" ", @"\u160?");
-                    char ch = processingstr[i];
 
-                    if (ch == '(')
+				resstr = resstr + tmpstr;
-                    {
+				rtnstr = resstr + rtnstr.Substring(endHsp + 1);
-						//if opening paren inside HSP add it to the stack to look for a closing parens
+			}
-                        endparens.Push(ch);
-                    }
-                    else if (ch == ')' && endparens.Count > 0)
-                    {
-						//if cloing parens and it matches an opening parens inside of HSP, remove a level
-                        _ = endparens.Pop();
-                    }
-                    else if (ch == ')' && endparens.Count == 0)
-                    {
-						//if closing parens and at same level as HSP, break out since found correct closing parens
-                        endpos = i;
-                        break;
-                    }
-                    else if (i == processingstr.Length - 1)
-                    {
-						//if hit the end of the string and no matching closing parens found, take to the end of the string
-                        endpos = processingstr.Length;
-                    }
-                }
 
-				//Add the text inside the @HSP(...)
+			return rtnstr;
-                string tmpstr = processingstr.Substring(indx + 5, endpos - indx - 5);
+		}
-                // B2017-012 Don't convert space to hard spaces for XY Plots.
-                if (!tmpstr.Contains("<<G")) tmpstr = tmpstr.Replace(" ", @"\u160?");
-                sb.Append(tmpstr);
 
-                //Set the processing string to after the ending parens found in case multiple @HSP
+		private int StringLength(byte[] ab, int offset)
-                processingstr = endpos + 1 >= processingstr.Length ? "" : processingstr.Substring(endpos + 1);
-            }
-
-            //add text after last end parens
-            sb.Append(processingstr);
-
-            return sb.ToString();
-        }
-
-        private int StringLength(byte[] ab, int offset)
 		{
 			int i = 0;
 			while (ab[i + offset] != 0) i++;
@@ -2304,7 +2275,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				rc.roid = FormatRoidKey(roid).Substring(0, 12);
 
-				DocVersionConfig dvc = _myDocVersionInfo?.DocVersionConfig;
+				DocVersionConfig dvc = (_myDocVersionInfo != null) ? _myDocVersionInfo.DocVersionConfig : null;
 				if (dvc != null) dvc.SelectedSlave = this.SelectedSlave;
 
 				switch (rc.roid)
@@ -2312,49 +2283,49 @@ namespace VEPROMS.CSLA.Library
 					case "FFFF00000001":
 						rc.title = "Number";
 						rc.appid = "U-NUMBER";
-						rc.value = dvc?.Unit_Number;
+						rc.value = (dvc != null) ? dvc.Unit_Number : null;
 						break;
 
 					case "FFFF00000002":
 						rc.title = "Other Number";
 						rc.appid = "U-OTHERNUMBER";
-						rc.value = dvc?.Other_Unit_Number;
+						rc.value = (dvc != null) ? dvc.Other_Unit_Number : null;
 						break;
 
 					case "FFFF00000003":
 						rc.title = "Text";
 						rc.appid = "U-TEXT";
-						rc.value = dvc?.Unit_Text;
+						rc.value = (dvc != null) ? dvc.Unit_Text : null;
 						break;
 
 					case "FFFF00000004":
 						rc.title = "Other Text";
 						rc.appid = "U-OTHERTEXT";
-						rc.value = dvc?.Other_Unit_Text;
+						rc.value = (dvc != null) ? dvc.Other_Unit_Text : null;
 						break;
 
 					case "FFFF00000005":
 						rc.title = "ID";
 						rc.appid = "U-ID";
-						rc.value = dvc?.Unit_ID;
+						rc.value = (dvc != null) ? dvc.Unit_ID : null;
 						break;
 
 					case "FFFF00000006":
 						rc.title = "Other ID";
 						rc.appid = "U-OTHERID";
-						rc.value = dvc?.Other_Unit_ID;
+						rc.value = (dvc != null) ? dvc.Other_Unit_ID : null;
 						break;
 
 					case "FFFF00000007":
 						rc.title = "Name";
 						rc.appid = "U-NAME";
-						rc.value = dvc?.Unit_Name;
+						rc.value = (dvc != null) ? dvc.Unit_Name : null;
 						break;
 
 					case "FFFF00000008":
 						rc.title = "Other Name";
 						rc.appid = "U-OTHERNAME";
-						rc.value = dvc?.Other_Unit_Name;
+						rc.value = (dvc != null) ? dvc.Other_Unit_Name : null;
 						break;
 				}
 

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

@@ -7279,7 +7279,6 @@ namespace VEPROMS.CSLA.Library
 				_ByWordSuffix = byWordSuffix;
 			}
 		}
-
 		private void DataPortal_Fetch(ItemListSearchCriteria criteria)
 		{
 			this.RaiseListChangedEvents = false;

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

@@ -326,9 +326,7 @@ 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)
 		{
-            ROWorkingDraftAsk.ClearWorkingDrafts();
+			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
-
-            if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
 
 			int origFSTid = origROFst.ROFstID;
 

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

@@ -1,18 +0,0 @@
-
-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,7 +396,6 @@
     <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.Controls.Library/DisplaySearch.Designer.cs

@@ -94,6 +94,15 @@ namespace Volian.Controls.Library
 			this.label2 = new System.Windows.Forms.Label();
 			this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
+			this.lblIncTran = new System.Windows.Forms.Label();
+			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
+			this.lblSrchIncTran = new System.Windows.Forms.Label();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.rbFromEditor = new System.Windows.Forms.RadioButton();
+			this.rbFromTree = new System.Windows.Forms.RadioButton();
+			this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
 			this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar();
 			this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem();
 			this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem();
@@ -112,15 +121,6 @@ namespace Volian.Controls.Library
 			this.btnAND = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOR = new DevComponents.DotNetBar.ButtonItem();
 			this.btnNOT = new DevComponents.DotNetBar.ButtonItem();
-			this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
-			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
-			this.lblIncTran = new System.Windows.Forms.Label();
-			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
-			this.lblSrchIncTran = new System.Windows.Forms.Label();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.rbFromEditor = new System.Windows.Forms.RadioButton();
-			this.rbFromTree = new System.Windows.Forms.RadioButton();
 			this.advTreeProcSets = new DevComponents.AdvTree.AdvTree();
 			this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
 			this.node1 = new DevComponents.AdvTree.Node();
@@ -168,9 +168,9 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.SuspendLayout();
 			this.gpSrchAnnoText.SuspendLayout();
 			this.panel4.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			this.tabControlPanel1.SuspendLayout();
 			this.groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit();
 			this.grpPanSearchResults.SuspendLayout();
@@ -974,6 +974,118 @@ namespace Volian.Controls.Library
 			this.tabAnnotationSearch.Text = "Annotations";
 			this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
 			// 
+			// tabControlPanel1
+			// 
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblIncTran);
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
+			this.tabControlPanel1.Controls.Add(this.groupBox1);
+			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
+			this.tabControlPanel1.Name = "tabControlPanel1";
+			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.GradientAngle = 90;
+			this.tabControlPanel1.TabIndex = 17;
+			this.tabControlPanel1.TabItem = this.tabIncTrans;
+			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
+			// 
+			// btnTranCvtSelToTxt
+			// 
+			this.btnTranCvtSelToTxt.Enabled = false;
+			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
+			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
+			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
+            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtSelToTxt.TabIndex = 3;
+			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
+			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
+			// 
+			// lblIncTran
+			// 
+			this.lblIncTran.AutoSize = true;
+			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
+			this.lblIncTran.Name = "lblIncTran";
+			this.lblIncTran.Size = new System.Drawing.Size(23, 13);
+			this.lblIncTran.TabIndex = 2;
+			this.lblIncTran.Text = "To:";
+			// 
+			// btnTranCvtAllToTxt
+			// 
+			this.btnTranCvtAllToTxt.Enabled = false;
+			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
+			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
+			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
+            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtAllToTxt.TabIndex = 1;
+			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
+			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
+			// 
+			// lblSrchIncTran
+			// 
+			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
+			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
+			this.lblSrchIncTran.Name = "lblSrchIncTran";
+			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
+			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
+            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
+			this.lblSrchIncTran.TabIndex = 1;
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+			this.groupBox1.Controls.Add(this.rbFromEditor);
+			this.groupBox1.Controls.Add(this.rbFromTree);
+			this.groupBox1.Location = new System.Drawing.Point(147, 4);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(130, 57);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Search Selection";
+			this.groupBox1.Visible = false;
+			// 
+			// rbFromEditor
+			// 
+			this.rbFromEditor.AutoSize = true;
+			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
+			this.rbFromEditor.Name = "rbFromEditor";
+			this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
+			this.rbFromEditor.TabIndex = 1;
+			this.rbFromEditor.TabStop = true;
+			this.rbFromEditor.Text = "From Editor";
+			this.rbFromEditor.UseVisualStyleBackColor = true;
+			// 
+			// rbFromTree
+			// 
+			this.rbFromTree.AutoSize = true;
+			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
+			this.rbFromTree.Name = "rbFromTree";
+			this.rbFromTree.Size = new System.Drawing.Size(73, 17);
+			this.rbFromTree.TabIndex = 0;
+			this.rbFromTree.TabStop = true;
+			this.rbFromTree.Text = "From Tree";
+			this.rbFromTree.UseVisualStyleBackColor = true;
+			// 
+			// tabIncTrans
+			// 
+			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
+			this.tabIncTrans.Name = "tabIncTrans";
+			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
+            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
+			this.tabIncTrans.Text = "Incoming\nTransitions";
+			// 
 			// contextMenuBar1
 			// 
 			this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top;
@@ -1136,119 +1248,6 @@ namespace Volian.Controls.Library
 			this.btnNOT.Text = "NOT";
 			this.btnNOT.Click += new System.EventHandler(this.btnNOT_Click);
 			// 
-			// tabIncTrans
-			// 
-			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
-			this.tabIncTrans.Name = "tabIncTrans";
-			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
-            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
-			this.tabIncTrans.Text = "Incoming\nTransitions";
-			// 
-			// tabControlPanel1
-			// 
-			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblIncTran);
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
-			this.tabControlPanel1.Controls.Add(this.groupBox1);
-			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
-			this.tabControlPanel1.Name = "tabControlPanel1";
-			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
-			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tabControlPanel1.Style.GradientAngle = 90;
-			this.tabControlPanel1.TabIndex = 17;
-			this.tabControlPanel1.TabItem = this.tabIncTrans;
-			// 
-			// btnTranCvtSelToTxt
-			// 
-			this.btnTranCvtSelToTxt.Enabled = false;
-			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
-			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
-			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
-            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtSelToTxt.TabIndex = 3;
-			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
-			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
-			// 
-			// lblIncTran
-			// 
-			this.lblIncTran.AutoSize = true;
-			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
-			this.lblIncTran.Name = "lblIncTran";
-			this.lblIncTran.Size = new System.Drawing.Size(23, 13);
-			this.lblIncTran.TabIndex = 2;
-			this.lblIncTran.Text = "To:";
-			// 
-			// btnTranCvtAllToTxt
-			// 
-			this.btnTranCvtAllToTxt.Enabled = false;
-			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
-			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
-			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
-            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtAllToTxt.TabIndex = 1;
-			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
-			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
-			// 
-			// lblSrchIncTran
-			// 
-			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
-			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
-			this.lblSrchIncTran.Name = "lblSrchIncTran";
-			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
-			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
-            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
-			this.lblSrchIncTran.TabIndex = 1;
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
-			this.groupBox1.Controls.Add(this.rbFromEditor);
-			this.groupBox1.Controls.Add(this.rbFromTree);
-			this.groupBox1.Location = new System.Drawing.Point(147, 4);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(130, 57);
-			this.groupBox1.TabIndex = 0;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Search Selection";
-			this.groupBox1.Visible = false;
-			// 
-			// rbFromEditor
-			// 
-			this.rbFromEditor.AutoSize = true;
-			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
-			this.rbFromEditor.Name = "rbFromEditor";
-			this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
-			this.rbFromEditor.TabIndex = 1;
-			this.rbFromEditor.TabStop = true;
-			this.rbFromEditor.Text = "From Editor";
-			this.rbFromEditor.UseVisualStyleBackColor = true;
-			// 
-			// rbFromTree
-			// 
-			this.rbFromTree.AutoSize = true;
-			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
-			this.rbFromTree.Name = "rbFromTree";
-			this.rbFromTree.Size = new System.Drawing.Size(73, 17);
-			this.rbFromTree.TabIndex = 0;
-			this.rbFromTree.TabStop = true;
-			this.rbFromTree.Text = "From Tree";
-			this.rbFromTree.UseVisualStyleBackColor = true;
-			// 
 			// advTreeProcSets
 			// 
 			this.advTreeProcSets.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
@@ -1407,6 +1406,7 @@ namespace Volian.Controls.Library
 			// 
 			this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lbSrchResultsIncTrans.CheckBoxesVisible = true;
+			this.lbSrchResultsIncTrans.CheckStateMember = null;
 			this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true;
 			this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.lbSrchResultsIncTrans.DragDropSupport = true;
@@ -1733,6 +1733,11 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.xpSetToSearch);
 			this.Controls.Add(this.tabSearchTypes);
 			this.Controls.Add(this.tabControlPanel1);
+			//B2025-056 Click on Incoming Transitions
+			// This needs to be part of overall control
+			// since if it is part of tabSearchTypes,
+			// then when that is disabled, buttons on
+			// this will be also
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplaySearch";
 			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -1755,11 +1760,11 @@ namespace Volian.Controls.Library
 			this.gpSrchAnnoText.ResumeLayout(false);
 			this.panel4.ResumeLayout(false);
 			this.panel4.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit();
 			this.grpPanSearchResults.ResumeLayout(false);

PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -79,10 +78,7 @@ namespace Volian.Controls.Library
 			// VlnFlexGrid
 			// 
 			this.Rows.DefaultSize = 19;
-			this.AllowDrop = true;
+			
-			this.DragEnter += new DragEventHandler(Control_DragEnter);
-			this.DragDrop += new DragEventHandler(Control_DragDrop);
-
 			((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 			this.ResumeLayout(false);
 

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -1,23 +1,22 @@
-using C1.Win.C1FlexGrid;
-using C1.Win.C1SpellChecker;
-using DevComponents.DotNetBar.Controls;
-using JR.Utils.GUI.Forms;
 using System;
+using System.ComponentModel;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.InteropServices;
 using System.Xml;
-using System.Xml.Serialization;
+using System.IO;
-using VEPROMS.CSLA.Library;
-using Volian.Base.Library;
 using Volian.Controls.Library;
+using VEPROMS.CSLA.Library;
+using C1.Win.C1FlexGrid;
+using C1.Win.C1SpellChecker;
+using System.Text.RegularExpressions;
+using System.Xml.Serialization;
+using Volian.Base.Library;
+using JR.Utils.GUI.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -4439,28 +4438,11 @@ namespace Volian.Controls.Library
 		//        }
 
 		//}
-		private void Control_DragEnter(object sender, DragEventArgs e)
-		{
-			if (e.Data.GetDataPresent(DataFormats.Text))
-			{
-				e.Effect = DragDropEffects.Copy; // Allow copy
-			}
-			else
-			{
-				e.Effect = DragDropEffects.None; // Disallow
-			}
-		}
-		private void Control_DragDrop(object sender, DragEventArgs e)
-		{
-			string data = (string)e.Data.GetData(DataFormats.Text);
-			// Process the data (e.g., display it in a TextBox)
-			this.Text = data;
-		}
 		#region Uneven Selections
-		/// <summary>
+			/// <summary>
-		/// True if the top and bottom row of the selection is the same for every column
+			/// True if the top and bottom row of the selection is the same for every column
-		/// </summary>
+			/// </summary>
-		public bool EvenSelection
+			public bool EvenSelection
 			{
 				get
 				{