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

Merging all items through B2024-041 from development into master after successful testing.

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1320,6 +1320,10 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
+			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
+			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
+			//	for procedures.
+			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}
 
 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -346,10 +346,11 @@ namespace Volian.Controls.Library
 								ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
 								chld = ch.children;
 								// build a list of ROs to search
-								return _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
-								//return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld);
-								//if (strRtnStr.EndsWith(","))
-								//	strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
+								// B2022-118: remove the ending comma otherwise query will fail
+								string strRtnStr = _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
+								if (strRtnStr.EndsWith(","))
+									strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
+								return strRtnStr;
 							}
 						}
 					}
@@ -1939,6 +1940,13 @@ namespace Volian.Controls.Library
 		private string GetROsToSearch(ROFSTLookup.rochild[] chld)
 		{
 			string rtnstr = string.Empty;
+			// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
+			if ((chld == null || chld.Length <= 0) && (cmboTreeROs.SelectedNode.Nodes != null || cmboTreeROs.SelectedNode.Nodes.Count >= 1))
+			{
+				ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
+				MyROFSTLookup.LoadChildren(ref ro);
+				chld = ro.children;
+			}
 
 			// B2022-026 RO Memory Reduction code - check children length
 			if (chld == null || chld.Length <= 0) // get a single ROID
@@ -1956,7 +1964,17 @@ namespace Volian.Controls.Library
 					if (roc.children != null && roc.children.Length > 0)
 						rtnstr += GetROsToSearch(roc.children);
 					else
-						rtnstr += ROFSTLookup.FormatRoidKey(roc.roid, false);
+					{
+						// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
+						ROFSTLookup.rochild rot = roc;
+						MyROFSTLookup.LoadChildren(ref rot);
+						chld = rot.children;
+
+						if (rot.children != null && rot.children.Length > 0)
+							rtnstr += GetROsToSearch(rot.children);
+						else
+							rtnstr += string.Format("{0},", ROFSTLookup.FormatRoidKey(roc.roid, false));
+					}
 				}
 			}
 

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -669,7 +669,7 @@ namespace Volian.Controls.Library
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
 
-			if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
+			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
@@ -708,6 +708,11 @@ namespace Volian.Controls.Library
 					return true;
 				}
 			}
+			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
+			{
+				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
+				return false; //B2017-179 PasteReplace will return null if was aborted
+			}
 			return false;
 		}
 

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1825,8 +1825,16 @@ namespace Volian.Controls.Library
 			EditItem newFocus = null;
 			EditItem nextEditItem = MyNextEditItem;
 			EditItem prevEditItem = MyPreviousEditItem;
-			if (MyStepPanel?.SelectedEditItem?.ActiveParent == null) return null; //Was causing an error when active parent was null and the replaced proc was opened in the editor.
-			EditItem parentEditItem = ActiveParent;
+			EditItem parentEditItem = null; // ActiveParent;
+			try
+			{
+				parentEditItem = ActiveParent ?? MyStepPanel?.SelectedEditItem?.ActiveParent;
+			}
+			catch (NullReferenceException)
+			{
+				// KL 7/11/2024 - Handle the case where ActiveParent throws a Null Reference Exception
+				parentEditItem = MyStepPanel?.SelectedEditItem?.ActiveParent; 
+			}
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
 			int TopMostYBefore = TopMostEditItem.Top;