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

Merging from dev into master after successful testing.

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1099,7 +1099,9 @@ namespace VEPROMS
 					(int)changeBarData.FixedChangeColumn :
 					System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 				//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
-				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
+				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
+					cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
+				else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 
 			}

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -418,7 +418,8 @@ namespace VEPROMS
 			cmMembers.Items.Clear();
 			lstGroups.SelectedIndex = -1;
 
-			if (e.Button == MouseButtons.Right)
+			//shouldn<64>t be bringing up a menu in the Group box unless a user is 1st selected in the Users box.
+			if (e.Button == MouseButtons.Right && lstUsers.SelectedIndex > -1)
 			{
 				int k = lstGroups.IndexFromPoint(e.Location);
 				if (k >= 0)

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -554,10 +554,23 @@ namespace VEPROMS
 			tv.CreateContinuousActionSummary += new vlnTreeViewEvent(tv_CreateContinuousActionSummary);
 			tv.SelectDateToStartChangeBars += tv_SelectDateToStartChangeBars;
 			tv.CreateTimeCriticalActionSummary += new vlnTreeViewEvent(tv_CreateTimeCriticalActionSummary);
+			tv.RefreshFormats += new vlnTreeViewStatusEvent(RefreshFormats);
 
 			displayBookMarks.ResetBookMarksInPROMSWindows += displayBookMarks_ResetBookMarksInPROMSWindows;
 		}
 
+		//C2021-035 Add Refresh Tree Option at highest level
+		void RefreshFormats(object sender, vlnTreeStatusEventArgs args)
+		{
+			Format.ClearFormatCache();
+			FormatInfo.ClearFormatInfoCache();
+			FormatInfo.Reset();
+			FormatInfoList.Reset();
+			Format.Reset();
+			FormatList.Reset();
+			displaySearch1.SetupContextMenu();
+		}
+
 		// Part of Separate Windows upgrade C2015-022
 		// Extend Changes to BookMark information to all of the child windows
 		void displayBookMarks_ResetBookMarksInPROMSWindows(object sender, EventArgs args)

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

@@ -765,6 +765,19 @@ namespace VEPROMS.CSLA.Library
 				foreach (DocVersionInfo dvi in _CacheByPrimaryKey[key])
 					dvi.ResetProcedures();
 		}
+
+		//C2021-035 Add Refresh Tree Option at highest level
+		public static void ResetAllProcedures()
+		{
+			foreach (string key in _CacheByPrimaryKey.Keys)
+            {
+                foreach (DocVersionInfo dvi in _CacheByPrimaryKey[key])
+					dvi.ResetProcedures();
+            }
+
+			foreach (DocVersionInfo dvi in _CacheList)
+					dvi.ResetProcedures();
+		}
 		#region IVEReadOnlyItem
 		public System.Collections.IList GetChildren()
 		{

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

@@ -275,6 +275,14 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
+		//C2021-035 Add Refresh Tree Option at highest level
+		public static void Reset()
+		{
+			_LookupFormats?.Clear();
+			_LookupFormats = null;
+			_ = LookupFormats;
+		}
+
 		private static Format AddFormatToDB(Format parent, string format, bool issub, DateTime Dts, string Userid, string fmtPath, string genmacPath)
 		{
 			string fmtdata = null;
@@ -509,6 +517,11 @@ public partial class FormatInfo : IFormatOrFormatInfo
 				return _PROMSBaseFormat; 
 			}
 		}
+        public static void Reset()
+        {
+            _PROMSBaseFormat = null;
+        }
+
         public static FormatInfo Get(string name)
 		{
 			try

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

@@ -97,6 +97,12 @@ namespace VEPROMS.CSLA.Library
 				if (formatInfo != null && formatInfo.ToString() == formatName) return formatInfo.Get();
 			return null;
 		}
