C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS

.gitattributes

@@ -1,6 +0,0 @@
-# ---> VisualStudio
-## Show diffs for xml files in GIT
-##
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitattributes
-
-*.xml text

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.2410.907")]
-[assembly: AssemblyFileVersion("2.3.2410.907")]
+[assembly: AssemblyVersion("2.3.2404.1611")]
+[assembly: AssemblyFileVersion("2.3.2404.1611")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -91,8 +91,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

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

@@ -100,7 +100,6 @@ using System.Text;
 using RODBInterface;
 using ROFields;
 using VlnStatus;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -246,37 +245,6 @@ 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();
@@ -464,7 +432,6 @@ 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/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -151,7 +151,7 @@ namespace ROEditor
 		private string origMenuItem;
 		StringBuilder parseerror;
 		private int hi, lo;
-		private Label lb_chkApplc;
+		private Label lb_chkApplc; 
 		private int dbtype;
 		//  C2021-026 returns true is Parent/Child info was passed into the RO Editor
 		public bool PCApplicabilityEnabled
@@ -188,33 +188,33 @@ namespace ROEditor
 				lboxInUse.Visible = true;
 				lb_chkApplc.Visible = false;
 			}
-			if (editlevel == (uint)RecordType.GroupSchema) this.Text = "Subgroup Definition";
+			if (editlevel==(uint)RecordType.GroupSchema)this.Text = "Subgroup Definition";
 			FillInData(grptxt);
 		}
 
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose(bool disposing)
+		protected override void Dispose( bool disposing )
 		{
-			if (disposing)
+			if( disposing )
 			{
-				if (components != null)
+				if(components != null)
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose(disposing);
+			base.Dispose( disposing );
 		}
-
+		
 		private void FillInAvailable()
 		{
 			ROField rof;
-
+			
 			// put the items in the AvailList box.
-			for (int i = 0; i < AvailList.Count; i++)
+			for (int i=0; i< AvailList.Count; i++)
 			{
-				rof = (ROField)AvailList[i];
+				rof = (ROField) AvailList[i];
 				if (rof.GetFieldname != null)   // DO YET: Why null?
 					this.lboxAvail.Items.Add(rof.GetFieldname);
 			}
@@ -277,7 +277,7 @@ namespace ROEditor
 			_initializing = false;
 		}
 
-
+		
 		private void DoValueTextBoxes()
 		{
 			string menuitm, retval;
@@ -297,7 +297,7 @@ namespace ROEditor
 					else
 						parent = null;
 				}
-				if (menuitm != "")
+				if (menuitm !="")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
@@ -310,21 +310,21 @@ namespace ROEditor
 				this.lblRetVal.Visible = true;
 				VlnXmlElement parent;
 				parent = (VlnXmlElement) elem.ParentNode;
-				while (parent != null && (menuitm == "" || retval == ""))
+				while (parent != null && (menuitm == "" || retval==""))
 				{
 					// walk up tree to get parent and check for data there
 					if (menuitm == "") menuitm = parent.GetAttribute("MenuItem");
 					if (retval == "") retval = parent.GetAttribute("RetVal");
 					if (parent.Name != "RO_Root")
-						parent = (VlnXmlElement)parent.ParentNode;
+						parent = (VlnXmlElement) parent.ParentNode;
 					else
 						parent = null;
 				}
-				if (menuitm != "")
+				if (menuitm!="")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
-				if (retval != "")
+				if (retval!="")
 					this.tbRetVal.Text = CvtFldToUserFld(retval);
 				else
 					this.tbRetVal.Text = "";
@@ -332,7 +332,7 @@ namespace ROEditor
 		}
 
 		private void FillInData(string grptxt)
