revert 2b5becfa34

revert F2024-074 (Farley) Include the Cover Page in the total page count of the procedures

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.3.2410.815")]
+[assembly: AssemblyFileVersion("2.3.2410.815")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -92,5 +92,6 @@ using System.Runtime.CompilerServices;
 
 
 
+
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs

@@ -100,6 +100,7 @@ using System.Text;
 using RODBInterface;
 using ROFields;
 using VlnStatus;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -245,6 +246,37 @@ namespace ROEditor
 				return CvtFldToUserFld(origGroup);
 			}
 		}
+
+		//CSM C2024-023
+		//Part of 2024 PROMS Upgrades
+		//When the Overall Form is activated
+		//if there are any items that are Fields that are in use
+		//add them as auto-complete options to the
+		//Accessory Page Access - Value Textbox
+		//Typing < will bring up the auto-complete options
+		protected void tbValue_AddAutoComplete(object sender, EventArgs e)
+		{
+            string dummy = "";  // need for RODB_GetFIeldsInUse call, won't be used.
+            ArrayList AvailList, InUseList;
+            //first see if it is a valid 'InUse' Field.
+            AvailList = myrodb.RODB_GetFields(elem, (uint)RecordType.Schema);
+            InUseList = myrodb.RODB_GetFieldsInUse(elem, AvailList, "FieldsInUse", ref dummy, false);
+
+			//if any ROField items are in use, 
+			//use LINQ to get a string array of the FieldNames
+			if (InUseList.Count > 0)
+			{
+				string[] InUseListFieldNames = InUseList.OfType<ROField>().Select(x => $"<{x.GetFieldname}>").ToArray();
+				AutoCompleteStringCollection allowedTypes = new AutoCompleteStringCollection();
+				allowedTypes.AddRange(InUseListFieldNames);
+				tbValue.AutoCompleteCustomSource = allowedTypes;
+				tbValue.AutoCompleteMode = AutoCompleteMode.Suggest;
+				tbValue.AutoCompleteSource = AutoCompleteSource.CustomSource;
+
+			}
+
+        }
+
 		private void FillInData()
 		{
 			this.tbGroup.Text = DetermineGroupName();
@@ -432,6 +464,7 @@ namespace ROEditor
 			this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
 			this.Name = "GroupDefFrm";
 			this.Text = "Group Definition";
+			this.Activated += new EventHandler(tbValue_AddAutoComplete);
 			this.groupBox1.ResumeLayout(false);
 			this.ResumeLayout(false);
 

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -23798,7 +23798,7 @@ BEGIN TRY -- Try Block
 		--then remove the link from the copy
 		--if original item was not linked, update new items to not be linked
 		DECLARE @xconfig XML = (Select cast(config as xml) xconfig from Contents where ContentID = @ContentID);
-		IF @xconfig.exist('//Enhanced[1]') = 0
+		IF ISNULL(@xconfig.exist('//Enhanced[1]'),0) = 0
 		BEGIN
 		  UPDATE Contents SET Config = dbo.vefn_RemoveEnhanced(Contents.Config)
 		    Where ContentID in (Select ContentID FROM vefn_ChildItems(@NewItemID))
@@ -23904,6 +23904,135 @@ GO
 IF (@@Error = 0) PRINT 'Procedure Creation: [PasteItemReplace] Succeeded'
 ELSE PRINT 'Procedure Creation: [PasteItemReplace] Error on Creation'
 GO
+-- SP: AddDisplayTabState
+
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[AddDisplayTabState]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [AddDisplayTabState];
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 9/18/2024
+-- Description:	Save current open tab state in PROMS editor.
+-- =============================================
+CREATE PROCEDURE [dbo].[AddDisplayTabState]
+(
+	@ItemID int,
+	@DisplayTabID varchar(30),
+	@DisplayTabName varchar(100),
+	@userID varchar(100),
+	@order int
+)
+
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+	-- Remove all records
+	-- DELETE FROM [dbo].[DisplayTabTmp];
+
+		-- Record current tab information
+	INSERT INTO [dbo].[DisplayTabTmp] (itemid,DisplayTabID,DisplayTabName,userid,active, taborder)
+	VALUES (@ItemID,@DisplayTabID,@DisplayTabName,@userID, 1, @order)
+END
+GO
+
+-- SP: GetDisplayTabdata
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetDisplayTabdata]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [GetDisplayTabdata];
+GO
+/****** Object:  StoredProcedure [dbo].[GetDisplayTabdata]    Script Date: 10/3/2024 11:29:44 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 09/18/2024
+-- Description:	retrieve PROMS edit tab saved state.
+-- =============================================
+CREATE PROCEDURE [dbo].[GetDisplayTabdata]
+(
+	@UserID varchar(100)
+)
+
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+  SET NOCOUNT ON;
+
+  SELECT [ItemID]
+      ,[DisplayTabID]
+      ,[DisplayTabName]
+      ,[UpdateDate]
+      ,[UserID]
+      ,[taborder]
+  FROM [dbo].[DisplayTabTmp]
+  WHERE UserID = @UserID AND Active = 1
+  order by taborder
+END
+GO
+-- SP: DeactivateStateDisplayTabTmp
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[DeactivateStateDisplayTabTmp]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [DeactivateStateDisplayTabTmp];
+GO
+/****** Object:  StoredProcedure [dbo].[DeactivateStateDisplayTabTmp]    Script Date: 10/3/2024 11:30:53 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 10/1/2024
+-- Description:	Set PROMES Edit window tabs state inactive.
+-- =============================================
+CREATE procedure [dbo].[DeactivateStateDisplayTabTmp]
+(
+	@UserID varchar(100)
+)
+
+AS
+UPDATE [dbo].[DisplayTabTmp]
+SET Active = 0 
+WHERE UserID = @UserID
+GO
+-- Table: DisplayTabTmp
+                -- If DisplayTabTmp table already exists then don't drop and recreate it
+                IF Not Exists(SELECT * FROM sys.objects Where name = 'DisplayTabTmp' AND type in (N'U'))
+                Begin
+                                SET ANSI_NULLS ON
+                                SET QUOTED_IDENTIFIER ON
+                                                -- =============================================
+                                                -- Author:                            Paul Larsen
+                                                -- Create date: 9/30/2024
+                                                -- Description:    Table to hold tab state in PROMS editor.
+                                                -- =============================================
+                                /****** Object:  Table [dbo].[DisplayTabTmp]    Script Date: 10/3/2024 11:22:00 AM ******/
+
+                                CREATE TABLE [dbo].[DisplayTabTmp](
+                                                [ID] [int] IDENTITY(1,1) NOT NULL,
+                                                [ItemID] [int] NOT NULL,
+                                                [DisplayTabID] [nvarchar](100) NOT NULL,
+                                                [DisplayTabName] [nchar](100) NOT NULL,
+                                                [UpdateDate] [datetime] NOT NULL,
+                                                [UserID] [nchar](100) NOT NULL,
+                                                [Active] [bit] NOT NULL,
+                                                [taborder] [int] NOT NULL
+                                ) ON [PRIMARY]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_UpdateDate]  DEFAULT (getdate()) FOR [UpdateDate]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_Active]  DEFAULT ((1)) FOR [Active]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  DEFAULT ((0)) FOR [taborder]
+                                
+                End        
+GO
 /*
 ==========================================================================================================
  End: C2017-031: SQL to allow copy/replace enhanced step
@@ -23943,8 +24072,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '09/26/2024 11:24'
-	set @RevDescription = 'SQL to allow copy/replace enhanced step.'
+	set @RevDate = '10/03/2024 11:24'
+	set @RevDescription = 'Add the ability for PROMS to remember the procedure tabs that were open when you closed PROMS'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1670,16 +1670,38 @@ namespace VEPROMS
 					return;
 				}
 
-				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
+				string stk = Volian.Base.Library.vlnStackTrace.StackToString(); 
 
 				if (!stk.Contains("Exception"))
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2342,27 @@ namespace VEPROMS
 					CurrentID = txtSearch.Text;
 				}
 			}
+
+			// Add retrieve displaytabs state here.
+			openDisplaytabstate();
+		}
+
+		public void openDisplaytabstate()
+		{
+			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
+		
+			if (DisPlayTabState.Rows.Count > 0)
+			{
+				foreach (DataRow TabState in DisPlayTabState.Rows)
+				{
+					int _ItemID = (int)TabState["ItemID"];
+					//ItemInfoList _Procedures = ItemInfoList.GetList(_ItemID, (int)E_FromType.Procedure));
+					ItemInfo _Procedure = ItemInfo.Get(_ItemID);
+					//ItemInfo.Get
+					//ItemInfo.Get
+					OpenItem(_Procedure);
+				}
+			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

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

@@ -8004,6 +8004,171 @@ namespace VEPROMS.CSLA.Library
 			MyContent.Config = _ProcedureConfig.ToString();
 		}
 		#endregion
+		public class DisplayTabs
+		{
+			private int _ItemID;
+			public int ItemID
+			{
+				get { return _ItemID; }
+				set { _ItemID = value; }
+
+			}
+			private string _DisplayTabID;
+			public string DisplayTabID
+			{
+				get { return _DisplayTabID; }
+				set { _DisplayTabID = value; }
+			}
+			private string _DisplayTabName;
+			public string DisplayTabName
+			{
+				get { return _DisplayTabName; }
+				set { _DisplayTabName = value; }
+			}
+
+			public SafeDataReader Dr { get; }
+
+			public DisplayTabs()
+			{
+
+			}
+
+			public DisplayTabs(int itemID, String displayTabID, String displayTabName)
+			{
+				_ItemID = itemID;
+				_DisplayTabID = displayTabID;
+				_DisplayTabName = displayTabName;
+			}
+
+			public DisplayTabs(SafeDataReader dr)
+			{
+				Dr = dr;
+			}
+		}
+		public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
+		{
+			try
+			{
+				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
+																								  //ItemInfo.AddList(tmp);
+																								  //tmp.AddEvents();
+				return tmp;
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+			}
+		}
+		private DataTable dt = new DataTable();
+		private DataTable DataPortal_Fetch(DisplayTabs criteria)
+		{
+			
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabData";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						da.Fill(dt);
+						cn.Close();
+						da.Dispose();
+						return dt;
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+					}
+
+				}			
+			}
+
+		}
+		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//{
+		//	try
+		//	{
+		//		//DisplayTabs tmp = 
+		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
+		//																											  //ItemInfo.AddList(tmp);
+		//																											  //tmp.AddEvents();
+		//		//return tmp;
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+		//	}
+		//}
+		//private DataTable dt = new DataTable();
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		//{
+
+		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+		//	{
+		//		using (SqlCommand cm = cn.CreateCommand())
+		//		{
+		//			try
+		//			{
+		//				cm.CommandType = CommandType.StoredProcedure;
+		//				cm.CommandText = "AddDisplayTabState";
+		//				cm.CommandTimeout = Database.DefaultTimeout;
+		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
+		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+		//				cm.ExecuteNonQuery();
+		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
+		//				//da.Fill(dt);
+		//				//cn.Close();
+		//				//da.Dispose();
+		//				//return dt; // fix
+		//			}
+		//			catch (Exception ex)
+		//			{
+		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+		//			}
+
+		//		}
+		//	}
+
+		//}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.ExecuteNonQuery();
+						//SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+
+				}
+			}
+
+		}
 	}
 	#endregion
 	#region SectionInfo

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

@@ -1876,6 +1876,10 @@ namespace VEPROMS.CSLA.Library
 			if (IsCaution) enhType = 20006;
 			return enhType;
 		}
+
+		// B2024-075: Paste Before/After with Enhanced Documents is creating situation
+		//where Background item is linked to Source but Source is not linked to Background
+		//When Fixing the linking, need to not create a duplicate link if one already exists
 		public void DoCreateLinksEnhancedSingleItem(ItemInfo enhii, int enhtype)
 		{
 			// Link the 2 items, srcII & enhii:
@@ -1893,12 +1897,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsSection)
@@ -1916,12 +1923,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsProcedure)
@@ -1942,11 +1952,14 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-					sc.AddEnhancedDocument(enhtype, enhii.ItemID);
-					sc.SaveEnhancedDocuments();
-					ii.MyContent.Config = sc.ToString();
-					ii.Save();
-					RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+						sc.SaveEnhancedDocuments();
+						ii.MyContent.Config = sc.ToString();
+						ii.Save();
+						RefreshConfig();
+					}
                 }
 			}
 		}

PROMS/VEPROMS.CSLA.Library/Generated/Item.cs

@@ -1132,6 +1132,91 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.Add", ex);
 			}
 		}
+		public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "DeactivateStateDisplayTabTmp";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName, string UserID, int order)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.Parameters.AddWithValue("@order", order);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+				}
+			}
+		}
+		public static DataTable GetDisplayTabs(string UserID) //, string displayTabID, string displayTabName)
+														   //public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabdata";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						//cm.ExecuteNonQuery();						
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
 		[Transactional(TransactionalTypes.TransactionScope)]
 		protected override void DataPortal_Update()
 		{

PROMS/Volian.Controls.Library/EditItem.cs

@@ -9,6 +9,7 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -893,6 +894,18 @@ namespace Volian.Controls.Library
 			b4topadjust -= newFocus.Top;
 			TopMostYBefore -= b4topadjust;
 
+			//B2024-075: If Deleting an item in a Source Document that is unlinked
+			//and the overall procedure has connected Background Documents
+			//and a window is open containing the background documents
+			//then need to force a refresh on that window as
+			//step numbering will shift
+			EnhancedDocuments ProcEnh = MyItemInfo.MyProcedure.GetMyEnhancedDocuments();
+			if (ProcEnh.Count > 0)
+			{
+				DisplayTabItem wndowToRefresh = MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {ProcEnh[0].ItemID}");
+				wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+			}
+
 			//_MyTimer.ActiveProcess = "Dispose";
 			Dispose();
 			//_MyTimer.ActiveProcess = "SetAllTabs";
@@ -1634,10 +1647,54 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.Before, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			// if enhanced items were created, then see if they need displayed:
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
+
+        //B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+        //since source is done first
+        //this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+        //if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+        //and don't have a corresponding spot in the Source
+        private void FixEnhanceLinkOnSource(ItemInfo SourceItem, ItemInfo newEnhItem,  EnhancedDocuments enhancedDocuments)
+		{
+			if (enhancedDocuments.Count > 0)
+				CreateLinksEnhancedSingleItem(SourceItem, newEnhItem, enhancedDocuments[0].Type); 
+		}
 		private void AddAllEnhancedItemsToDisplay(ItemInfo newItemInfo)
 		{
 			EnhancedDocuments eds = newItemInfo.GetMyEnhancedDocuments();
@@ -1684,12 +1741,15 @@ namespace Volian.Controls.Library
 				}
 			}
 		}
-		public void UnlinkEnhanced(ItemInfo enhII)
+		public void UnlinkEnhanced(EditItem enhII)
 		{
 			// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced
 			//	Pass in to unlink as before this change
-			enhII.DoUnlinkEnhanced(enhII, 0, false);
+			// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+			//so can refresh the UI
+			enhII.MyItemInfo.DoUnlinkEnhanced(enhII.MyItemInfo, 0, false);
 			SetFocus();
+			enhII.MyStepPanel.Reset(enhII.MyItemInfo); //need to reset parts so refreshes display to show as unlinked
 		}
 		public ItemInfo AddMissingEnhancedStep(ItemInfo ii, int EnhType)
 		{
@@ -1753,7 +1813,42 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.After, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			//if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+			//and don't have a cooresponding spot in the Source
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
 		public void PasteChild(int copyStartID)

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -337,8 +337,10 @@ namespace Volian.Controls.Library
 				else if (btn.Name.Contains("Unlink"))
 				{
 					// C2019=003: add a confirmation dialog before unlinking a step:
+					// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+					//so can refresh the UI
 					if (FlexibleMessageBox.Show(this, "Do you want to unlink this step?", "Confirm Enhanced Step Unlink", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-						MyEditItem.UnlinkEnhanced(MyEditItem.MyItemInfo);
+						MyEditItem.UnlinkEnhanced(MyEditItem);
 				}
 			}
 			else