Merge branch 'Development' into B2026-053-Find-Unlinked-Values-of-Selected

good for testing

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2148,7 +2148,7 @@ namespace VEPROMS
 						//C2019-036 View Only mode work with Checked Out Procedures
 						// View Only Mode is no longer checked out, so no longer has an OwnerID
 						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}

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

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

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

@@ -262,8 +262,10 @@ namespace VEPROMS.CSLA.Library
                     if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
                     {
                         dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
-                        SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                     }
+					// B2026-066 moved this out of if statement above
+					// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
+                    SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                 }
             }
 

PROMS/Volian.Controls.Library/DSOTabPanel.cs

@@ -613,8 +613,16 @@ namespace Volian.Controls.Library
             _In_DSOTabPanel_Enter = false;
             _MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem;
             // B2018-070 Position the text cursor - Activate MS Word Panel
+            try
+            {
                 _MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
             }
+            catch 
+            {
+                //B2026-067 - Do nothing if cannot Position cursor
+            }
+
+        }
         #endregion
         #region Public Methods
         private bool _IsBeingDeleted = false;

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -2078,8 +2078,8 @@ namespace Volian.Controls.Library
 
 					if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
 					{
-						string ROSearchList2 = exactsearch(ROSearchList); // match exact string
-						// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+						string ROSearchList2 = exactsearch(ROSearchList); // B2026-053 match exact string
+						// B2022-031 - added a exactsearch to filter out procedure and section titles from global search results.
 						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 						cmbResultsStyleIndex = 3;  // display step text in results
 					}
@@ -2193,18 +2193,21 @@ namespace Volian.Controls.Library
 
 		private string exactsearch(string SearchString)  // B2026-053
 		{
-			string ss = "";
+			StringBuilder ss = new StringBuilder();
 			int sl = SearchString.Length;
 			int LstIdxSp = SearchString.LastIndexOf(' ');
 			if (sl == LstIdxSp + 1) // B2026-053 if ' ' the last char.
 			{
-					ss = ' ' + SearchString; //add a space prefix to make the search exact if the end of the search string is a space.
+				ss.Append(' ');
+				ss.Append(SearchString); // B2026-053 add a space prefix to make the search exact if the end of the searchString is a space.
 			}
 			else
 			{
-					ss = ' ' + SearchString + ' '; // Exact match add spaces before and after search string.				
+				ss.Append(' ');
+				ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString.
+				ss.Append(' ');
 			}
-			return ss;
+			return ss.ToString();
 		}
 
 		private void ClearResults()     // B2021-103 if no results when RNO only, clear results list.  (moved from btnSearch_Click)

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

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

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

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