C2015-028 Add Editorial Mode to PROMS Step Editor

Looks Good. Ready for QA!

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24288,8 +24288,23 @@ BEGIN
 		Delete from ROFSTs where ROFSTID not in(select rofstid from Associations) and DTS < @dte
 		delete from roimages where rodbid not in(select rodbid from rofsts) and DTS < @dte
 		delete from documents where docid not in(select docid from entries) and DTS < @dte
+	PRINT 'Temporarally storing Items to delete'
+	    declare @Items table (ItemID bigint PRIMARY KEY, deletestatus int)
+		INSERT INTO @Items
+			Select Child.ItemID, Child.deletestatus
+				FROM tblItems AS Child
+				INNER JOIN tblContents AS parent
+				ON Parent.ContentID = Child.ContentID
+					AND Parent.deletestatus = Child.deletestatus
+				Where
+				parent.deletestatus != 0 and parent.ActionDTS < @dte
 	PRINT 'Phase 1'
 		delete from tblAnnotations where deletestatus != 0 and DTS < @dte
+		delete tblAnnotations 
+		  from tblAnnotations
+		   INNER JOIN @Items Itms
+		     ON Itms.ItemID = tblAnnotations.ItemID AND tblAnnotations.deletestatus != 0
+
 		delete from drousages where docid in(select docid from tbldocuments where deletestatus != 0) and DTS < @dte
 		delete from tblEntries where deletestatus != 0 and DTS < @dte
 		delete from tblDocuments where deletestatus != 0 and DTS < @dte
@@ -24297,11 +24312,46 @@ BEGIN
 		delete from tblImages where deletestatus != 0 and DTS < @dte
 	PRINT 'Phase 2'
 		delete from tblROUsages where deletestatus != 0 and DTS < @dte
-		delete from tblTransitions where deletestatus != 0 and DTS < @dte
-		delete from tblParts where deletestatus != 0 and DTS < @dte
-		delete from tblItems where deletestatus != 0 and ItemID Not IN (Select ItemID from Parts) and DTS < @dte
-	PRINT 'Purge Contents'
-		delete from tblContents where deletestatus != 0 and DTS < @dte
+		delete tblROUsages 
+		   from tblROUsages
+		   INNER JOIN tblContents ON tblContents.ContentID = tblROUsages.ContentID
+		     AND tblContents.deletestatus = tblROUsages.deletestatus
+		    where tblContents.deletestatus != 0 and tblContents.ActionDTS < @dte
+	PRINT 'Deleting Transitions'
+		delete from tblTransitions where deletestatus != 0 and 
+		  (DTS < @dte
+		   OR RangeID in (Select ItemID FROM @Items)
+		   OR ToID in (Select ItemID FROM @Items)
+		   OR FromID in (Select ContentID from tblContents where deletestatus != 0 and ActionDTS < @dte)
+		  )
+	PRINT 'Deleting Items and Parts'
+		delete from tblItems where deletestatus != 0 and DTS < @dte
+		delete from tblParts where deletestatus != 0 and ItemID Not IN (Select ItemID from Items) and DTS < @dte
+	PRINT 'Purging Parts with deleted Contents'
+		DELETE from Child
+		 FROM tblParts AS Child
+		 INNER JOIN tblItems
+		   ON tblItems.ItemID = Child.ItemID
+		    AND tblItems.deletestatus = Child.deletestatus
+		 INNER JOIN tblContents AS parent
+		   ON parent.ContentID = tblItems.ContentID
+		    AND parent.deletestatus = tblItems.deletestatus
+		   Where
+		    parent.deletestatus != 0 and parent.ActionDTS < @dte
+		DELETE FROM tblParts 
+		where deletestatus != 0 AND
+		ContentID in
+         (Select ContentID from tblContents where deletestatus != 0 and ActionDTS < @dte)
+
+	PRINT 'Purging Items with deleted Contents'
+	   alter table tblItems nocheck constraint FK_Items_Items
+		DELETE tblItems
+		 FROM tblItems
+		 INNER JOIN @Items Itms
+		   ON Itms.ItemID = tblItems.ItemID AND Itms.deletestatus = tblItems.deletestatus
+	   alter table tblItems check constraint FK_Items_Items
+	PRINT 'Purging Contents'
+		delete from tblContents where deletestatus != 0 and ActionDTS < @dte 
 	PRINT 'Phase 3' 
 		delete from AnnotationAudits where DTS < @dte
 		delete from ContentAudits where DTS < @dte

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