-		{
+		{	
 			this.lblGroupText.Text = grptxt;
 			DoValueTextBoxes();
 			SetUpListBoxes();
@@ -344,27 +344,24 @@ namespace ROEditor
 
 			lboxAvail.GotFocus += new EventHandler(this.lboxAvail_GotFocus);
 
-			lboxInUse.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUse_MouseUp);
-			lboxInUseCB.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUseCB_MouseUp);
-
 			// save copies of local data, so if there is a change, we know we must save them.
-			origRetVal = this.tbRetVal.Text;
-			origMenuItem = this.tbMenuVal.Text;
-
+			origRetVal=this.tbRetVal.Text;
+			origMenuItem=this.tbMenuVal.Text;
+			
 			// if this is a database level definition & it's a user defined database,
 			// the okay button is disabled until a field is used.
-			if (elem.ParentNode.Name == "RO_Root" && dbtype == 3)
+			if (elem.ParentNode.Name == "RO_Root" && dbtype==3)
 			{
 				string attr;
-				if (editlevel == (uint)RecordType.Schema)
+				if (editlevel==(uint)RecordType.Schema)
 					attr = elem.GetAttribute("FieldsInUse");
 				else
 					attr = elem.GetAttribute("GroupFieldsInUse");
-				if (attr == null || attr == "") btnOK.Enabled = false;
+				if (attr==null || attr=="") btnOK.Enabled=false;
 			}
-		}
+		}	
 