+		//C2021-035 Add Refresh Tree Option at highest level
+		public static void Reset()
+        {
+			_MyFormatInfoList?.Clear();
+			_MyFormatInfoList = null;
+		}
 	}
 	public class DocStyleListConverter : System.ComponentModel.StringConverter
 	{

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

@@ -1145,6 +1145,10 @@ namespace VEPROMS.CSLA.Library
 					{
 						//string thisTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
 						string thisTab = pitem.MyTab.CleanText;// StepInfo.Get(pitem.ItemID).MyTab.CleanText;
+						//B2025-058 remove continuous action indicator
+						string medittag = pitem.FormatStepData.TabData.MacroEditTag;
+						if (medittag != null && thisTab.StartsWith(medittag))
+							thisTab = thisTab.Substring(medittag.Length);
 						// remove delimiters of '.' and ')' in tab.
 					if (!hasDelim)
 						{

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

@@ -502,6 +502,15 @@ namespace VEPROMS.CSLA.Library
             _FolderInfoExtension.Refresh(this);
             OnChange();// raise an event
         }
+
+        //C2021-035 Add Refresh Tree Option at highest level
+        public static void ClearFolderInfoCache()
+        {
+            _CacheByPrimaryKey.Clear();
+            while (_CacheList.Count > 0)
+            { _CacheList[0].Dispose(); }
+        }
+
         public static FolderInfo Get(int folderID)
         {
             //if (!CanGetObject())

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

@@ -143,6 +143,14 @@ namespace VEPROMS.CSLA.Library
             if (_CacheByParentID_Name.ContainsKey(key)) return _CacheByParentID_Name[key][0];
             return null;
         }
+
+        //C2021-035 Add Refresh Tree Option at highest level
+        public static void ClearFormatCache()
+        {
+            _CacheByPrimaryKey.Clear();
+            while (_CacheList.Count > 0)
+            { _CacheList[0].Dispose(); }
+        }
         #endregion
         #region Business Methods
         private string _ErrorMessage = string.Empty;

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

@@ -71,6 +71,13 @@ namespace VEPROMS.CSLA.Library
             if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
             return null;
         }
+        //C2021-035 Add Refresh Tree Option at highest level
+        public static void ClearFormatInfoCache()
+        {
+            _CacheByPrimaryKey.Clear();
+            while (_CacheList.Count > 0)
+            { _CacheList[0].Dispose(); }
+        }
         #endregion
         #region Business Methods
         private string _ErrorMessage = string.Empty;

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

@@ -188,7 +188,6 @@ namespace Volian.Controls.Library
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel5);
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel2);
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel3);
-			this.tabSearchTypes.Controls.Add(this.tabControlPanel1);
 			this.tabSearchTypes.Controls.Add(this.contextMenuBar1);
 			this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top;
 			this.tabSearchTypes.Location = new System.Drawing.Point(0, 0);
@@ -983,7 +982,6 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
 			this.tabControlPanel1.Controls.Add(this.groupBox1);
 			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
 			this.tabControlPanel1.Name = "tabControlPanel1";
 			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
@@ -997,6 +995,8 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Style.GradientAngle = 90;
 			this.tabControlPanel1.TabIndex = 17;
 			this.tabControlPanel1.TabItem = this.tabIncTrans;
+			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			// 
 			// btnTranCvtSelToTxt
 			// 
@@ -1732,6 +1732,12 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.xpStepTypes);
 			this.Controls.Add(this.xpSetToSearch);
 			this.Controls.Add(this.tabSearchTypes);
+			this.Controls.Add(this.tabControlPanel1);
+			//B2025-056 Click on Incoming Transitions
+			// This needs to be part of overall control
+			// since if it is part of tabSearchTypes,
+			// then when that is disabled, buttons on
+			// this will be also
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplaySearch";
 			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -1857,14 +1857,15 @@ namespace Volian.Controls.Library
 				lbSrchResultsIncTrans.Enabled = false;
 				lbSrchResultsIncTrans.UseWaitCursor = true;
 			}
-			ListBox mylb = sender as ListBox;
+			//B2025-056 Click on Incoming Transitions
+			// Clicking on Incoming Transitions
+			// will now open that item
+			ListBox mylb_lbSrchResults = sender as ListBox;
+			ListBoxAdv mylb_lbSrchResultsIncTrans = sender as ListBoxAdv;
 
 			// If the list is being refreshed, then set the selection index to -1 (no selection)
 			// B2022-044: don't set selection to top of list (commented out/changed if)
