Merge pull request 'C2017-031 Extend Copy / Paste Replace Functionality for Enhanced Background Steps' (#414) from C2017-031 into Development

Code changes look good. OK for testing phase.

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -23904,103 +23904,6 @@ 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
 /*
 ==========================================================================================================
  End: C2017-031: SQL to allow copy/replace enhanced step

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1670,36 +1670,16 @@ 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)
-
-					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
@@ -2340,27 +2320,6 @@ 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,171 +8004,6 @@ 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

@@ -1942,16 +1942,63 @@ 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();
+					sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+					sc.SaveEnhancedDocuments();
+					ii.MyContent.Config = sc.ToString();
+					ii.Save();
+					RefreshConfig();
                 }
 			}
 		}
 		#endregion
 		#region DataPortal
+		// C2017-031:  Support for paste/replace an enhanced step
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ContentID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ContentID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2073,9 +2120,72 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
 			}
 		}
+	#endregion
+	#region PastingPartEnhancedCriteria
+	// C2017-031:  Support for paste/replace an enhanced step
+	[Serializable()]
+	public class PastingPartEnhancedCriteria
+	{
+		#region Properties
+		private int _StartItemID;
+		public int StartItemID
+		{
+			get { return _StartItemID; }
+			set { _StartItemID = value; }
+		}
+		private int _ItemID;            // paste relative to this itemid
+		public int ItemID
+		{
+			get { return _ItemID; }
+			set { _ItemID = value; }
+		}
+		private EAddpingPart _AddType;
+		public EAddpingPart AddType
+		{
+			get { return _AddType; }
+			set { _AddType = value; }
+		}
+		private int? _FromType = null;
+		public int? FromType
+		{
+			get { return _FromType; }
+			set { _FromType = value; }
+		}
+		private int? _Type = null;
+		public int? Type
+		{
+			get { return _Type; }
+			set { _Type = value; }
+		}
+		private DateTime _DTS;
+		public DateTime DTS
+		{
+			get { return _DTS; }
+			set { _DTS = value; }
+		}
+		private string _UserID;
+		public string UserID
+		{
+			get { return _UserID; }
+			set { _UserID = value; }
+		}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
 		#endregion
-		#region PastingPartCriteria
-		[Serializable()]
+	}
+	#endregion
+	#region PastingPartCriteria
+	[Serializable()]
 		public class PastingPartCriteria
 		{
 			#region Properties
@@ -2364,6 +2474,14 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
+		// C2017-031:  Support for paste/replace an enhanced step
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2525,8 +2643,16 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newItemInfo = null;
 			try
 			{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-				if (newItemInfo == null) return null;
+				// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+				if (itemInfo.IsEnhancedStep)
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+					if (newItemInfo == null) return null;
+				}
+				else
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+				}
 			}
 			catch (Exception ex1)
 			{

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

@@ -1132,91 +1132,6 @@ 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/DisplayTabControl.cs

@@ -16,12 +16,6 @@ namespace Volian.Controls.Library
 	public delegate ItemInfo DisplayTabControlEditorSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate void DisplayTabControlEvent(object sender, EventArgs args);
 	public delegate void DisplayTabControlStatusEvent(object sender, DisplayTabControlStatusEventArgs args);
-	public class DisplayTabData
-	{
-		public int ItemID { get; set; }
-		public string DisplayTabID { get; set; }
-		public string DisplayTabName { get; set; }
-	}
 	public partial class DisplayTabControlStatusEventArgs : EventArgs
 	{
 		private VolianStatusType _Type;
@@ -1151,9 +1145,6 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
-
-				List<DisplayTabData> DisplayTabs = new List<DisplayTabData>();
-
 				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1944,7 +1944,8 @@ namespace Volian.Controls.Library
 					sia.IdentifyChildren(highlight);
 				}
 			}
-			if (MyBeforeEditItems != null)
+			// C2017-031:  Support for paste/replace an enhanced step: don't identify/copy before items, i.e. notes/cautions
+			if (MyBeforeEditItems != null && !MyItemInfo.IsEnhancedStep)
 			{
 				foreach (EditItem sib in MyBeforeEditItems)
 				{

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -1231,7 +1231,7 @@ namespace Volian.Controls.Library
 		}
 		public ItemSelectedChangedEventArgs(EditItem myEditItem)
 		{
-			_MyItemInfo = myEditItem.MyItemInfo;
+			_MyItemInfo = myEditItem?.MyItemInfo;
 			_MyEditItem = myEditItem;
 		}
 	}

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -485,6 +485,8 @@ namespace Volian.Controls.Library
 		public void RefreshDisplay(bool activeMode)
 		{
 			if (IsExperimenting) return;
+			if (IsDisposed) return;
+
 			ActiveMode = activeMode;
 			OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
 			//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1750,7 +1750,7 @@ namespace Volian.Controls.Library
 			// note in follow if statements, 'setting' == false when in enhanced document:
 			if (setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0))	// this step is in enhanced, but not linked // B2018-112 and is allowed to edit
 				allowDel = true;	// allow delete if not linked
-			btnCpyStp.Enabled = setting;
+			btnCpyStp.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi); // C2017-031:  Support for paste/replace an enhanced step
 			//B20170-158 Allow a Unlinked Step to be pasted before or after a linked step.
 			StepTabPanel tmp = Parent as StepTabPanel;
 			//B2020-058: crash on null reference
@@ -1801,7 +1801,8 @@ namespace Volian.Controls.Library
 			btnPasteAfter.Enabled = btnCMPasteAfter.Enabled = enable;
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && !MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep;
+			// C2017-031:  Support for paste/replace an enhanced step, enable button
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -4110,9 +4111,19 @@ namespace Volian.Controls.Library
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(tmp.MyDisplayTabControl.MyCopyStep.ItemID, MyItemInfo, true);
 			EditItem oldEditItem = MyEditItem;
+			// C2017-031:  Support for paste/replace an enhanced step, if pasting an enhanced, remove its EditItem from the 'cache'.  A new EditItem gets created during paste.
+			if (MyEditItem != null && MyEditItem.MyItemInfo.IsEnhancedStep) MyEditItem.MyStepPanel._LookupEditItems.Remove(MyEditItem.MyItemInfo.ItemID);
 			MyEditItem = MyEditItem.PasteReplace(tmp.MyDisplayTabControl.MyCopyStep.ItemID);
 			if (MyEditItem == null) oldEditItem.IdentifyMe(false); // B2017-179 if null then we didn't do the replace but did position to the first transition that needs resolved
-			if (MyEditItem != null && MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, add Dispose of old EditItem if enhanced
+			if (MyEditItem != null && ((MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) || MyEditItem.MyItemInfo.IsEnhancedStep))
+				oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, refresh ItemInfo's in user interface caches.
+			if (MyEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				MyEditItem.MyItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+				tmp.MyStepPanel.SelectedItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+			}
 		}
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)