-		protected void lboxInUse_GotFocus(object sender, EventArgs e)
+		protected void lboxInUse_GotFocus (object sender, EventArgs e)
 		{
 			lboxAvail.ClearSelected();
 			this.btnRemove.Enabled = true;
@@ -378,7 +375,7 @@ namespace ROEditor
 			this.btnAdd.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
-		protected void lboxAvail_GotFocus(object sender, EventArgs e)
+		protected void lboxAvail_GotFocus (object sender, EventArgs e)
 		{
 			if (PCApplicabilityEnabled)
 				lboxInUseCB.ClearSelected();
@@ -388,103 +385,6 @@ namespace ROEditor
 			this.btnRemove.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
-
-		//CSM C2024-024
-		//Simple Selection of Fields to add to Return Values and Menu Values.
-		//Part of 2024 PROMS Upgrades
-		//Add Context Menu for In Use Listbox
-		//Will allow user to right click Selected Items
-		//and add then to the Return Value / Menu Value Text Boxes
-		//without re-typing them
-		protected void lboxInUse_MouseUp(object sender, MouseEventArgs e)
-		{
-			if (e.Button == MouseButtons.Right && lboxInUse.SelectedItems.Count > 0)
-			{
-				ContextMenuStrip cn = new ContextMenuStrip();
-				if (tbRetVal.Visible)
-				{
-					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
-					AddToReturnItem.Click += new EventHandler(lboxInUse_Click);
-					AddToReturnItem.Name = "Add to Return Value";
-					cn.Items.Add(AddToReturnItem);
-				}
-				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
-				AddToMenuItem.Click += new EventHandler(lboxInUse_Click);
-				AddToMenuItem.Name = "Add to Menu Value";
-				cn.Items.Add(AddToMenuItem);
-				this.lboxInUse.ContextMenuStrip = cn;
-				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
-			}
-		}
-		private void lboxInUse_Click(object sender, EventArgs e)
-		{
-			switch (((ToolStripMenuItem)sender).Name)
-			{
-				case "Add to Return Value":
-					if (tbRetVal.Text == "")
-						tbRetVal.Text += $"<{lboxInUse.SelectedItem}>";
-					else
-						tbRetVal.Text += $" - <{lboxInUse.SelectedItem}>";
-					break;
-				case "Add to Menu Value":
-					if (tbMenuVal.Text == "")
-						tbMenuVal.Text += $"<{lboxInUse.SelectedItem}>";
-					else
-						tbMenuVal.Text += $" - <{lboxInUse.SelectedItem}>";
-					break;
-
-			}
-		}
-
-		//CSM C2024-024
-		//Simple Selection of Fields to add to Return Values and Menu Values.
-		//Part of 2024 PROMS Upgrades
-		//Add Context Menu for In Use ComboBox
-		//(Replaces In Use Listbox when Applicability
-		//to allow for selection of items per Unit)
-		//Will allow user to right click Selected Items
-		//and add then to the Return Value / Menu Value Text Boxes
-		//without re-typing them
-		protected void lboxInUseCB_MouseUp(object sender, MouseEventArgs e)
-		{
-			if (e.Button == MouseButtons.Right && lboxInUseCB.SelectedItems.Count > 0)
-			{
-				ContextMenuStrip cn = new ContextMenuStrip();
-				if (tbRetVal.Visible)
-				{
-					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
-					AddToReturnItem.Click += new EventHandler(lboxInUseCB_Click);
-					AddToReturnItem.Name = "Add to Return Value";
-					cn.Items.Add(AddToReturnItem);
-				}
-				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
-				AddToMenuItem.Click += new EventHandler(lboxInUseCB_Click);
-				AddToMenuItem.Name = "Add to Menu Value";
-				cn.Items.Add(AddToMenuItem);
-				this.lboxInUseCB.ContextMenuStrip = cn;
-				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
-			}
-		}
-		private void lboxInUseCB_Click(object sender, EventArgs e)
-		{
-			switch (((ToolStripMenuItem)sender).Name)
-            {
-				case "Add to Return Value":
-					if (tbRetVal.Text == "")
-						tbRetVal.Text += $"<{lboxInUseCB.SelectedItem}>";
-                    else
-						tbRetVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
-					break;
-				case "Add to Menu Value":
-					if (tbMenuVal.Text == "")
-						tbMenuVal.Text += $"<{lboxInUseCB.SelectedItem}>";
-					else
-                        tbMenuVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
-                    break;
-
-			}
-		}
-
 		private void btnRemove_Click(object sender, System.EventArgs e)
 		{
 			//get item in lboxInUse (in use list) and remove it from there
@@ -504,7 +404,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxAvail.Items.Add(copyrof.GetFieldname);
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -527,7 +427,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxAvail.Items.Add(copyrof.GetFieldname);
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -555,7 +455,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUseCB.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxInUseCB.Items.Add(copyrof.GetFieldname);
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUseCB.Refresh();
@@ -577,7 +477,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUse.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxInUse.Items.Add(copyrof.GetFieldname);
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUse.Refresh();
@@ -740,7 +640,7 @@ namespace ROEditor
 							{
 								ROField rof = (ROField) InUseList[i];
 								rofname = rof.GetFieldname;
-								if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
+								if (inusename == rofname)
 								{
 									found = true;
 									break;
@@ -845,7 +745,7 @@ namespace ROEditor
 				{
 					ROField rof = (ROField) InUseList[i];
 					rofname = rof.GetFieldname;
-					if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
+					if (inusename == rofname)
 					{
 						found = true;
 						break;
@@ -1196,8 +1096,7 @@ namespace ROEditor
 					return;
 				}
 			}
-
-			string origname = CvtFldToUserFld(rof.GetFieldname);
+			
 			uint ftype = rof.GetFieldType;
 			if (ftype == (uint)FieldTypes.FrmtSingleTxt || ftype == (uint)FieldTypes.VariableTxt ||
 				ftype == (uint)FieldTypes.SingleTxt || ftype == (uint)FieldTypes.Table || 
@@ -1213,10 +1112,6 @@ namespace ROEditor
 				nwcomb.ShowDialog();
 			}
 
-			//need to refresh pull from table for fields in use.
-			_ = myrodb.RODB_GetFields(elem, 0, true);
-			string newname = CvtFldToUserFld(rof.GetFieldname);
-
 			// Update Lists & Text boxes to represent any modified text.
 			if (isInSelList)
 			{
@@ -1230,28 +1125,20 @@ namespace ROEditor
 					rof = (ROField) InUseList[i];
 					if (rof.GetFieldname != null)
 					{
-						string fieldname = CvtFldToUserFld(rof.GetFieldname);
-
 						// C2021-026 if doing Parent/Child enabled RO Editor, put the In Use fields in the Check Box List instead of the normal list
 						if (PCApplicabilityEnabled)
 						{
-							this.lboxInUseCB.Items.Add(fieldname);
+							this.lboxInUseCB.Items.Add(rof.GetFieldname);
 							if (rof.FieldTypeCanDoApplicability())
 							{
 								if (ContainedInUseApplicList(rof))
-									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(fieldname), CheckState.Checked);
+									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(rof.GetFieldname), CheckState.Checked);
 							}
 						}
 						else
-							this.lboxInUse.Items.Add(fieldname);
+							this.lboxInUse.Items.Add(rof.GetFieldname);
 					}
 				}
-
-				if (origname != newname)
-				{
-					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
-					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
-				}
 			}
 			else 
 			{
@@ -1261,7 +1148,7 @@ namespace ROEditor
 				{
 					rof = (ROField) AvailList[i];
 					if (rof.GetFieldname != null)
-						this.lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
+						this.lboxAvail.Items.Add(rof.GetFieldname);
 				}
 			}
 		}
@@ -1275,11 +1162,8 @@ namespace ROEditor
 			if (rof.GetFieldname != null)
 			{
 				AvailList.Add(rof);
-				lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
+				lboxAvail.Items.Add(rof.GetFieldname);
 			}
-
-            //need to refresh pull from table for fields in use.
-            _ = myrodb.RODB_GetFields(elem, 0, true);
 		}
 		// C2021-026 Check/un-check field for Parent/Child values
 		private void lboxInUseCB_ItemCheck(object sender, ItemCheckEventArgs e)