-			//if (mylb != null && _SearchResults.RefreshingList && mylb.SelectedIndex != -1)
-			//	//mylb.SelectedIndex = -1;
-			//else
-			if (mylb != null && !_SearchResults.RefreshingList)
+			if ((mylb_lbSrchResults != null || mylb_lbSrchResultsIncTrans != null) && !_SearchResults.RefreshingList)
 			{
 				_ItemInfo = (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) ? lbSrchResultsIncTrans.SelectedValue as ItemInfo : lbSrchResults.SelectedValue as ItemInfo;
 				if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null))

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -4190,15 +4190,19 @@ namespace Volian.Controls.Library
 			if (oring == eEventSource.Keyboard)
 				_OringFlg = 1;
 
+			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
+			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 		}
 
 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
+			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
+			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 		}
 

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1269,6 +1269,11 @@ namespace Volian.Controls.Library
 					if (ok)
 						if (pia == null && tn.VEObject as StepInfo == null) cm.MenuItems.Add("Properties...", new EventHandler(mi_Click));
 					#endregion
+					#region Refresh_Tree
+					//C2021-035 Add Refresh Tree Option at highest level
+					if (tn == (VETreeNode)Nodes[0])
+						cm.MenuItems.Add("Refresh Tree", new EventHandler(mi_Click));
+					#endregion
 					//_MyLog.WarnFormat("Context Menu 7 - {0}", GC.GetTotalMemory(true));
 
 					if (fi != null && fi.HasWorkingDraft)
@@ -2352,6 +2357,10 @@ namespace Volian.Controls.Library
 				case "Print All Approved Procedures": //C2025-017 print all approved procedures
 					OnPrintAllApprovedProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
+				//C2021-035 Add Refresh Tree Option at highest level
+				case "Refresh Tree":
+					RefreshTree();
+					break;
 				default:
 					if (mi.Text.StartsWith("Showing Change Bars Starting"))
 						OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -3926,6 +3935,13 @@ namespace Volian.Controls.Library
 			if (Processing != null)
 				Processing(this, new vlnTreeStatusEventArgs(status, message));
 		}
+		//C2021-035 Add Refresh Tree Option at highest level
+		public event vlnTreeViewStatusEvent RefreshFormats;
+		private void OnRefreshFormats(bool status, string message)
+		{
+			if (RefreshFormats != null)
+				RefreshFormats(this, new vlnTreeStatusEventArgs(status, message));
+		}
 		#endregion
 		#region SetLastValuesAndSaveIfChangedStuff
 		private void SetLastValues(VETreeNode node)
@@ -4648,6 +4664,36 @@ namespace Volian.Controls.Library
 				if (myFolder.FolderID == ((FolderInfo)obj2).FolderID) return true;
 			return false;
 		}
+
+		//C2021-035 Add Refresh Tree Option at highest level
+		public void RefreshTree()
+        {
+			//reload the base node
+			VETreeNode tbase = (VETreeNode) Nodes[0];
+			tbase.ChildrenLoaded = false;
+
+			//Refresh the formats
+			OnRefreshFormats(true, "Refreshing Formats");
+
+			//reset the procedure lists so db is re-queried in case they changed
+			//also clear other caches in case added steps / sections / etc...
+			PartInfo.ClearPartInfoCache();
+			ItemInfo.ClearItemInfoCache();
+			DocVersionInfo.ResetAllProcedures();
+			FolderInfo.ClearFolderInfoCache();
+
+			//Refresh the base VEPROMS object
+			var fldr = tbase.VEObject as FolderInfo;
+			if (fldr != null)
+			{
+				Invoke((Action)(() => { tbase.VEObject = FolderInfo.Get(fldr.FolderID); }));
+			}
+
+			//refresh the tree
+			Invoke((Action)(() => { tbase.RefreshNode(); }));
+			this.Invoke((Action)(() => { this.Update(); }));
+		}
+
 	}
 	#region DragHelper
 	public class DragHelper