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

Merging 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/dlgApproveProcedure.cs

@@ -13,6 +13,8 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
+using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -1321,6 +1323,26 @@ namespace VEPROMS
 
 					// Clear the change bar override for this procedure:
 					pi.ClearChangeBarOverrides();
+
+					//B2019-140 Change bars do not get refreshed when approval is run.
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
+					DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
+					if (dti != null)
+					{
+						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
+							dti.MyStepTabPanel.MyStepPanel.Focus();
+
+						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+					}
+
+					//since in a separate form, need to update the tree view
+					//so "Showing Change Bars" Content Menu Item is correct
+					MyFrmVEPROMS.RefreshProcedureNode(newproc);
 				}
 				else
 					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);

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

@@ -98,6 +98,8 @@ namespace VEPROMS
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest += MyStepTabRibbon_ContActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.AddProcToDVInTree -= new StepTabRibbonEvent(MyStepTabRibbon_AddProcToDocVersionInTree);
 					_SelectedStepTabPanel.MyStepTabRibbon.AddProcToDVInTree += new StepTabRibbonEvent(MyStepTabRibbon_AddProcToDocVersionInTree);
+					_SelectedStepTabPanel.MyStepTabRibbon.EnableDisableStepProperties -= EnableDisableStepProperties;
+					_SelectedStepTabPanel.MyStepTabRibbon.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
 					// F2022-024 Time Critical Action Summary
 					_SelectedStepTabPanel.MyStepTabRibbon.TimeCriticalActionSummaryRequest -= MyStepTabRibbon_TimeCriticalActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.TimeCriticalActionSummaryRequest += MyStepTabRibbon_TimeCriticalActionSummaryRequest;
@@ -119,7 +121,7 @@ namespace VEPROMS
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
-			
+
 			DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
@@ -372,12 +374,12 @@ namespace VEPROMS
 			cmbFont.SelectedIndex = -1;
 			string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
 			string db = Volian.Base.Library.VlnSettings.GetDB();
-			
+
 			if (db != null)
 				Database.SelectedDatabase = db;
 
 			//B2018-129 Most Recently Used list was being cleared. Needed to remove a (string) type case in the IF statement
-			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"])) 
+			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"]))
 				Database.LastDatabase = Properties.Settings.Default.DefaultDB;
 
 			// Setup the Context menu for DisplaySearch including the symbols
@@ -416,7 +418,7 @@ namespace VEPROMS
 			// B2019-107 Error Log message for inconsistent PromsFixes
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, Database.RevDate, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), FormatInfo.Failed ?? "");
-			
+
 			// C2022-030 Notify the user if the stored procedure in the database are not update to date
 			//           with those in the PROMSFixes.sql delivered with the PROMS executable
 			string pfVersion = ExeInfo.GetAssocicatedPROMSFixesVersion();
@@ -546,7 +548,7 @@ namespace VEPROMS
 			tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo);
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
-			
+
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
 			tv.PrintTransitionReport += new vlnTreeViewEvent(tv_PrintTransitionReport);
 			tv.ProcessingComplete += tv_ProcessingComplete;
@@ -554,10 +556,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)
@@ -574,7 +589,26 @@ namespace VEPROMS
 			}
 		}
 
-		void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
+		//B2019-140 Change bars do not get refreshed when approval is run.
+		// Get the displaytab containing the procedure
+		// if none exists, return null
+		public DisplayTabItem GetTabContainingProcedure(int procid) => tc?.MyBar?.Items?.OfType<DisplayTabItem>().FirstOrDefault(x => x.MyItemInfo?.ItemID == procid);
+        // Refresh Node in Tree
+        //  Used for when Change Bar Updates as part of approval.
+        public void RefreshProcedureNode(ProcedureInfo itm)
+        {
+			VETreeNode tn = tv.FindNode(itm, tv.Nodes);
+			var tmp = (ProcedureInfo)tn?.VEObject;
+			if (tmp != null)
+            {
+                tmp.ChangeBarDate = itm.ChangeBarDate;
+				tmp.MyConfig = itm.MyConfig;
+            }
+
+            tn?.RefreshNode();
+        }
+
+        void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
 			if (pi == null) return;