@@ -1513,7 +1397,6 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
-
 			// 
 			// RODefFrm
 			// 
@@ -1536,71 +1419,6 @@ namespace ROEditor
 			this.PerformLayout();
 
 		}
-
-		//if User clicked save (DialogResult.OK) close the form
-		//if use did not click save, ask if they are sure they want to close the form
-		//only close if they say "Yes, they want to"
-		protected override void OnFormClosing(FormClosingEventArgs e)
-		{
-			if (this.DialogResult != System.Windows.Forms.DialogResult.OK && IsPendingChange() && !CloseCancel())
-			{
-				e.Cancel = true;
-			}
-		}
-
-		public static bool CloseCancel()
-		{
-			const string message = "Are you sure that you would like to cancel? Information may not be saved.";
-			const string caption = "Cancel";
-			var result = MessageBox.Show(message, caption,
-										 MessageBoxButtons.YesNo,
-										 MessageBoxIcon.Question);
-
-            return result == DialogResult.Yes;
-        }
-
-		//return true if a field has been modified
-		private bool IsPendingChange()
-		{
-			if (origRetVal != this.tbRetVal.Text)
-				return true;
-			
-			if (origMenuItem != this.tbMenuVal.Text)
-				return true;
-
-			// check if in use records have changed
-			string inuserecs = null;
-			ROField rof;
-			for (int i = 0; i < InUseList.Count; i++)
-			{
-				rof = (ROField)InUseList[i];
-				if (rof.GetFieldname != null)   //DO YET: why null?
-				{
-					inuserecs = inuserecs + rof.GetRecID;
-					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
-				}
-			}
-			if (inuserecs != origFieldsInUse)
-				return true;
-
-
-			//check if applicability fields have changed
-			string applicfieldrecs = null;
-			for (int i = 0; i < InUseApplcList.Count; i++)
-			{
-				rof = (ROField)InUseApplcList[i];
-				if (rof.GetFieldname != null)
-				{
-					applicfieldrecs = applicfieldrecs + rof.GetRecID;
-					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
-				}
-			}
-			if (applicfieldrecs != origApplicFields)
-				return true;
-
-			//nothing has changed
-			return false;
-		}
 		#endregion
 	}
 }

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -339,7 +339,7 @@ namespace RODBInterface
 		public abstract bool RODB_WriteRO(VlnXmlElement ro);
 		public abstract bool RODB_InsertRO(VlnXmlElement ro);
 		public abstract ushort RODB_GetFieldType(VlnXmlElement elem, string TableName, string Fld);