@@ -30,7 +30,6 @@ namespace VEPROMS
 		{
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions));
-			//this.btnCancel = new DevComponents.DotNetBar.ButtonX();
 			this.btnOK = new DevComponents.DotNetBar.ButtonX();
 			this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX();
@@ -50,6 +49,7 @@ namespace VEPROMS
 			this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.gpAnnoTypeFilter = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX();
 			this.gpVisioPath = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.txbxVisioPath = new DevComponents.DotNetBar.Controls.TextBoxX();
 			this.gpSeparateWindows = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -72,10 +72,10 @@ namespace VEPROMS
 			this.cbTabbedIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbButtonIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.tiIntrFaceStngs = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
-			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
 			this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
 			this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX();
@@ -83,7 +83,6 @@ namespace VEPROMS
 			this.cbUCFIgnore = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.btnReset = new DevComponents.DotNetBar.ButtonX();
 			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-			this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX();
 			this.gpSystemColor.SuspendLayout();
 			this.panButtons.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
@@ -103,18 +102,6 @@ namespace VEPROMS
 			this.gpTransRangeColor.SuspendLayout();
 			this.gpPropPageStyle.SuspendLayout();
 			this.SuspendLayout();
-			//// 
-			//// btnCancel
-			//// 
-			//this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			//this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			//this.btnCancel.Location = new System.Drawing.Point(616, 591);
-			//this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
-			//this.btnCancel.Name = "btnCancel";
-			//this.btnCancel.Size = new System.Drawing.Size(56, 19);
-			//this.btnCancel.TabIndex = 0;
-			//this.btnCancel.Text = "Cancel";
-			//this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
 			// 
 			// btnOK
 			// 
@@ -564,6 +551,18 @@ namespace VEPROMS
 			this.gpAnnoTypeFilter.TabIndex = 13;
 			this.gpAnnoTypeFilter.Text = "Filter Annotation Types";
 			// 
+			// cbShwAnnoFilter
+			// 
+			this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13);
+			this.cbShwAnnoFilter.Name = "cbShwAnnoFilter";
+			this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23);
+			this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.cbShwAnnoFilter.TabIndex = 0;
+			this.cbShwAnnoFilter.Text = "Open";
+			this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click);
+			// 
 			// gpVisioPath
 			// 
 			this.gpVisioPath.BackColor = System.Drawing.Color.Transparent;
@@ -741,6 +740,7 @@ namespace VEPROMS
 			this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19);
 			this.cbEnhancedDocumentSync.TabIndex = 9;
 			this.cbEnhancedDocumentSync.Text = "Sync Navigation";
+			this.cbEnhancedDocumentSync.CheckedChanged += new System.EventHandler(this.cbEnhancedDocumentSync_CheckedChanged);
 			// 
 			// gpPasteSettings
 			// 
@@ -1147,31 +1147,6 @@ namespace VEPROMS
 			this.tiIntrFaceStngs.Name = "tiIntrFaceStngs";
 			this.tiIntrFaceStngs.Text = "My Interface Settings";
 			// 