@@ -591,6 +625,23 @@ namespace VEPROMS
 					itm.MyContent.Config = pc.ToString();
 					itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 					itm.Save();
+
+					//B2019-140 Change bars do not get refreshed when approval is run.
+					// Reset a Procedure and sub items in the cache
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
+					DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
+                    if (dti != null)
+                    {
+                        if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
+                            dti.MyStepTabPanel.MyStepPanel.Focus();
+
+						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+					}
 				}
 			}
 		}
@@ -1183,6 +1234,7 @@ namespace VEPROMS
 
 			if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref message))
 			{
+				message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 				MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
@@ -2072,7 +2124,10 @@ namespace VEPROMS
 				{
 					foreach (DisplayTabItem dti in tc.MyBar.Items)
 					{
-						if (!myList.Contains(dti.OwnerID))
+						//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)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -2478,7 +2533,7 @@ namespace VEPROMS
 			//and set checkboxes based on what they are set to
 			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
 
-			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			if (!Settings.Default.SeparateWindows && DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
 			{
 				//will open tabs by default / ask by default
 				DialogResult result = DialogResult.Yes;
@@ -3913,6 +3968,7 @@ namespace VEPROMS
 					string message = string.Empty;
 					if (!MySessionInfo.CanCheckOutItem(args.ProcedureConfig.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 					{
+						message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						this.Cursor = Cursors.Default;
 						return DialogResult.None;
@@ -3936,6 +3992,7 @@ namespace VEPROMS
 					string message = string.Empty;
 					if (!MySessionInfo.CanCheckOutItem(args.SectionConfig.MySection.MySectionInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 					{
+						message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						this.Cursor = Cursors.Default;
 						return DialogResult.None;
@@ -4736,6 +4793,11 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.SetFindDocROButton(false);
 					displayRO.LoadTree();
+
+                    //C2019-036 View Only mode work with Checked Out Procedures
+                    //In View Only Mode - Step Properties should be disabled
+                    EnableDisableStepProperties(sender, new StepTabRibbonEventArgs(args.MyEditItem.MyItemInfo, 0, args.MyEditItem.MyStepPanel.VwMode));
+
 				}
 				else
 				{
@@ -4767,6 +4829,22 @@ namespace VEPROMS
 
 		}
 
+		//C2019-036 View Only mode work with Checked Out Procedures
+		//In View Only Mode - Step Properties should be disabled
+		public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
+		{
+            if (args.ViewMode == E_ViewMode.View && (infoTabs.Enabled || infoTabs.SelectedTab != infotabTags))
+            {
+				infoTabs.Enabled = true;
+				infoTabs.SelectedTab = infotabTags;
+                infoTabs.Enabled = false;
+            }
+			else if (args.ViewMode != E_ViewMode.View && !infoTabs.Enabled)
+			{
+                infoTabs.Enabled = true;
+            }
+        }
+
 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
 		{
 			if (_LastStepRTB.EditMode)  // going into edit mode in a cell of the grid.
@@ -5302,6 +5380,8 @@ namespace VEPROMS
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
             UpdateFormats(null);
+			//C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in.
+			RefreshFormats(sender, null);
 		}
 
 		private void UpdateFormats(string mypath)

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,7 +517,12 @@ public partial class FormatInfo : IFormatOrFormatInfo
 				return _PROMSBaseFormat; 
 			}
 		}
-		public static FormatInfo Get(string name)
+        public static void Reset()
+        {
+            _PROMSBaseFormat = null;
+        }
+
+        public static FormatInfo Get(string name)
 		{
 			try
 			{

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

@@ -3819,6 +3819,51 @@ namespace VEPROMS.CSLA.Library
 			_Tables = null;
 			_SupInfos = null;
 		}
+
+		//B2019-140 Change bars do not get refreshed when approval is run.
+		// Reset a Procedure and sub items in the cache
+		public static ProcedureInfo ResetProcedure(int procID)
+		{
+			// The following lines reload the procedure info cache
+			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
+			newproc.RefreshConfig();
+
+            //the following is needed to force the ProcedureConfig to reload
+			#pragma warning disable S1656 // Variables should not be self-assigned
+            newproc.MyConfig = newproc.MyConfig;
+			#pragma warning restore S1656 // Variables should not be self-assigned
+
+            //reload the Content Cache for the procedure
+            ContentInfo.Refresh(Content.Get(newproc.MyContent.ContentID, true));
+
+			// The following line actually reloads the item info cache
+			ItemInfo newprocitem = Get(procID, true);
+			newprocitem.RefreshConfig();
+
+			//Reload all the child/sub items
+#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<int> itemIDs = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).Where(t => t?.ActiveParent != null && (t.ActiveParent is ItemInfo) && t.MyProcedure.ItemID == procID).Select(x => (x.ActiveParent as ItemInfo).ItemID).Distinct().ToList();
+#pragma warning restore S2971 // LINQ expressions should be simplified
+            for (int index = 0; index < itemIDs.Count; index++)
+			{
+				ResetParts(itemIDs[index]);
+			}
+
+			//reset the procedure config for all items attached to current procedure
+#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<ItemInfo> pconfigrefresh_items = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).Where(t => t?.MyProcedure?.ItemID == procID).Distinct().ToList();
+#pragma warning restore S2971 // LINQ expressions should be simplified
+			for (int index = 0; index < pconfigrefresh_items.Count; index++)
+            {
+				pconfigrefresh_items[index].MyProcedure = newproc;
+            }
+
+            //return the changed procedure info
+            return newproc;
+		}
+
 		private ItemInfoList _Procedures;
 		public ItemInfoList Procedures
 		{ get { return Lookup(E_FromType.Procedure, ref _Procedures); } }
@@ -7984,12 +8029,20 @@ namespace VEPROMS.CSLA.Library
 		public ProcedureInfo(SafeDataReader dr) : base(dr) { }
 #endif
 		private ProcedureInfo() : base() { ;}
-		public new static ProcedureInfo Get(int itemID)
+		public new static ProcedureInfo Get(int itemID, bool forcerefresh = false)
 		{
 			//if (!CanGetObject())
 			//    throw new System.Security.SecurityException("User not authorized to view a Item");
 			try
 			{
+				//C2019-036 View Only mode work with Checked Out Procedures
+				//  fixes caching issue
+				//   so this forces a refresh of the cache
+				if (forcerefresh)
+				{
+					_CacheByPrimaryKey.Remove(itemID.ToString());
+				}
+
 				ProcedureInfo tmp = GetCachedByPrimaryKey(itemID);
 				if (tmp == null)
 				{

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

@@ -186,7 +186,7 @@ namespace VEPROMS.CSLA.Library
 						if (string.IsNullOrEmpty(name))
 						{ name = tmpproc.DisplayText; }
 
-						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
+						message = string.Format("The procedure {0} is already checked out to {1}.\r\nWould You like to open the procedure in View Only Mode?", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)

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,8 +1145,12 @@ 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)
+					if (!hasDelim)
 						{
 							// get list of delimiters to remove from the format:
 							foreach (string rmvDelim in DelimList) thisTab = thisTab.Replace(rmvDelim, "");

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

@@ -4341,6 +4341,16 @@ public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
 				return LazyLoad(ref _IncludeSectionNumAndTitle, "@IncludeSectionNumAndTitle");
 			}
 		}
+
+		//F2025-038 default (in base format) is True. The lable "SECTION" will precede the section number an title
+		private LazyLoad<bool> _IncludeSectionLabel;
+		public bool IncludeSectionLabel
+		{
+			get
+			{
+				return LazyLoad(ref _IncludeSectionLabel, "@IncludeSectionLabel");
+			}
+		}
 		// the font and font styles to use for the continuous action summary
 		private VE_Font _Font;
 		public VE_Font Font

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

@@ -990,12 +990,21 @@ namespace VEPROMS.CSLA.Library
             }
             return tmp;
         }
-        public static Content Get(int contentID)
+        public static Content Get(int contentID, bool forcerefresh = false)
         {
             if (!CanGetObject())
                 throw new System.Security.SecurityException("User not authorized to view a Content");
             try
             {
+                //C2019-036 View Only mode work with Checked Out Procedures
+                //  fixes caching issue
+                //   this forces a refresh of the cache for a case when need to do a hard refresh
+                if (forcerefresh)
+                {
+                    ConvertListToDictionary();
+                    _CacheByPrimaryKey.Remove(contentID.ToString());
+                }
+
                 Content tmp = GetCachedByPrimaryKey(contentID);
                 if (tmp == null)
                 {

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/DisplayTabControl.cs

@@ -603,6 +603,8 @@ namespace Volian.Controls.Library
 		{
 			ItemInfo myItemInfo = myItemInfo2;
 
+			bool viewonlymode = false;
+
 			//B2025-046 Remember Tabs failing when swapping versions of PROMS
 			if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion
 			{
@@ -620,8 +622,20 @@ namespace Volian.Controls.Library
 			{
 				if (!MySessionInfo.CanCheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 				{
-					FlexibleMessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-					return null;
+					DisplayTabItem dti = MyBar?.Items?.OfType<DisplayTabItem>().FirstOrDefault(x => x.MyItemInfo?.ItemID == myItemInfo.MyProcedure.ItemID);
+
+					//C2019-036 View Only mode work with Checked Out Procedures
+					//shouldn't prompt - should just auto put in view only if already in open tab
+					//in view only
+					if (
+						(dti != null && dti.MyStepTabPanel.MyStepPanel.VwMode == E_ViewMode.View)
+						||
+						(SeparateWindows && VersionID == myItemInfo.MyDocVersion.VersionID)
+						||                                                                                              //to handle special case where item will be opened in a separate window
+						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+						viewonlymode = true;
+					else
+						return null;
 				}
 			}
 			else
@@ -682,7 +696,7 @@ namespace Volian.Controls.Library
 			// C2023-016 if a Word section and doing Find/Replace don't open Word section, position to section title in step editor instead
 			if (myItemInfo.MyContent.MyEntry == null || doingFindReplace) // If it is not a Word document open in step editor
 			{
-				return OpenStepTabPage(myItemInfo, setFocus);
+				return OpenStepTabPage(myItemInfo, setFocus, viewonlymode);
 			}
 			else // Otherwise open it in the Word editor
 			{
@@ -1178,7 +1192,7 @@ namespace Volian.Controls.Library
 		//}
 		//public Dictionary<DocVersionInfo, frmEnhanced> dicEnhancedDocuments = new Dictionary<DocVersionInfo, frmEnhanced>();
 
-		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus)
+		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus, bool viewonlymode = false)
 		{
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
@@ -1197,7 +1211,7 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
-				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
+				pg = new DisplayTabItem(this.components, this, proc, key, viewonlymode); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)
 				{

PROMS/Volian.Controls.Library/DisplayTabItem.cs

@@ -98,13 +98,18 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 		#region Constructors
-		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey)
+		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey, bool viewonlymode = false)
 		{
 			_MyItemInfo = myItemInfo;
-			if (MyItemInfo.MyContent.MyEntry == null)
-				OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
-			else
-				OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyContent.MyEntry.DocID, CheckOutType.Document);
+			//C2019-036 View Only mode work with Checked Out Procedures
+			//don't want to check out if opening in View Only Mode Due to someone else having it checked out
+			if (!viewonlymode)
+            {
+				if (MyItemInfo.MyContent.MyEntry == null)
+					OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
+				else
+					OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyContent.MyEntry.DocID, CheckOutType.Document);
+			}
 			//Console.WriteLine("DisplayTabItem");
 			_MyKey = myKey;
 			_MyDisplayTabControl = myDisplayTabControl;
@@ -112,7 +117,7 @@ namespace Volian.Controls.Library
 			InitializeComponent();
 			this.Click += new EventHandler(DisplayTabItem_Click);
 			if (myItemInfo.MyContent.MyEntry == null)
-				SetupStepTabPanel();
+				SetupStepTabPanel(viewonlymode);
 			else
 				SetupDSOTabPanel();
 			SetupSecurity(myItemInfo);
@@ -128,7 +133,37 @@ namespace Volian.Controls.Library
 		private bool MesssageShown = false;
 		public void SetupSecurity(ItemInfo myItem)
 		{
-			UserInfo ui = UserInfo.GetByUserID(OwnerInfo.Get(OwnerID).SessionUserID);
+			//C2019-036 View Only mode work with Checked Out Procedures
+			//is in View Only Mode, so do not set up the Security
+			if (OwnerID == 0)
+            {
+
+                UserInfo uiViewOnly = UserInfo.GetByUserID(Base.Library.VlnSettings.UserID);
+                if (uiViewOnly.IsAdministrator())
+				{
+					MyUserRole = $"{Base.Library.VlnSettings.UserID} - Administrator";
+				}
+                else if (uiViewOnly.IsSetAdministrator(myItem.MyDocVersion))
+				{
+					MyUserRole = $"{Base.Library.VlnSettings.UserID} - Set Administrator";
+				}
+                else if (uiViewOnly.IsWriter(myItem.MyDocVersion))
+                {
+                    MyUserRole = $"{Base.Library.VlnSettings.UserID} - Writer";
+				}
+				else if (uiViewOnly.IsROEditor(myItem.MyDocVersion))
+				{
+					MyUserRole = $"{Base.Library.VlnSettings.UserID} - RO Editor";
+				}
+				else
+				{
+                    MyUserRole = $"{Base.Library.VlnSettings.UserID} - Reviewer";
+				}
+
+				return;
+            }
+
+            UserInfo ui = UserInfo.GetByUserID(OwnerInfo.Get(OwnerID).SessionUserID);
 
 			if (ui == null)
 			{
@@ -246,7 +281,7 @@ namespace Volian.Controls.Library
 		/// <summary>
 		/// Creates and sets-up a StepTabPanel
 		/// </summary>
-		private void SetupStepTabPanel()
+		private void SetupStepTabPanel(bool viewonlymode = false)
 		{
 			((System.ComponentModel.ISupportInitialize)(_MyDisplayTabControl.MyBar)).BeginInit();
 			_MyDisplayTabControl.MyBar.SuspendLayout();
@@ -276,7 +311,7 @@ namespace Volian.Controls.Library
 			_MyDisplayTabControl.MyBar.ResumeLayout(false);
 			DocVersionInfo dvi = _MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; //MyRTBItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo;
 			if (dvi == null) return;
-			if (dvi.VersionType > 127)
+			if (dvi.VersionType > 127 || viewonlymode)
 				MyStepTabPanel.MyStepPanel.VwMode = E_ViewMode.View;
 			// C2021 - 027: Procedure level PC/PC - add _MyIteminfo to argument list
 			if (dvi.MultiUnitCount > 1)

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -9,6 +9,7 @@ using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -386,6 +387,26 @@ namespace Volian.Controls.Library
 			// The following line expands the items needed to display SelectedItemInfo
 			ExpandAsNeeded(myItemInfo);
 		}
+
+		//C2019-036 View Only mode work with Checked Out Procedures
+		public void ResetAll()
+		{
+			List<int> itemIDs = Controls.OfType<RTBItem>().Where(t => t?.MyItemInfo?.ActiveParent != null && t.MyItemInfo.ActiveParent.GetType() == typeof(ItemInfo)).Select(x => (x.MyItemInfo.ActiveParent as ItemInfo).ItemID).Distinct().ToList();
+
+			foreach (int itemID in itemIDs)
+			{
+				ItemInfo.ResetParts(itemID);
+			}
+
+			// The following line actually reloads the procedure item
+			MyProcedureItemInfo = ItemInfo.Get(MyProcedureItemInfo.ItemID, true);
+			MyProcedureItemInfo.RefreshConfig();
+            ContentInfo.Refresh(Content.Get(MyProcedureItemInfo.MyContent.ContentID, true));
+
+			// The following line expands the items needed to display SelectedItemInfo
+			ExpandAsNeeded(SelectedItemInfo);
+		}
+
 		/// <summary>
 		/// Currently selected StepRTB
 		/// </summary>

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -16,6 +16,8 @@ using DevComponents.DotNetBar;
 using Microsoft.Win32;
 using System.Diagnostics;
 using JR.Utils.GUI.Forms;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
 
 namespace Volian.Controls.Library
 {
@@ -906,6 +908,11 @@ namespace Volian.Controls.Library
 		//    //SetButtonAndMenuEnabling(false);
 		//}
 		private Bitmap createTextBitmap(char ch)
+		{
+			return createTextBitmap(ch, new Font("FreeMono", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel));
+		}
+
+		private Bitmap createTextBitmap(char ch, Font objFont)
 		{
 			string txt = string.Format("{0}", ch);
 			Bitmap objBmpImage = new Bitmap(1, 1);
@@ -916,8 +923,6 @@ namespace Volian.Controls.Library
 			// Create the Font object for the image text drawing.
 			// later on, we could add logic to use either FreeMono or Arial Unicode MS based on the format being used
 			// but for now, we are going to use FreeMono to create the symbol list
-			Font objFont = new Font("FreeMono", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
-			//Font objFont = new Font("Arial Unicode MS", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
 
 			// Create a graphics object to measure the text's width and height.
 			Graphics objGraphics = Graphics.FromImage(objBmpImage);
@@ -937,7 +942,6 @@ namespace Volian.Controls.Library
 			objGraphics.SmoothingMode = SmoothingMode.AntiAlias;
 			objGraphics.TextContrast = 0;
 			objGraphics.TextRenderingHint = TextRenderingHint.AntiAlias;
-			//objGraphics.DrawString(txt, objFont, new SolidBrush(Color.FromArgb(102, 102, 102)), 0, 0);
 			objGraphics.DrawString(txt, objFont, new SolidBrush(Color.Black),0,0);
 			objGraphics.Flush();
 			return (objBmpImage);
@@ -1663,6 +1667,7 @@ namespace Volian.Controls.Library
 							}
 						}
 						Clipboard.Clear();
+
 						Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
 					}
 					iData = Clipboard.GetDataObject();
@@ -2067,6 +2072,9 @@ namespace Volian.Controls.Library
 					rtabHome.Select();
 				rtabTableGridTools.Visible = false;
 				SetButtonMenuEnabledDisabledOnStepType(false);
+				//C2019-036 View Only mode work with Checked Out Procedures
+				//Is in View Only Mode so show button as selected
+				btnEditMode.Checked = btnCMEditMode1.Checked = true;
 				this.Refresh();
 				return;
 			}
@@ -3338,10 +3346,43 @@ namespace Volian.Controls.Library
 		public void SetupAdminMode()
 		{
 		}
+
+		//C2019-036 View Only mode work with Checked Out Procedures
+		public event StepTabRibbonEvent EnableDisableStepProperties;
+		private void OnEnableDisableStepProperties(StepTabRibbonEventArgs args)
+		{
+			if (EnableDisableStepProperties != null)
+				EnableDisableStepProperties(this, args);
+		}
 		private void btnToggleEditView_Click(object sender, EventArgs e)
 		{
 			if (MyEditItem == null) return;
+
+			//C2019-036 View Only mode work with Checked Out Procedures
+			string message = string.Empty;
+			if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View && !MySessionInfo.CanCheckOutItem(MyEditItem.MyItemInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
+			{
+				//someone else has the procedure checked out so cannot swap out of view only mode
+				message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "\r\n\r\nYou will be unable to turn off View Only Mode for this procedure until it is checked in by the user specified above.");
+				MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			else if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)
+            {
+				//swapping into edit mode, so check out procedure and Setup Security
+				(this.Parent as StepTabPanel).MyDisplayTabItem.OwnerID = MySessionInfo.CheckOutItem(MyEditItem.MyItemInfo.MyProcedure.ItemID, 0);
+				(this.Parent as StepTabPanel).MyDisplayTabItem.SetupSecurity(MyItemInfo);
+			}
+            else 
+			{
+				//swapping into View Only mode, so check in procedure
+				OwnerInfo oi = OwnerInfo.GetByItemID(MyEditItem.MyItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
+				MySessionInfo.CheckInItem(oi.OwnerID);
+			}
+
 			MyEditItem.MyStepPanel.VwMode = MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? E_ViewMode.View : E_ViewMode.Edit;
+            //enable / disable the Step Properties Panel based on the ViewMode
+            OnEnableDisableStepProperties(new StepTabRibbonEventArgs(MyEditItem.MyItemInfo, 0, MyEditItem.MyStepPanel.VwMode));
 			MyEditItem.ToggleEditView(MyEditItem.MyStepPanel.VwMode);
 			SetButtonAndMenuEnabling(true);
 			SetStepButtonAndMenuEnabling(true);
@@ -3355,7 +3396,62 @@ namespace Volian.Controls.Library
 		//	btnEnhancedDocSync.Checked = !btnEnhancedDocSync.Checked;
 		//}
 
+		//C2019-036 View Only mode work with Checked Out Procedures
+		// using a blocking collection to make it thread safe in case someone 
+		// spams hitting the refresh button
+		private BlockingCollection<bool> blockingRefreshProcedure = new BlockingCollection<bool>();
 
+        //C2019-036 View Only mode work with Checked Out Procedures
+        private void btnRefreshProcedure_Click(object sender, EventArgs e)
+        {
+			//Consumer
+			Task.Run(() =>
+			{
+				//Blocks until a newRefresh Procedure Run is available
+				while (!blockingRefreshProcedure.IsCompleted)
+				{
+					_ = blockingRefreshProcedure.Take();
+					RefreshProcedure();
+				}
+			});
+
+			//Producer
+			Task.Run(() => { blockingRefreshProcedure.Add(true); });
+		}
+
+		public void RefreshProcedure()
+		{
+			StepTabPanel stab_Panel = Parent as StepTabPanel;
+
+			if (MyEditItem != null)
+			{
+                if (!MyEditItem.MyStepPanel.ContainsFocus)
+					this.Invoke((Action)(() => { MyEditItem.MyStepPanel.Focus(); })); 
+
+                E_ViewMode mode = MyEditItem.MyStepPanel.VwMode;
+				Application.DoEvents();
+				this.Invoke((Action)(() => {MyEditItem.MyStepPanel.ResetAll();}));
+				Application.DoEvents();
+				this.Invoke((Action)(() => {MyEditItem.MyStepPanel.Refresh();}));
+				Application.DoEvents();
+				MyEditItem.MyStepPanel.VwMode = mode;
+				Application.DoEvents();
+			}
+			else if (stab_Panel != null)
+			{
+				if (!stab_Panel.MyStepPanel.ContainsFocus)
+					this.Invoke((Action)(() => {stab_Panel.MyStepPanel.Focus();}));
+
+				E_ViewMode mode = stab_Panel.MyStepPanel.VwMode;
+				Application.DoEvents();
+				this.Invoke((Action)(() => {stab_Panel.MyStepPanel.ResetAll();}));
+				Application.DoEvents();
+				this.Invoke((Action)(() => {stab_Panel.MyStepPanel.Refresh();})); 
+				Application.DoEvents();
+				stab_Panel.MyStepPanel.VwMode = mode;
+				Application.DoEvents();
+			}
+		}
 		private void btnROEdit_Click(object sender, EventArgs e)
 		{
 			if (VlnSettings.ReleaseMode.Equals("DEMO"))
@@ -4190,15 +4286,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);
 		}
 
@@ -4861,10 +4961,11 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
+		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0, E_ViewMode viewMode = E_ViewMode.Edit)
 		{
 			_Proc = proc;
 			OringFlg = oringFlg;
+			ViewMode = viewMode;
 		}
 		private ItemInfo _Proc;
 
@@ -4880,6 +4981,9 @@ namespace Volian.Controls.Library
 			get { return _OringFlg; }
 			set { _OringFlg = value; }
 		}
+
+		//C2019-036 View Only mode work with Checked Out Procedures
+		public E_ViewMode ViewMode { get; set; }
 	}
 	public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
 

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

PROMS/Volian.Print.Library/ContActionSum.cs

@@ -49,7 +49,7 @@ namespace Volian.Print.Library
 			{
 				if (myContAct.MyChildren.Count > 0)
 					if (myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionNumAndTitle) // only print the section title if it has Continuous Action Steps
-						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText);
+						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText, myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionLabel);
 				foreach (pkParagraph pgh in myContAct.MyChildren) // within each section...
 				{
 					ItemInfo hlsii = GetHLSii(pgh.MyParagraph.MyItemInfo);
@@ -175,7 +175,7 @@ namespace Volian.Print.Library
 			WriteCell("DONE", true, true);
 			WriteCell("PAGE", true, false);
 		}
-		private void AddSectionHeader(string number, string title)
+		private void AddSectionHeader(string number, string title, bool IncludeSectionLabel)
 		{
 			if (!_FirstSection)
 			{
@@ -187,7 +187,10 @@ namespace Volian.Print.Library
 			_FirstSection = false;
 			Advance(2);
 			SetIndent(0, 0);
-			WriteCell("SECTION " + number, true, false);
+			if (IncludeSectionLabel) 
+				WriteCell("SECTION " + number, true, false);
+			else
+				WriteCell(number, true, false); // F2025-038 don't include the word SECTION  before number and title
 			WriteCell("   " + title, false, true);
 			Advance();
 		}

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1855,7 +1855,10 @@ namespace Volian.Print.Library
 					if (doSectionContinue) DoTopContinueMsg(cb, ref yPageStart, yTopMargin, docstyle, null);
 					// If "ContinueSectionHeader" (format flag) is true then print the section title with "(Continued)" appended to it
 					// B2020-164 added check for SpecialCaseCalvert to bypass IsSeparateSubsection STP O-67B-2 step 6.5
-					if ((!MyItemInfo.IsSection || MyItemInfo.IsSubsection) && 
+					// B2025-060 no section continue message if previous was not in same section or sub-section
+					//           fixes Vogtle units 3&4 3-AOP-116 Attachments 2 & 3
+					if ((!MyItemInfo.IsSection || MyItemInfo.IsSubsection) &&
+						(MyItemInfo.MyPrevious != null && MyItemInfo.ActiveSection == MyItemInfo.MyPrevious.ActiveSection) &&
 						MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ContinueSectionHeader && 
 						(!MyItemInfo.IsSection || (MyItemInfo.IsSeparateSubsection || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)))
 					{
@@ -6453,8 +6456,11 @@ namespace Volian.Print.Library
 					{
 						if (itemInfo.MyDocStyle.AlignHLSTabWithSect || itemInfo.FormatStepData.AlignHLSTabWithSectOvride)
 						{
+							float orgXOffset = MyTab.XOffset;
 							myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
 							XOffset = myTab.XOffset + myTab.Width;
+							// F2025-040 Adjust the Cont Act box position around HLS number
+							if (myTab.MyMacro != null) myTab.MyMacro.XOffset += (MyTab.XOffset - orgXOffset);
 						}
 						else
 						{