-		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false);
+		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype);
 		public abstract string RODB_GetSchemaPiece(string Recid, string table);
 		public abstract bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype);
 		public abstract bool RODB_WriteSchemaPiece(string Recid, string table, string schpiece);
@@ -2294,16 +2294,11 @@ namespace RODBInterface
 		}
 
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
-			else if (refresh)
-			{
-				FieldDefinitions.Remove(table);
-				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
-			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -1744,18 +1744,13 @@ namespace RODBInterface
 			return ftype;
 		}
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 			{
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
 			}
-			else if (refresh)
-			{
-				FieldDefinitions.Remove(table);
-				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
-			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -85,7 +85,7 @@ namespace VlnStatus
 			this.lblStatMsg.Name = "lblStatMsg";
 			this.lblStatMsg.Size = new System.Drawing.Size(420, 81);
 			this.lblStatMsg.TabIndex = 0;
-			this.lblStatMsg.Text = "Put Status Message Here";
+			this.lblStatMsg.Text = "Put Satus Message Here";
 			this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// StatusMessageFrm

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 ISNULL(@xconfig.exist('//Enhanced[1]'),0) = 0
+		IF @xconfig.exist('//Enhanced[1]') = 0
 		BEGIN
 		  UPDATE Contents SET Config = dbo.vefn_RemoveEnhanced(Contents.Config)
 		    Where ContentID in (Select ContentID FROM vefn_ChildItems(@NewItemID))
@@ -24001,38 +24001,6 @@ 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
@@ -24072,8 +24040,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	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'
+	set @RevDate = '09/26/2024 11:24'
+	set @RevDescription = 'SQL to allow copy/replace enhanced step.'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1654,10 +1654,6 @@ namespace VEPROMS
 			// B2017-214 added a null reference check
 			// B2010-071 Since we cannot tell if the user click on the X in Word or the X in PROMS, ask if the current tab
 			//           should be closed or if we should exit PROMS or just Cancel to continue working
-			if (tc._MyDisplayTabItems.Count < 1) // If all thabs are closed in the editor will indicate that in the database.
-			{
-				VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
-			}
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
@@ -1680,25 +1676,23 @@ namespace VEPROMS
 				{
 					// 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;
+
+					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);
+					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);
-						}
+					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;
@@ -2353,7 +2347,6 @@ namespace VEPROMS
 
 		public void openDisplaytabstate()
 		{
-			// Retrieve edit tab state from database.
 			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
 		
 			if (DisPlayTabState.Rows.Count > 0)
@@ -2361,11 +2354,11 @@ namespace VEPROMS
 				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);
-					// Open procedure in the editor.
+					//ItemInfo.Get
+					//ItemInfo.Get
 					OpenItem(_Procedure);
-					// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
-					SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
 				}
 			}
 		}

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

@@ -1165,17 +1165,13 @@ namespace VEPROMS.CSLA.Library
 					{
 						int sp = odte.Link.IndexOf(" ") + 1;   // get past tran type
 						string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp);
-
-						//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
-						if (int.TryParse(srecid, out recid))
+						recid = System.Convert.ToInt32(srecid);
+						foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 						{
-							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
+							if (ct.TransitionID == recid)
 							{
-								if (ct.TransitionID == recid)
-								{
-									itm.MyContent.ContentTransitions.Remove(ct);
-									break;
-								}
+								itm.MyContent.ContentTransitions.Remove(ct);
+								break;
 							}
 						}
 					}