-			// tabControlPanel1
-			// 
-			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tabControlPanel1.Location = new System.Drawing.Point(0, 27);
-			this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2);
-			this.tabControlPanel1.Name = "tabControlPanel1";
-			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.Size = new System.Drawing.Size(645, 528);
-			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
-			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tabControlPanel1.Style.GradientAngle = 90;
-			this.tabControlPanel1.TabIndex = 1;
-			this.tabControlPanel1.TabItem = this.tiGeneral;
-			this.tabControlPanel1.ThemeAware = true;
-			// 
-			// tiGeneral
-			// 
-			this.tiGeneral.AttachedControl = this.tabControlPanel1;
-			this.tiGeneral.Name = "tiGeneral";
-			this.tiGeneral.Text = "General";
-			this.tiGeneral.Visible = false;
-			// 
 			// tabControlPanel2
 			// 
 			this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty;
@@ -1197,6 +1172,31 @@ namespace VEPROMS
 			this.tiStUpMsg.Text = "Startup Message";
 			this.tiStUpMsg.Visible = false;
 			// 
+			// tabControlPanel1
+			// 
+			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControlPanel1.Location = new System.Drawing.Point(0, 27);
+			this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2);
+			this.tabControlPanel1.Name = "tabControlPanel1";
+			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel1.Size = new System.Drawing.Size(645, 528);
+			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
+			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.GradientAngle = 90;
+			this.tabControlPanel1.TabIndex = 1;
+			this.tabControlPanel1.TabItem = this.tiGeneral;
+			this.tabControlPanel1.ThemeAware = true;
+			// 
+			// tiGeneral
+			// 
+			this.tiGeneral.AttachedControl = this.tabControlPanel1;
+			this.tiGeneral.Name = "tiGeneral";
+			this.tiGeneral.Text = "General";
+			this.tiGeneral.Visible = false;
+			// 
 			// cbUCFLForSetOnly
 			// 
 			this.cbUCFLForSetOnly.BackColor = System.Drawing.Color.Transparent;
@@ -1291,31 +1291,17 @@ namespace VEPROMS
 			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
 			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
 			// 
-			// cbShwAnnoFilter
-			// 
-			this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13);
-			this.cbShwAnnoFilter.Name = "cbShwAnnoFilter";
-			this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23);
-			this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cbShwAnnoFilter.TabIndex = 0;
-			this.cbShwAnnoFilter.Text = "Open";
-			this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click);
-			// 
 			// frmSysOptions
 			// 
 			this.AcceptButton = this.btnOK;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			//this.CancelButton = this.btnCancel;
 			this.ClientSize = new System.Drawing.Size(699, 620);
 			this.ControlBox = false;
 			this.Controls.Add(this.btnReset);
 			this.Controls.Add(this.tcSysOpts);
 			this.Controls.Add(this.panButtons);
 			this.Controls.Add(this.btnOK);
-			//this.Controls.Add(this.btnCancel);
 			this.DoubleBuffered = true;
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.Margin = new System.Windows.Forms.Padding(2);

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -270,7 +270,7 @@ namespace VEPROMS
 		private void cbStepTypeToolTip_CheckedChanged(object sender, EventArgs e)
 		{
 			Settings.Default.StepTypeToolTip = cbStepTypeToolTip.Checked;
-			VlnSettings.StepTypeToolType = cbStepTypeToolTip.Checked;
+			VlnSettings.StepTypeToolTip = cbStepTypeToolTip.Checked;
 		}
 		private void cbTVExpand_CheckedChanged(object sender, EventArgs e)
 		{

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -524,7 +524,7 @@ namespace VEPROMS
 
 			this.Activated += new EventHandler(frmVEPROMS_Activated);
 
-			VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip;
+			VlnSettings.StepTypeToolTip = Settings.Default.StepTypeToolTip;
 			VlnSettings.cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest);
 			ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory);
@@ -2496,6 +2496,7 @@ namespace VEPROMS
 						// Open procedure in the editor.
 						if (_Procedure == null) continue; //skip and continue with foreach
 						OpenItem(_Procedure);
+						if (tc.MyEditItem == null) continue; // skip and continue with foreach
 						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
 						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
 

PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs

@@ -394,6 +394,33 @@ namespace VEPROMS.CSLA.Library
 				OnPropertyChanged("Step_ChangeID");
 			}
 		}
+
+		// C2015-028 Add Editorial Mode to PROMS Step Editor
+		//   was last change made in editorial mode and thus change bars should be disabled?
+		//    will contain userid of user that made last change if it was in Editorial Mode
+		//    if there was not a previous change that would have caused change bars
+		//    will be blank/empty by default
+		// will get overwritten every time a change is made
+		public string Step_ChangeIDEditorialMode
+		{
+			get
+			{
+				string s = _Xp["Step", "ChangeIDEMode"];
+
+				if (s == string.Empty) return null;
+				return s;
+			}
+			set
+			{
+				string s = _Xp["Step", "ChangeIDEMode"];
+
+				if (value != null && value.ToString() == s) return;
+				if (value == null && s != null) _Xp["Step", "ChangeIDEMode"] = null;
+				else _Xp["Step", "ChangeIDEMode"] = value.ToString();
+				OnPropertyChanged("Step_ChangeIDEMode");
+			}
+		}
+
 		public string Step_Responsibility
 		{
 			get

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

@@ -2647,8 +2647,8 @@ namespace VEPROMS.CSLA.Library
 								with = with.Replace(@"\ul ", "");
 								with = with.Replace(@"\ulnone ", "");
 							}
