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

Merging from dev into master after successful testing.

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -98,8 +98,6 @@ 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;
@@ -121,7 +119,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
@@ -374,12 +372,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
@@ -418,7 +416,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();
@@ -548,7 +546,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;
@@ -589,7 +587,7 @@ namespace VEPROMS
 			}
 		}
 
-        void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
+		void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
 			if (pi == null) return;
@@ -1198,7 +1196,6 @@ 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;
 			}
@@ -2088,10 +2085,7 @@ namespace VEPROMS
 				{
 					foreach (DisplayTabItem dti in tc.MyBar.Items)
 					{
-						//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))
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -2497,7 +2491,7 @@ namespace VEPROMS
 			//and set checkboxes based on what they are set to
 			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
 
-			if (!Settings.Default.SeparateWindows && DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
 			{
 				//will open tabs by default / ask by default
 				DialogResult result = DialogResult.Yes;
@@ -3932,7 +3926,6 @@ 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;
@@ -3956,7 +3949,6 @@ 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;
@@ -4757,11 +4749,6 @@ 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
 				{
@@ -4793,22 +4780,6 @@ 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.

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

@@ -7984,20 +7984,12 @@ namespace VEPROMS.CSLA.Library
 		public ProcedureInfo(SafeDataReader dr) : base(dr) { }
 #endif
 		private ProcedureInfo() : base() { ;}
-		public new static ProcedureInfo Get(int itemID, bool forcerefresh = false)
+		public new static ProcedureInfo Get(int itemID)
 		{
 			//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}.\r\nWould You like to open the procedure in View Only Mode?", name, si.UserID);
+						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)

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

@@ -990,21 +990,12 @@ namespace VEPROMS.CSLA.Library
             }
             return tmp;
         }
-        public static Content Get(int contentID, bool forcerefresh = false)
+        public static Content Get(int contentID)
         {
             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/Volian.Controls.Library/DisplayTabControl.cs

@@ -603,8 +603,6 @@ 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
 			{
@@ -622,20 +620,8 @@ namespace Volian.Controls.Library
 			{
 				if (!MySessionInfo.CanCheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 				{
-					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;
+					FlexibleMessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					return null;
 				}
 			}
 			else
@@ -696,7 +682,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, viewonlymode);
+				return OpenStepTabPage(myItemInfo, setFocus);
 			}
 			else // Otherwise open it in the Word editor
 			{
@@ -1192,7 +1178,7 @@ namespace Volian.Controls.Library
 		//}
 		//public Dictionary<DocVersionInfo, frmEnhanced> dicEnhancedDocuments = new Dictionary<DocVersionInfo, frmEnhanced>();
 
-		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus, bool viewonlymode = false)
+		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus)
 		{
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
@@ -1211,7 +1197,7 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
-				pg = new DisplayTabItem(this.components, this, proc, key, viewonlymode); // Open a new Procedure Tab
+				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)
 				{

PROMS/Volian.Controls.Library/DisplayTabItem.cs

@@ -98,18 +98,13 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 		#region Constructors
-		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey, bool viewonlymode = false)
+		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey)
 		{
 			_MyItemInfo = myItemInfo;
-			//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);
-			}
+			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;
@@ -117,7 +112,7 @@ namespace Volian.Controls.Library
 			InitializeComponent();
 			this.Click += new EventHandler(DisplayTabItem_Click);
 			if (myItemInfo.MyContent.MyEntry == null)
-				SetupStepTabPanel(viewonlymode);
+				SetupStepTabPanel();
 			else
 				SetupDSOTabPanel();
 			SetupSecurity(myItemInfo);
@@ -133,11 +128,6 @@ namespace Volian.Controls.Library
 		private bool MesssageShown = false;
 		public void SetupSecurity(ItemInfo myItem)
 		{
-			//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)
-				return;
-
 			UserInfo ui = UserInfo.GetByUserID(OwnerInfo.Get(OwnerID).SessionUserID);
 
 			if (ui == null)
@@ -256,7 +246,7 @@ namespace Volian.Controls.Library
 		/// <summary>
 		/// Creates and sets-up a StepTabPanel
 		/// </summary>
-		private void SetupStepTabPanel(bool viewonlymode = false)
+		private void SetupStepTabPanel()
 		{
 			((System.ComponentModel.ISupportInitialize)(_MyDisplayTabControl.MyBar)).BeginInit();
 			_MyDisplayTabControl.MyBar.SuspendLayout();
@@ -286,7 +276,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 || viewonlymode)
+			if (dvi.VersionType > 127)
 				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,7 +9,6 @@ using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -387,26 +386,6 @@ 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,8 +16,6 @@ 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
 {
@@ -908,11 +906,6 @@ 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);
@@ -923,6 +916,8 @@ 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);
@@ -942,6 +937,7 @@ 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);
@@ -2071,9 +2067,6 @@ 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;
 			}
@@ -3345,43 +3338,10 @@ 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);
@@ -3395,62 +3355,7 @@ 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"))
@@ -4960,11 +4865,10 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0, E_ViewMode viewMode = E_ViewMode.Edit)
+		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
 		{
 			_Proc = proc;
 			OringFlg = oringFlg;
-			ViewMode = viewMode;
 		}
 		private ItemInfo _Proc;
 
@@ -4980,9 +4884,6 @@ 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.Print.Library/vlnParagraph.cs

@@ -1855,10 +1855,7 @@ 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
-					// 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) &&
+					if ((!MyItemInfo.IsSection || MyItemInfo.IsSubsection) && 
 						MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ContinueSectionHeader && 
 						(!MyItemInfo.IsSection || (MyItemInfo.IsSeparateSubsection || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)))
 					{