@@ -1660,15 +1656,7 @@ namespace VEPROMS.CSLA.Library
 		private string FixTransition(string link, string text)
 		{
 			if (link.IndexOf("<NewID>") != -1) return text;
-
-			//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
-			int transitionID;
-			string[] splt_link = link.Split(' ');
-			if (splt_link.Length < 2 || !int.TryParse(splt_link[1], out transitionID))
-			{
-				return text;
-			}
-
+			int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
 			// Find the transition
 			if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
 			{

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

@@ -1876,10 +1876,6 @@ 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:
@@ -1897,15 +1893,12 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
-					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();
-					}
+					sc.AddEnhancedDocument(0, this.ItemID);
+					sc.SaveEnhancedDocuments();
+					ei.MyContent.Text = DisplayText;
+					ei.MyContent.Config = sc.ToString();
+					ei.Save();
+					enhii.RefreshConfig();
 				}
 			}
 			else if (IsSection)
@@ -1923,15 +1916,12 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
-					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();
-					}
+					sc.AddEnhancedDocument(0, this.ItemID);
+					sc.SaveEnhancedDocuments();
+					ei.MyContent.Text = DisplayText;
+					ei.MyContent.Config = sc.ToString();
+					ei.Save();
+					enhii.RefreshConfig();
 				}
 			}
 			else if (IsProcedure)
@@ -1952,66 +1942,16 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
-					{
-						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());
@@ -2133,72 +2073,9 @@ 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
-	}
-	#endregion
-	#region PastingPartCriteria
-	[Serializable()]
+		#region PastingPartCriteria
+		[Serializable()]
 		public class PastingPartCriteria
 		{
 			#region Properties
@@ -2487,14 +2364,6 @@ 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;
@@ -2656,16 +2525,8 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newItemInfo = null;
 			try
 			{
-				// 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;
-				}
+				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
+				if (newItemInfo == null) return null;
 			}
 			catch (Exception ex1)
 			{

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -16,6 +16,12 @@ 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;
@@ -1145,6 +1151,9 @@ 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

@@ -9,7 +9,6 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -894,18 +893,6 @@ 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";
@@ -1647,54 +1634,10 @@ 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.
-			//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);
-				}
-			}
-
+			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(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();
@@ -1741,15 +1684,12 @@ namespace Volian.Controls.Library
 				}
 			}
 		}
-		public void UnlinkEnhanced(EditItem enhII)
+		public void UnlinkEnhanced(ItemInfo enhII)
 		{
 			// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced
 			//	Pass in to unlink as before this change
-			// 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);
+			enhII.DoUnlinkEnhanced(enhII, 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)
 		{
@@ -1813,42 +1753,7 @@ 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.
-			//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);
-				}
-			}
-
+			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
 		public void PasteChild(int copyStartID)
@@ -2039,8 +1944,7 @@ namespace Volian.Controls.Library
 					sia.IdentifyChildren(highlight);
 				}
 			}
-			// C2017-031:  Support for paste/replace an enhanced step: don't identify/copy before items, i.e. notes/cautions
-			if (MyBeforeEditItems != null && !MyItemInfo.IsEnhancedStep)
+			if (MyBeforeEditItems != null)
 			{
 				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,8 +485,6 @@ 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

@@ -337,10 +337,8 @@ 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);
+						MyEditItem.UnlinkEnhanced(MyEditItem.MyItemInfo);
 				}
 			}
 			else
@@ -1752,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 = MyUserInfo.IsAllowedToEdit(Mydvi); // C2017-031:  Support for paste/replace an enhanced step
+			btnCpyStp.Enabled = setting;
 			//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
@@ -1803,8 +1801,7 @@ 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
-			// C2017-031:  Support for paste/replace an enhanced step, enable button
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && !MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep;
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -4113,19 +4110,9 @@ 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
-			// 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);
-			}
+			if (MyEditItem != null && MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) oldEditItem.Dispose();
 		}
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)