-							//if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
-							if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
+							// B2025-050 use VlnSettings so we don't need to restart PROMS
+							if (VlnSettings.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
 							{
 								with = $@"\cf2{with}\cf0 ";
 							}

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

@@ -3933,9 +3933,7 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				bool chg = HasChanges;
-				StepInfo si = this as StepInfo;
-				if (si == null) return false;
-				StepConfig sc = si.MyConfig as StepConfig;
+				StepConfig sc = this.MyConfig as StepConfig;
 				if (sc == null) return false;
 				// if there is no override & return whether there was a change to the text.
 				if (chg && ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds &&
@@ -3943,6 +3941,21 @@ namespace VEPROMS.CSLA.Library
 					return false; // No Change ID - No Change Bar
 				if ((sc.Step_SpellCheckerChangedText ?? "") == "NoChangeBar")
 					return false; // Spell Checker, in editorial mode (format flag EditoralSpellCheck) , made the change and there was no change bar prior to that change  B2015-024
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   last change was in editorial mode, so ignore it
+				if (!string.IsNullOrEmpty(sc.Step_ChangeIDEditorialMode))
+					return false;
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   Add Check for enhanced docs
+				//   If enhanced docs, need to check the step_config for the master
+				if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0)
+				{
+					ItemInfo ii = ItemInfo.Get(sc.MyEnhancedDocuments[0].ItemID, true);
+					if (ii == null) return false;       // when deleting a source step, this was causing a crash (null ii)
+					return ii.HasChangeBar;
+				}
+
+
 				if (sc.Step_CBOverride == null)
 					return chg;
 				return (sc.Step_CBOverride == "On");
@@ -3953,9 +3966,7 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				if (this.IsAccPages || this.IsProcedure || this.IsSection) return false;
-				StepInfo si = this as StepInfo;
-				if (si == null) return false;
-				StepConfig sc = si.MyConfig as StepConfig;
+				StepConfig sc = this.MyConfig as StepConfig;
 				if (sc == null) return false;
 				// go back to source & see what date it has:
 				if (sc.MyEnhancedDocuments != null && sc.MyEnhancedDocuments.Count == 1 && sc.MyEnhancedDocuments[0].Type == 0)

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

@@ -37,7 +37,7 @@ namespace VEPROMS.CSLA.Library
 		// Variables in this region are not set in the format files.  They are used only in the C# code
 
 		// when IgnoreUCF is true, get the original data, i.e.don't apply any UCF changes to it
-		private static bool _IgnoreUCF = false;
+		private static bool _IgnoreUCF = true; // turn off reading in UCF values when getting format information
 		public static bool IgnoreUCF
 		{
 			get { return PlantFormat._IgnoreUCF; }

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

@@ -606,12 +606,20 @@ namespace VEPROMS.CSLA.Library
             _ItemInfoExtension.Refresh(this);
             OnChange();// raise an event
         }
-        public static ItemInfo Get(int itemID)
+        public static ItemInfo Get(int itemID, bool forcerefresh = false)
         {
-            //if (!CanGetObject())
-            //  throw new System.Security.SecurityException("User not authorized to view a Item");
+
             try
             {
+                // C2015-028 Add Editorial Mode to PROMS Step Editor
+                //  fixes caching issue
+                //   item.myconfig was cached not containing the bypass changebar info
+                //   so this forces a refresh of the cache
+                if (forcerefresh)
+                {
+                    _CacheByPrimaryKey.Remove(itemID.ToString());
+                }
+
                 ItemInfo tmp = GetCachedByPrimaryKey(itemID);
                 if (tmp == null)
                 {

PROMS/Volian.Base.Library/VlnSettings.cs

@@ -197,7 +197,7 @@ namespace Volian.Base.Library
 			set { VlnSettings._UserID = value; }
 		}
 		private static bool _StepTypeToolTip = false;
-		public static bool StepTypeToolType
+		public static bool StepTypeToolTip
 		{
 			get { return VlnSettings._StepTypeToolTip; }
 			set { VlnSettings._StepTypeToolTip = value; }

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -614,7 +614,7 @@ namespace Volian.Controls.Library
 					AddDummyGroup(db, tn);
 				}
 
-				_currRofstID = (int?)MyROFST.ROFstID;
+				_currRofstID = (IsRofstValid) ? (int?)_myROFST.ROFstID : null;
 				_currDocVersionID = null;
 
 				if(_docVersionInfo != null) _currDocVersionID = (int?)_docVersionInfo.VersionID;
@@ -789,7 +789,7 @@ namespace Volian.Controls.Library
 
 		private void AddDummyGroup(ROFSTLookup.rodbi rodbi, TreeNode tn)
 		{
-			if (MyROFSTLookup.HasChildren(ref rodbi))
+			if (IsRofstValid && MyROFSTLookup.HasChildren(ref rodbi))
 			{
 				TreeNode tmp = new TreeNode(DummyNodeText);
 				tn.Nodes.Add(tmp);

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -11,6 +11,7 @@ using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Base.Library;
 using Microsoft.Win32;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -261,16 +262,37 @@ namespace Volian.Controls.Library
 			get { return _ChgId; }
 			set { _ChgId = value; }
 		}
+
+		// C2015-028 Add Editorial Mode to PROMS Step Editor
 		public bool EditorialChange
 		{
 			get
 			{
 				if (_ChgId == null) return true;
 				if (_ChgId == "") return true;
-				if (_ChgId.ToUpper() == "EC") return true;
-				return false;
+				if (_ChgId.ToUpper() == "EC") { return true;}
+
+                return IsInEditorialMode;
             }
         }
+
+		// C2015-028 Add Editorial Mode to PROMS Step Editor
+		//   property to hold if button in ribbon is toggled on or off
+		public bool IsInEditorialMode { get; set; } = false;
+
+		// C2015-028 Add Editorial Mode to PROMS Step Editor
+		//   This is used when button in the ribbon is toggled on/off
+		//   It iterates through all previously opened tabs
+		//   and updates the "Editorial Mode" button
+		//   and background color to match those of the current tab
+		public void SetEdititorialModeForAllTabs(bool mode)
+        {
+            foreach (DisplayTabItem tabItem in _MyDisplayTabItems.Values.Where(tabItem => tabItem.MyStepTabPanel != null))
+            {
+                tabItem.MyStepTabPanel.MyStepTabRibbon.SetEditorialMode(mode);
+            }
+        }
+
         #endregion
         #region Events
         /// <summary>

PROMS/Volian.Controls.Library/EditItem.cs

@@ -201,11 +201,15 @@ namespace Volian.Controls.Library
 		/// </summary>
 		public ItemInfo MyItemInfo
 		{
-			get { return _MyItemInfo; }
+			get 
+			{
+				ToolTipOnOff(); //B2025-050 Show the tooltip based on User Options Settings
+				return _MyItemInfo; 
+			}
 			set
 			{
 				_MyItemInfo = value;
-				if (VlnSettings.StepTypeToolType) SetToolTip(_MyItemInfo.ToolTip);
+				SetToolTip(_MyItemInfo.ToolTip); // B2025-050 always set tooltip text. This method will also show the tooltip based on User Options Settings
 				ChangeBar = _MyItemInfo.HasChangeBar;
 				CheckOff co = _MyItemInfo.GetCheckOffStep();
 				if (co != null && co.UIMark != null)
@@ -2977,6 +2981,8 @@ namespace Volian.Controls.Library
 		public abstract void SetText();
 		public abstract void SetExpandAndExpander(ItemInfo itemInfo);
 		public abstract void SaveCurrentAndContents();
+		public abstract void ToolTipOnOff();
+
 		#endregion
 		private int SupInfoTopOffset
 		{

PROMS/Volian.Controls.Library/GridItem.cs

@@ -462,8 +462,12 @@ namespace Volian.Controls.Library
 			DevComponents.DotNetBar.SuperTooltipInfo tpi = new DevComponents.DotNetBar.SuperTooltipInfo("", "", tip, null, null, DevComponents.DotNetBar.eTooltipColor.Lemon);
 			_MyToolTip.MinimumTooltipSize = new Size(0, 24);
 			_MyToolTip.TooltipDuration = 3;
-			//_MyToolTip.SetSuperTooltip(MyStepRTB, tpi);
 			_MyToolTip.SetSuperTooltip(MyFlexGrid, tpi);
+			ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings
+		}
+		public override void ToolTipOnOff()
+		{
+			_MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings
 		}
 		private bool DoNotRefresh = false;
 		public override void RefreshContent() 

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -9,6 +9,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using JR.Utils.GUI.Forms;
+using Volian.Base.Library;
 
 namespace Volian.Controls.Library
 {
@@ -78,7 +79,7 @@ namespace Volian.Controls.Library
 		/// <summary>
 		/// Left edge of the PictureBox
 		/// </summary>
-		public override int ContentLeft
+		override public int ContentLeft
 		{
 			get { return Left + _MyPictureBox.Left; }
 		}
@@ -95,8 +96,14 @@ namespace Volian.Controls.Library
 			_MyToolTip.MinimumTooltipSize = new Size(0, 24);
 			_MyToolTip.TooltipDuration = 3;
 			_MyToolTip.SetSuperTooltip(MyPictureBox, tpi);
+			ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings
 		}
-		public override void RefreshContent()
+		public override void ToolTipOnOff()
+		{
+			_MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings
+		}
+
+		override public void RefreshContent()
 		{
 			IdentifyMe(false);
 			RefreshDisplay(false);

PROMS/Volian.Controls.Library/RTBItem.cs

@@ -7,6 +7,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
+using Volian.Base.Library;
 
 namespace Volian.Controls.Library
 {
@@ -133,6 +134,11 @@ namespace Volian.Controls.Library
 			_MyToolTip.MinimumTooltipSize = new Size(0, 24);
 			_MyToolTip.TooltipDuration = 3;
 			_MyToolTip.SetSuperTooltip(MyStepRTB, tpi);
+			ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings
+		}
+		public override void ToolTipOnOff()
+		{
+			_MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings
 		}
 		public override void RefreshContent()
 		{
@@ -793,27 +799,41 @@ namespace Volian.Controls.Library
 				// if the plant has the change id option, the change id was entered when the program started.
 				// this should be saved for every piece of edited data.  Note that the set of config
 				// item Step_MultipleChangeID has the save built in to it.
+				if (sc == null) sc = new StepConfig();
 				if (MyStepRTB.MyItemInfo.IsStep &&
 					MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds
 					&& !this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange)
 				{
-					//StepConfig sc = MyStepRTB.MyItemInfo.MyConfig as StepConfig;
-					if (sc == null) sc = new StepConfig();
 					sc.Step_ChangeID = this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.ChgId;
-					//if (MyStepRTB.MyItemInfo.MyConfig == null) itm.MyContent.Config = sc.ToString();
+				}
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   if in Editorial Mode, treat it the same as if the ChangeIds are set in the Format file
+				if (MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode && !existingChangeBar)
+				{
+					sc.Step_ChangeIDEditorialMode = Volian.Base.Library.VlnSettings.UserID;
+				}
+				else
+                {
+					sc.Step_ChangeIDEditorialMode = null;
 				}
 				// B2020-017: If making an editorial change, clear the Change id.  Having the change id on
 				//   was adding/printing a change bar.
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   if in Editorial Mode, treat it the same as if the ChangeIds are set in the Format file
 				if (MyStepRTB.MyItemInfo.IsStep &&
-					MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds
-					&& this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange
-					&& hasChangeBar == false)
+					(MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.ChangeIds
+					 || MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode
+					)
+					&& MyStepPanel.MyStepTabPanel.MyDisplayTabControl.EditorialChange
+					&& !hasChangeBar)
 				{
 					if (sc == null) sc = new StepConfig();
 					sc.Step_ChangeID = null;
 				}
 				//  B2015-024 Have Spell Checker text changes be an editorial change (not assign a change bar but keep existing change bar)
-				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck)
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   if in Editorial Mode, treat it the same as if the Rditorial SprllCheck flag is set in the Format file
+				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || this.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode)
 				{
 					if (StepRTB.DidEditorialSpellCheck)
 					{

PROMS/Volian.Controls.Library/RtfRawItem.cs

@@ -97,6 +97,11 @@ namespace Volian.Controls.Library
 			_MyToolTip.MinimumTooltipSize = new Size(0, 24);
 			_MyToolTip.TooltipDuration = 3;
 			_MyToolTip.SetSuperTooltip(MyStepRTB, tpi);
+			ToolTipOnOff(); // B2025-050 Show the tooltip based on User Options Settings
+		}
+		public override void ToolTipOnOff()
+		{
+			_MyToolTip.Enabled = VlnSettings.StepTypeToolTip; // B2025-XXX Show the tooltip based on User Options Settings
 		}
 		public override void RefreshContent()
 		{

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -650,7 +650,12 @@ namespace Volian.Controls.Library
 		/// </summary>
 		public Color ActiveColor
 		{
-			get { return _ActiveColor; }
+			get {
+				// C2015-028 Add Editorial Mode to PROMS Step Editor
+				//   if in Editorial Mode, use LightGreen background
+				_ActiveColor = MyStepTabPanel != null && MyStepTabPanel.MyDisplayTabControl.IsInEditorialMode ? Color.LightGreen : Color.SkyBlue;
+					return _ActiveColor; 
+				}
             set { _ActiveColor = value; }
 		}
 		/// <summary>

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -3760,7 +3760,12 @@ namespace Volian.Controls.Library
 		public bool SpellCheckNext()
 		{
 			int nBad = C1SpellChecker2.CheckControl(this, false, MySpellCheckDlg);
-				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck)
+
+			// C2015-028 Add Editorial Mode to PROMS Step Editor
+			//   if in Editorial Mode, treat it the same as if the EditorialSpellCheck flag is set in the Format file
+			bool editorialmode = (this.Parent.Parent.Parent as StepTabPanel).MyDisplayTabControl.IsInEditorialMode;
+
+            if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || editorialmode)
 					DidEditorialSpellCheck = MySpellCheckDlg.DidCorrectSpelling;  // B2015-024 spell checker in editoral mode
 			return (nBad >= 0); // nBad = -1 means user pressed Cancel button
 		}

PROMS/Volian.Controls.Library/StepTabPanel.cs

@@ -120,7 +120,7 @@ namespace Volian.Controls.Library
 		/// </summary>
 		private void SetupStepTabRibbon()
 		{
-			_MyStepTabRibbon = new StepTabRibbon();
+			_MyStepTabRibbon = new StepTabRibbon(_MyDisplayTabControl.IsInEditorialMode);
 			_MyStepTabRibbon.Dock = System.Windows.Forms.DockStyle.Top;
 			_MyStepTabRibbon.Location = new System.Drawing.Point(0, 0);
 			_MyStepTabRibbon.Name = "displayTabRibbon1";

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -995,7 +995,7 @@ namespace Volian.Controls.Library
 		//    SetButtonAndMenuEnabling(true);
 		//}
 		#region Constructor
-		public StepTabRibbon()
+		public StepTabRibbon(bool? IsInEditorialMode = false)
 		{
 			InitializeComponent();
 			this.btnInsSupInfo.Tag = string.Format("{0} {1}", (int)E_FromTypes.SupInfos, 1040);  // Make type of rno (40) & special case 1000
@@ -1021,7 +1021,15 @@ namespace Volian.Controls.Library
 			// hide the import from Word file if not running in Debug mode
 			if (!VlnSettings.DebugMode)
 				rbnImpWrd.Visible = false;
+
+			// C2015-028 Add Editorial Mode to PROMS Step Editor
+			//  default Editorial Mode to what is set in the DisplayTabControl
+			SetEditorialMode(IsInEditorialMode != null && (bool) IsInEditorialMode);
+
         }
+
+        public void SetEditorialMode(bool mode) => btnEditorialMode.Checked = btnCMEditorialMode.Checked = mode;
+
         void _RibbonControl_SizeChanged(object sender, EventArgs e)
 		{
 			this.Size = _RibbonControl.Size;
@@ -3211,6 +3219,28 @@ namespace Volian.Controls.Library
 				System.Diagnostics.Process.Start(roapp, args);
 			}
 		}
+
+		// C2015-028 Add Editorial Mode to PROMS Step Editor
+		private void btnEditorialMode_Click(object sender, EventArgs e)
+		{
+			//toggle button is selected
+			SetEditorialMode(!btnEditorialMode.Checked);
+
+			//set the overall flag in the displaytabcontrol
+            StepTabPanel tmp = Parent as StepTabPanel;
+			tmp.MyDisplayTabControl.IsInEditorialMode = btnEditorialMode.Checked;
+
+			//refresh the current item so the background color changes (LightGreen=Editorial Mode, SkyBlue=Normal Selected)
+            if (MyEditItem != null)
+			{
+				_MyEditItem.RefreshContent();
+				Application.DoEvents();
+            }
+
+            //set other preciously opened tabs to match the state of Editorial Mode in the current tab
+            tmp.MyDisplayTabControl.SetEdititorialModeForAllTabs(btnEditorialMode.Checked);
+        }
+
         private void btnChgTyp_Click(object sender, EventArgs e)
 		{
 			StepPanelTabDisplayEventArgs args = new StepPanelTabDisplayEventArgs("Change Step Type");
@@ -3279,7 +3309,8 @@ namespace Volian.Controls.Library
 				rtabInsert.Visible = false;
 				rtabAdmin.Visible = false;
 				rtabReview.Select();
-				btnCMEditMode1.Enabled = btnEditMode.Enabled = false; // don't allow reviewer toggle out of view mode
+				btnCMEditMode1.Enabled = btnEditMode.Enabled = btnCMEditorialMode.Enabled = false; // don't allow reviewer toggle out of view mode
+				btnCMEditorialMode.Visible = false;
 			}
 		}
 		public void SetupROEditorMode()