C2025-023-New-EP-Format-File

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,9 +28,7 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
-			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
-			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -84,9 +82,7 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
-				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
-				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,9 +49,7 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
-			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
-			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,7 +39,6 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
-			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/Formats/Formats.csproj

@@ -180,7 +180,6 @@
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />
-    <Content Include="fmtall\EPTSTBCK1all.xml" />
     <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />
@@ -289,10 +288,6 @@
     <Content Include="fmtall\NSPWGall.xml" />
     <Content Include="fmtall\NSP_00all.xml" />
     <Content Include="fmtall\OHLPall.xml" />
-    <Content Include="fmtall\PROMSDemo1all.xml" />
-    <Content Include="fmtall\PROMSDemo2all.xml" />
-    <Content Include="fmtall\PROMSDemoALRall.xml" />
-    <Content Include="fmtall\PROMSDemoBCKall.xml" />
     <Content Include="fmtall\PROMSMan1all.xml" />
     <Content Include="fmtall\PROMSMan2all.xml" />
     <Content Include="fmtall\RGEall.xml" />
@@ -510,10 +505,6 @@
     <Content Include="genmacall\nspsam.svg" />
     <Content Include="genmacall\nspsamdev.svg" />
     <Content Include="genmacall\ohlp.svg" />
-    <Content Include="genmacall\PROMSDemo1.svg" />
-    <Content Include="genmacall\PROMSDemo2.svg" />
-    <Content Include="genmacall\PROMSDemoALR.svg" />
-    <Content Include="genmacall\PROMSDemoBCK.svg" />
     <Content Include="genmacall\PROMSMan1.svg" />
     <Content Include="genmacall\PROMSMan2.svg" />
     <Content Include="genmacall\rge.svg" />

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -35,7 +35,6 @@ namespace Formats
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
 			this.labelX2 = new DevComponents.DotNetBar.LabelX();
 			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
-			this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -132,26 +131,11 @@ namespace Formats
 			this.LstBxExcludeFiles.TabIndex = 6;
 			this.LstBxExcludeFiles.Text = "listBoxAdv1";
 			// 
-			// cbIncludeDemoFormats
-			// 
-			// 
-			// 
-			// 
-			this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
-			this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
-			this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
-			this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
-			this.cbIncludeDemoFormats.TabIndex = 7;
-			this.cbIncludeDemoFormats.Text = "Include Demo Formats";
-			// 
 			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(496, 191);
-			this.Controls.Add(this.cbIncludeDemoFormats);
 			this.Controls.Add(this.LstBxExcludeFiles);
 			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
@@ -174,7 +158,6 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX buttonX2;
 		private DevComponents.DotNetBar.LabelX labelX2;
 		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
-		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -96,17 +96,13 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		// Added a PROMSDemo to the list of excluded format files
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+
-		
-		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
-		// dialog is check
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis) 
+				if (fn.ToUpper().StartsWith(excludeThis)) return true;
-					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
 			return false;
 		}
 
@@ -165,5 +161,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-	}
+}
 }

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -276,10 +276,8 @@ namespace ctlXMLEditLib
 			bool imagechild;	//whether this field is a subchild of an image
 			string imagename;	//if subchild of image, name of image parent (for save)
 			string imagedate;   //if this was filename, save the date/time stamp
-			string name;        //name of element
-			string parenthtid;  //name of parent element in hashtable for PC items
 			public TextBoxAttrTag(bool reqd, string ptn, RadioButton rd, bool img, 
-				string imgname, string imgdate, string elemname) 
+				string imgname, string imgdate) 
 			{
 				this.req_msg = null;
 				this.required = reqd;
@@ -288,12 +286,6 @@ namespace ctlXMLEditLib
 				this.imagechild = img;
 				this.imagename = imgname;
 				this.imagedate = imgdate;
-				this.name = elemname;
-
-				if (name.Contains("_PCCHILD"))
-					this.parenthtid = name.Substring(0, name.IndexOf("_PCCHILD"));
-				else
-					this.parenthtid = null;
 			}
 			public void SetPattern(string pattern) {this.pattern = pattern;}
 			public void SetRequired(bool req) {this.required = req;}
@@ -306,10 +298,6 @@ namespace ctlXMLEditLib
 			public string GetImageName { get {return imagename;}}
 			public string GetImageDate { get {return imagedate;}}
 			public void SetImageDate(string imgdate) {this.imagedate = imgdate;}
-			public string GetName { get { return name; } }
-			public void SetName(string elemname) { this.name = elemname; }
-			public string GetParentHTId { get { return parenthtid; } }
-			public void SetParentHTId(string id) { this.parenthtid = id; }
 		}
 
 		public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
@@ -940,7 +928,7 @@ namespace ctlXMLEditLib
 			// initialization.
 			if (mytextbox.Tag == null)
 			{
-				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null, mytextbox.Name);
+				TextBoxAttrTag tag = new TextBoxAttrTag(false, pattern, radio, img, (img?imgname:null), null);
 				mytextbox.Tag = (object) tag;
 			}
 			return getannot;
@@ -1148,7 +1136,6 @@ namespace ctlXMLEditLib
 				mytextbox = new TextBox();
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
-				mytextbox.Name = tFieldName;
 				myHT.Add(tFieldName, mytextbox);
 				tabindx++;
 				Controls.Add(mytextbox);
@@ -1205,39 +1192,14 @@ namespace ctlXMLEditLib
 		// C2021-026 Event handler for Parent/Child child textbox
 		//           if the textbox text is same as parent, then or nothing is entered in the textbox
 		//           then use the parent value and set the text color to gray
-		// B2025-028 RO Editor - Parent Child Applicability - Default Values
-		//           Were always setting to the Group parent value instead of individual parent values
-		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
 			TextBox tb = sender as TextBox;
 			string dfTxt = "";
-			try
+			string parName = pcGrpBox.Name.Substring(5);
-			{
+			object o = myHT[parName];
-				string parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
+			if (o != null)
-				if (!string.IsNullOrEmpty(parentid))
+				dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				{
-					object o = myHT[parentid];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
-				}
-				else
-                {
-
-					string parName = pcGrpBox.Name.Substring(5);
-					object o = myHT[parName];
-					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-				}
-			}
-            catch 
-			{
-				string parName = pcGrpBox.Name.Substring(5);
-				object o = myHT[parName];
-				if (o != null)
-					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
-			}
-
 			if (dosaveflag) mysavexml = true;
 			if (tb.Text.Length == 0 || tb.Text == dfTxt)
 			{

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -1,203 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    // C2025-027 Annotation Type Filtering
-    public partial class dlgAnnotationsSelect : Form
-    {
-        public dlgAnnotationsSelect()
-        {
-            InitializeComponent();
-        }
-
-        public dlgAnnotationsSelect(string userid)
-        {
-            InitializeComponent();
-            UserID = userid;
-        }
-
-        private int _MyItemID;
-        public int MyItemID
-        {
-            get { return _MyItemID; }
-            set { _MyItemID = value; }
-        }
-
-        private string _UserID;
-        public string UserID
-        {
-            get { return _UserID; }
-            set { _UserID = value; }
-        }
-
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstUnselected, lstSelected);
-        }
-
-        // Move selected items to lstUnselected.
-        private void btnDeselect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstSelected, lstUnselected);
-        }
-
-        // Move selected items from one ListBox to another.
-        private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
-        {
-            while (lstFrom.SelectedItems.Count > 0)
-            {
-                lstSelected.DisplayMember = "NameStr";
-                lstSelected.ValueMember = "TypeID";
-
-                AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0];
-                lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID));
-                lstFrom.Items.Remove(item);
-            }
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstSelected.
-        private void btnSelectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstUnselected, lstSelected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstUnselected.
-        private void btnDeselectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstSelected, lstUnselected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items from one ListBox to another.
-        private void MoveAllItems(ListBox lstFrom, ListBox lstTo)
-        {
-            lstTo.Items.AddRange(lstFrom.Items);
-            lstFrom.Items.Clear();
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Enable and disable buttons.
-        private void lst_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetButtonsEditable();
-        }
-        // Save selected list to DB.
-        private void btnUpdate_Click(object sender, EventArgs e)
-        {
-            saveChanges();
-        }
-        public class AnnotataionItem
-        {
-            private string _NameStr;
-            private int _TypeID;
-
-            public AnnotataionItem(string NameStr, int TypeID)
-            {
-                this._NameStr = NameStr;
-                this._TypeID = TypeID;
-            }
-            public string NameStr
-            {
-                get
-                {
-                    return _NameStr;
-                }
-            }
-            public int TypeID
-            {
-                get
-                {
-                    return _TypeID;
-                }
-            }
-        }
-
-        // Enable and disable buttons.
-        private void SetButtonsEditable()
-        {
-            btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0);
-            btnSelectAll.Enabled = (lstUnselected.Items.Count > 0);
-            btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0);
-            btnDeselectAll.Enabled = (lstSelected.Items.Count > 0);
-        }
-
-        private void DlgAnnotationsSelect_Load(object sender, EventArgs e)
-        {
-            lstUnselected.DisplayMember = "NameStr";
-            lstUnselected.ValueMember = "TypeID";
-            SetButtonsEditable();
-            DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID);
-            foreach (DataRow dr in AnnoType.Rows)
-            {
-                lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"]));
-            }
-
-            lstSelected.DisplayMember = "NameStr";
-            lstSelected.ValueMember = "TypeID";
-            DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
-
-            foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows)
-            {
-                lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
-            }
-            btnUpdate.Enabled = false;
-        }
-
-        private void btnCancel_Click_1(object sender, EventArgs e)
-        {
-            if (btnUpdate.Enabled == true)
-            {
-                string message = "Changes have not yet been saved.  Do you want to save the changes prior to closing?";
-                string title = "Save Annotation Selections";
-                MessageBoxButtons buttons = MessageBoxButtons.YesNo;
-                DialogResult result = MessageBox.Show(message, title, buttons);
-                if (result == DialogResult.Yes)
-                {
-                    saveChanges();
-                    this.Close();
-                }
-                else
-                {
-                    this.Close();
-                }
-            }
-            else
-            {
-                this.Close();
-            }
-        }
-
-        private DataTable coverToTable()
-        {
-            DataTable dt = new DataTable();
-            dt.Columns.Add("TypeID", typeof(Int32));
-
-
-            foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
-            {
-                dt.Rows.Add(item.TypeID);
-            }
-            return dt;
-        }
-        private void saveChanges()
-        {
-            DataTable dt2 = coverToTable();
-            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
-            btnUpdate.Enabled = false;
-        }
-    }
-}
-

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -393,7 +393,6 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
-			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;
@@ -419,12 +418,7 @@ namespace VEPROMS
 			//txbPDFLocation.Text = _PDFPath;
 			BuildPDFFileName();
 			ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
-			// C2025-033 set which Child procedure is being printed used for PageStyle items
+			if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
-			VlnSvgPageHelper.PrintingChild = SelectedSlave;
-			if (SelectedSlave > 0)
-			{
-				pc.SelectedSlave = SelectedSlave;
-			}
 			if (pc != null)
 			{
 				//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1,3 +1,5 @@
+
+
 Set NoCount On;
 
 If (db_name() in('master','model','msdn','tempdb'))
@@ -23808,60 +23810,6 @@ GO
 IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettings Succeeded'
 ELSE PRINT 'Running vesp_UpdateUserSettings Failed to Execute'
 GO
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 5/19/2025
--- Description:	Allow option to not prompt user with MS Word messages
---   when generating Summaries
--- =============================================
---- MSWordSummaryPrompt = ahouls user be prompted with message?
---    default = yes (true)
-IF NOT EXISTS(SELECT *
-          FROM   INFORMATION_SCHEMA.COLUMNS
-          WHERE  TABLE_NAME = 'Users'
-                 AND COLUMN_NAME = 'MSWordSummaryPrompt') 
-ALTER TABLE Users ADD MSWordSummaryPrompt bit NOT NULL DEFAULT(1);
-go
--- Display the status
-IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for MSWordSummaryPrompt'
-ELSE PRINT 'Altered table [Users] Error on Alter for MSWordSummaryPrompt'
-go
-
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateUserSettingMSWordSummaryPrompt]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_UpdateUserSettingMSWordSummaryPrompt];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Matthew Schill
--- Create date: 5/19/2025
--- Description:	Allow option to not prompt user with MS Word messages
---   when generating Summaries
--- =============================================
-CREATE PROCEDURE [dbo].[vesp_UpdateUserSettingMSWordSummaryPrompt]
-
-(
-	@UID varchar(100),
-	@Prompt bit = null
-)
-WITH EXECUTE AS OWNER
-AS
-   UPDATE Users SET 
-     MSWordSummaryPrompt = ISNULL(@Prompt, MSWordSummaryPrompt)
-	WHERE UserID =@UID
-
-	RETURN
-GO
-
-IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettingMSWordSummaryPrompt Succeeded'
-ELSE PRINT 'Running vesp_UpdateUserSettingMSWordSummaryPrompt Failed to Execute'
-GO
-
 ---  begin changes for:
 ---C2025-023 - Electronic Procedures - Modifications to PROMS
 --- The following IsEPAnnotationType column was added for EP Annotations.
@@ -24024,7 +23972,7 @@ Begin -- Rofst Tables
 	 CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED 
 	(
 		[FormatID] ASC
-	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
 	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 
 	IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
@@ -24033,7 +23981,6 @@ Begin -- Rofst Tables
 End
 Go
 
-
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateEPFormat]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [vesp_UpdateEPFormat];
 GO
@@ -24074,217 +24021,6 @@ ELSE
 
 GO
 
--- C2025-027 Annotation Type Filtering
-/****** Object:  Table [dbo].[AnnotationTypeSelections]    Script Date: 7/10/2025 2:38:23 PM ******/
-SET ANSI_NULLS ON
-GO
-
-SET QUOTED_IDENTIFIER ON
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Store user Annotation selections for annotation filter.
--- =============================================
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
-BEGIN
-
-	CREATE TABLE [dbo].[AnnotationTypeSelections](
-		[ASTypeID] [int] IDENTITY(1,1) NOT NULL,
-		[TypeID] [int] NULL,
-		[UserID] [varchar](50) NULL,
-		[LastChanged] [datetime] NULL,
-		CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED 
-		([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-			) ON [PRIMARY]
-END
-
-IF OBJECT_ID('DF_AnnotationTypeSelections_LastChanged', 'D') IS NULL
-	ALTER TABLE AnnotationTypeSelections ADD CONSTRAINT [DF_AnnotationTypeSelections_LastChanged]  DEFAULT (getdate()) for [LastChanged];
-GO
-
-IF EXISTS (SELECT *  FROM sys.indexes  WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' 
-AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]'))
-begin
-DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections];
-end
-
-CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]
-(
-[UserID] ASC,
-[TypeID] ASC
-)
-INCLUDE (ASTypeID)
-WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationSelectListTypes];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 7/10/2025
--- Description:	Retrieve Annotation Types not added to Annotation type filtering by user.
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
-(
-	@UserID varchar(50)
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		AT.[TypeID],
-		AT.[Name],
-		AT.[Config],
-		AT.[DTS],
-		AT.[UserID],
-		AT.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount],
-		AT.[IsEPAnnotationType]
-	FROM [AnnotationTypes] AT
-	LEFT OUTER JOIN AnnotationTypeSelections ATS 
-	ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID	    
-	WHERE ATS.ASTypeID IS NULL
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeSelections];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeSelections]
-(
-	@UsrID varchar(50)
-)
-AS
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeFiltered];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeFiltered]
-(
-	@UsrID varchar(50)
-)
-AS
-BEGIN
-	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0)
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-	ELSE
-	BEGIN
-		SELECT
-			[TypeID],
-			[Name],
-			[Config],
-			[DTS],
-			[UserID],
-			[LastChanged],
-			(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-			[IsEPAnnotationType]
-		FROM [AnnotationTypes]
-	END
-END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [UpdateAnnotationstypeSelections];
-
--- Need to drop UpdateAnnotationstypeSelections SP first so script can drop and recreate the TableValAnnotTypeSelections table type 
-
-IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' )
-    DROP TYPE [dbo].[TableValAnnotTypeSelections]
-
-CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE(
-	[TypeID] [int] NOT NULL
-							
-)
-GO
-
-/****** Object:  StoredProcedure [dbo].[UpdateAnnotationstypeSelections]    Script Date: 7/21/2025 8:51:42 PM ******/
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/21/2025
--- Description:	Manage user choice annotation types
--- =============================================
-CREATE PROC [dbo].[UpdateAnnotationstypeSelections]
-(
-	@TempTable AS dbo.TableValAnnotTypeSelections READONLY,
-	@UserID [varchar](50) NULL
-)
-AS
-BEGIN
-																	 
-															
-
-	DELETE FROM AnnotationTypeSelections where UserID = @UserID
-	AND
-	TypeID not in
-	(Select TypeID From @TempTable tmp)
-
-	--this would insert all the ones that are in the uploaded table and not already in AnnotationTypeSelections
-	Insert INTO AnnotationTypeSelections (TypeID, UserID)
-	Select tmp.TypeID, @UserID
-	FROM
-	@TempTable tmp
-	LEFT OUTER JOIN
-	AnnotationTypeSelections ATS on ATS.TypeID = tmp.TypeID
-	AND ATS.UserID = @UserID
-	where
-	ATS.ASTypeID IS NULL
-
-END
-GO
-
 IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded'
 ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute'
 GO
@@ -24293,7 +24029,6 @@ Go
 ---  end changes for:
 ---C2025-023 - Electronic Procedures - Modifications to PROMS
 
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24327,8 +24062,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/31/2025 10:30 AM'
+	set @RevDate = '4/8/2025 11:24'
-	set @RevDescription = 'SQL Optimization'
+	set @RevDescription = 'Added support for EP Viewer Editing'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -152,17 +152,6 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
-    <Compile Include="dlgAnnotationsSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
-    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -175,15 +164,6 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgExportImportEP.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgMSWordMessage.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgMSWordMessage.Designer.cs">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </Compile>
     <Compile Include="dlgCheckOpenTabs.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -351,13 +331,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="dlgMSWordMessage.resx">
-      <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="dlgCheckOpenTabs.resx">
       <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
     </EmbeddedResource>

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -1,229 +0,0 @@
-
-namespace VEPROMS
-{
-	partial class dlgAnnotationsSelect
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.lstUnselected = new System.Windows.Forms.ListBox();
-			this.lstSelected = new System.Windows.Forms.ListBox();
-			this.btnSelect = new System.Windows.Forms.Button();
-			this.btnSelectAll = new System.Windows.Forms.Button();
-			this.btnDeselectAll = new System.Windows.Forms.Button();
-			this.btnDeselect = new System.Windows.Forms.Button();
-			this.btnUpdate = new System.Windows.Forms.Button();
-			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.lblMessage = new System.Windows.Forms.Label();
-			this.lblAvailableTypes = new System.Windows.Forms.Label();
-			this.lblSelected = new System.Windows.Forms.Label();
-			this.tableLayoutPanel1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// lstUnselected
-			// 
-			this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstUnselected.FormattingEnabled = true;
-			this.lstUnselected.IntegralHeight = false;
-			this.lstUnselected.ItemHeight = 16;
-			this.lstUnselected.Location = new System.Drawing.Point(3, 3);
-			this.lstUnselected.Name = "lstUnselected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4);
-			this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstUnselected.Size = new System.Drawing.Size(287, 347);
-			this.lstUnselected.TabIndex = 0;
-			this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// lstSelected
-			// 
-			this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstSelected.FormattingEnabled = true;
-			this.lstSelected.IntegralHeight = false;
-			this.lstSelected.ItemHeight = 16;
-			this.lstSelected.Location = new System.Drawing.Point(334, 3);
-			this.lstSelected.Name = "lstSelected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4);
-			this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstSelected.Size = new System.Drawing.Size(288, 347);
-			this.lstSelected.TabIndex = 1;
-			this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// btnSelect
-			// 
-			this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelect.Location = new System.Drawing.Point(298, 32);
-			this.btnSelect.Name = "btnSelect";
-			this.btnSelect.Size = new System.Drawing.Size(28, 23);
-			this.btnSelect.TabIndex = 2;
-			this.btnSelect.Text = ">";
-			this.btnSelect.UseVisualStyleBackColor = true;
-			this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-			// 
-			// btnSelectAll
-			// 
-			this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelectAll.Location = new System.Drawing.Point(296, 120);
-			this.btnSelectAll.Name = "btnSelectAll";
-			this.btnSelectAll.Size = new System.Drawing.Size(32, 23);
-			this.btnSelectAll.TabIndex = 3;
-			this.btnSelectAll.Text = ">>";
-			this.btnSelectAll.UseVisualStyleBackColor = true;
-			this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
-			// 
-			// btnDeselectAll
-			// 
-			this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselectAll.Location = new System.Drawing.Point(297, 207);
-			this.btnDeselectAll.Name = "btnDeselectAll";
-			this.btnDeselectAll.Size = new System.Drawing.Size(30, 26);
-			this.btnDeselectAll.TabIndex = 5;
-			this.btnDeselectAll.Text = "<<";
-			this.btnDeselectAll.UseVisualStyleBackColor = true;
-			this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click);
-			// 
-			// btnDeselect
-			// 
-			this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselect.Location = new System.Drawing.Point(298, 297);
-			this.btnDeselect.Name = "btnDeselect";
-			this.btnDeselect.Size = new System.Drawing.Size(28, 23);
-			this.btnDeselect.TabIndex = 4;
-			this.btnDeselect.Text = "<";
-			this.btnDeselect.UseVisualStyleBackColor = true;
-			this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click);
-			// 
-			// btnUpdate
-			// 
-			this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnUpdate.Location = new System.Drawing.Point(536, 422);
-			this.btnUpdate.Name = "btnUpdate";
-			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
-			this.btnUpdate.TabIndex = 8;
-			this.btnUpdate.Text = "Save";
-			this.btnUpdate.UseVisualStyleBackColor = true;
-			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
-			// 
-			// tableLayoutPanel1
-			// 
-			this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.tableLayoutPanel1.ColumnCount = 3;
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0);
-			this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1);
-			this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62);
-			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-			this.tableLayoutPanel1.RowCount = 4;
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353);
-			this.tableLayoutPanel1.TabIndex = 6;
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.Location = new System.Drawing.Point(411, 422);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(100, 35);
-			this.btnCancel.TabIndex = 9;
-			this.btnCancel.Text = "Close";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
-			// 
-			// lblMessage
-			// 
-			this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblMessage.Location = new System.Drawing.Point(43, 12);
-			this.lblMessage.Name = "lblMessage";
-			this.lblMessage.Size = new System.Drawing.Size(317, 16);
-			this.lblMessage.TabIndex = 10;
-			this.lblMessage.Text = "Updates will appear when PROMS is restarted.";
-			// 
-			// lblAvailableTypes
-			// 
-			this.lblAvailableTypes.AutoSize = true;
-			this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43);
-			this.lblAvailableTypes.Name = "lblAvailableTypes";
-			this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16);
-			this.lblAvailableTypes.TabIndex = 11;
-			this.lblAvailableTypes.Text = "Types Available ";
-			// 
-			// lblSelected
-			// 
-			this.lblSelected.AutoSize = true;
-			this.lblSelected.Location = new System.Drawing.Point(343, 43);
-			this.lblSelected.Name = "lblSelected";
-			this.lblSelected.Size = new System.Drawing.Size(104, 16);
-			this.lblSelected.TabIndex = 12;
-			this.lblSelected.Text = "Types Selected";
-			// 
-			// dlgAnnotationsSelect
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(653, 466);
-			this.Controls.Add(this.lblSelected);
-			this.Controls.Add(this.lblAvailableTypes);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.tableLayoutPanel1);
-			this.Controls.Add(this.btnUpdate);
-			this.Controls.Add(this.lblMessage);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "dlgAnnotationsSelect";
-			this.Text = "Filter Annotation Types";
-			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
-			this.tableLayoutPanel1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.ListBox lstUnselected;
-		private System.Windows.Forms.ListBox lstSelected;
-		private System.Windows.Forms.Button btnSelect;
-		private System.Windows.Forms.Button btnSelectAll;
-		private System.Windows.Forms.Button btnDeselectAll;
-		private System.Windows.Forms.Button btnDeselect;
-		private System.Windows.Forms.Button btnUpdate;
-
-		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Label lblMessage;
-		private System.Windows.Forms.Label lblAvailableTypes;
-		private System.Windows.Forms.Label lblSelected;
-	}
-}

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -65,13 +65,11 @@ namespace VEPROMS
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
 			ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
 			InitializeComponent();
 			FlexGridAddEvents();
-			_MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			SetupComboBoxes();
 			foreach (ProcedureInfo pi in myDocVersion.Procedures)
@@ -103,7 +101,6 @@ namespace VEPROMS
 			//fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor);
 			//fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit);
 			//fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit);
-			fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			//fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown);
 			//fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); 
@@ -278,7 +275,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -299,7 +295,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myProcedure.MyDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -455,7 +450,6 @@ namespace VEPROMS
 			int checkedCount = clbMore.CheckedItems.Count;
 			string oldLabel = lblMore.Text;
 			pbMore.Visible = true;
-			ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			List<ProcedureInfo> myProcs = new List<ProcedureInfo>();
 			// B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel)

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -1,347 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    //C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
-    //class inherits from normal import/export form
-    //then adds additional functionality
-#pragma warning disable S101 // Types should be named in PascalCase
-    public partial class dlgExportImportEP : dlgExportImport
-#pragma warning restore S101 // Types should be named in PascalCase
-	{
-		private readonly AnnotationTypeInfo _AnnotationType;
-        private readonly string multiseparator = ",";
-
-		private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]");
-
-        public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex)
-        {
-            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-            _ExportBothConvertedandNot = true;
-            DocReplace = new Dictionary<int, byte[]>();
-            FormClosed += OnClose;
-            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {folderInfo.Name}";
-		}
-        public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex)
-        {
-            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-            _ExportBothConvertedandNot = true;
-            DocReplace = new Dictionary<int, byte[]>();
-            FormClosed += OnClose;
-            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {docVersionInfo.Name} of {docVersionInfo.MyFolder.Name}";
-		}
-        public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex)
-		{
-			_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-			_ExportBothConvertedandNot = true;
-			DocReplace = new Dictionary<int, byte[]>();
-			FormClosed += OnClose;
-			Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {procedureInfo.DisplayNumber}";
-		}
-
-		//Overridden function to handle export of EP data
-		protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii)
-		{
-			if (_UnitIndex > 0)
-            {
-				ii.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
-				ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
-            }
-
-            //switch to handle customizations for different formats
-            switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
-			{
-				default:
-					ExportEPAnnotationInfo_Default(xe, ii);
-					break;
-			}
-
-			ii.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-			ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-
-		}
-
-		//default export of EP Data
-		private void ExportEPAnnotationInfo_Default(XmlElement xe, ItemInfo ii)
-		{
-			//Add tab text to item
-			string steptab = Volian.Print.Library.PDFReport.BuildStepTab(ii);
-			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "StepTab", steptab));
-
-			//Add db sequence to item
-			string dbsequence = dbSeq(ii);
-			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dbsequence", dbsequence));
-
-			//get first transition in item and add it as an xml element
-			if (ii.MyContent.ContentTransitionCount > 0)
-			{
-				TransitionInfo ct = ii.MyContent.ContentTransitions[0];
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionToItemID", ct.ToID.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionTodbsequence", dbSeq(ct.ToID)));
-			}
-
-			//export EP annotation details under an EPInfo node
-			if (ii.ItemAnnotations != null)
-			{
-				XmlElement xepinfo = xe.OwnerDocument.CreateElement("EPInfo");
-
-				EPFields myEPFields = ii.GetValidEPFields(_AnnotationType.TypeID);
-				ROFSTLookup lookup = ii.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(ii.MyDocVersion);
-				bool epexportblank = ii.EPexportblank(_AnnotationType.TypeID); //should blank xml elements export?
-
-				//grab the current RO db so will know location of RO files and default graphics ext.
-                using (RODbInfo myRODB = (RODbInfoList.Get()).FirstOrDefault(x => x.RODbID == ii.MyDocVersion.DocVersionAssociations[0].MyROFst.RODbID))
-                {
-					//For each annotation in the item that is of the current EP Annotation type
-					foreach (var EPAnnotation in ii.ItemAnnotations.Where(x => x.TypeID == _AnnotationType.TypeID))
-					{
-						var EPAnnotationConfig = new AnnotationConfig(EPAnnotation.Config);
-
-						XmlElement xepdetails = xe.OwnerDocument.CreateElement("Details");
-						//include the annotation ID for reference
-						xepdetails.Attributes.SetNamedItem(AddAttribute(xepdetails.OwnerDocument, "AnnotationID", EPAnnotation.AnnotationID.ToString()));
-
-						//loop through each EP Field - name the xml elements the EP.name
-						foreach (EPField EP in myEPFields)
-						{
-							string val = EPAnnotationConfig.GetValue("EP", EP.name);
-
-							if (epexportblank || !string.IsNullOrEmpty(val))
-							{
-
-								if (_UnitIndex != 0)
-								{
-									val = DisplayText.ResolveUnitSpecific(ii.MyDocVersion, val);
-								}
-
-								XmlElement xindivid = xe.OwnerDocument.CreateElement(EP.name);
-
-								//need to resolve ROs ROSingle, ROMulti, in text
-								//get values
-								switch (EP.type.ToLower())
-								{
-									case "text":
-
-										//for text, check if any embedded ROs
-										//if none, set the xml element to the text
-										//otherwise resolve the ROs
-										MatchCollection matches = _ROAccPageTokenPattern.Matches(val);
-										if (matches.Count == 0)
-										{
-											xindivid.InnerText = val;
-										}
-										else
-										{
-											//resolve ROs
-											//text ROs will replace the AccID key in the text
-											//for binary objects like images,
-											//we will keep the AccID in the text and output the binary as a separate child
-											//XML element with the same xml name as the AccID
-											foreach (Match m in matches)
-											{
-												ROFSTLookup.rochild roc = lookup.GetROChildByAccPageID(m.Groups[0].Value);
-
-												// Exclude replacing Images since are binary - for those, add a sub item
-												if (Enumerable.Range(8, 15).Contains(roc.type))
-												{
-													xindivid.InnerText = val;
-
-													XmlElement xroid = AddGraphic(xindivid, m.Groups[0].Value, roc, myRODB, roc.type != 8);
-
-													xindivid.AppendChild(xroid);
-												}
-												else if (!string.IsNullOrEmpty(roc.value))
-												{
-													bool convertCaretToDeltaSymbol = (ii.ActiveSection != null) && ii.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta;
-
-													string rocvalue = roc.value.Replace("`", "\xB0");
-													rocvalue = rocvalue.Replace("\xF8", "\xB0");
-													rocvalue = rocvalue.Replace("\x7F", "\x394"); //delta
-													if (convertCaretToDeltaSymbol) rocvalue = rocvalue.Replace("^", "\x394"); // delta
-													val = val.Replace($"{m.Groups[0].Value}", rocvalue);
-													xindivid.InnerText = val;
-												}
-											}
-										}
-										break;
-									case "rosingle":
-										//Get the output columns from the EPFormatFile
-										//set the "Item" nodes value = to those resolved items
-										//separated by multiseparator
-										XmlElement xindivid_rosingle = xindivid.OwnerDocument.CreateElement("Item");
-										xindivid_rosingle.Attributes.SetNamedItem(AddAttribute(xindivid_rosingle.OwnerDocument, "ROID", val));
-
-										//add values specified in EP input list
-										List<string> ro_single_tmp = EP.getROValuesList(EPAnnotation, val);
-										xindivid_rosingle.InnerText = String.Join(multiseparator, ro_single_tmp.ToArray());
-
-										//if image, add location and binary of image
-										// - images are type 8
-										//   but if multiple return values could combine
-										//   for example an text (1) + image (8) would be 9
-										ROFSTLookup.rochild roc_single = lookup.GetRoChild(val);
-										if (Enumerable.Range(8, 15).Contains(roc_single.type))
-										{
-											XmlElement xroid = AddGraphic(xindivid, val, roc_single, myRODB, roc_single.type != 8);
-											xindivid_rosingle.AppendChild(xroid);
-										}
-
-										xindivid.AppendChild(xindivid_rosingle);
-										break;
-									case "romulti":
-										//Get the output columns from the EPFormatFile
-										//create an "Item" subnode for each selected RO
-										//set the nodes value = to those resolved items
-										//separated by multiseparator
-										foreach (string ival in val.Split(multiseparator.ToCharArray()))
-										{
-											XmlElement xindivid_romulti = xindivid.OwnerDocument.CreateElement("Item");
-											xindivid_romulti.Attributes.SetNamedItem(AddAttribute(xindivid_romulti.OwnerDocument, "ROID", ival));
-
-											//add values specified in EP input list
-											List<string> ro_multi_tmp = EP.getROValuesList(EPAnnotation, ival);
-											xindivid_romulti.InnerText = String.Join(multiseparator, ro_multi_tmp.ToArray());
-
-											//if image, add location and binary of image
-											// - images are type 8
-											//   but if multiple return values could combine
-											//   for example an text (1) + image (8) would be 9
-											ROFSTLookup.rochild roc_multi = lookup.GetRoChild(ival);
-											if (Enumerable.Range(8, 15).Contains(roc_multi.type))
-											{
-												XmlElement xroid = AddGraphic(xindivid, ival, roc_multi, myRODB, roc_multi.type != 8);
-												xindivid_romulti.AppendChild(xroid);
-											}
-
-											xindivid.AppendChild(xindivid_romulti);
-										}
-										break;
-									case "tableinput":
-										xindivid.InnerText = val;
-										break;
-									default:
-										xindivid.InnerText = val;
-										break;
-								}
-								xepdetails.AppendChild(xindivid);
-							}
-						}
-						xepinfo.AppendChild(xepdetails);
-					}
-
-				}
-
-				xe.AppendChild(xepinfo);
-			}
-
-		}
-
-		//return a db sequence string from an Item ID
-		private string dbSeq(int itemID)
-		{
-			using (ItemInfo ii = ItemInfo.Get(itemID))
-            {
-				return dbSeq(ii);
-			}
-		}
-
-        //return a db sequence string from an ItemInfo
-        private string dbSeq(ItemInfo ii) => $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
-
-        //For Exporting an RO that is an image
-        //returns the Location and FileName of the RO Image
-        private string GetROImageFileLocation(ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-			string rodbpath = rodb.FolderPath;
-
-			string rocval = roc.value;
-			if (rocval == null) rocval = Array.Find(roc.children, x => x.value.Contains('.')).value;
-
-			if (rocval == null) return "";
-			string imgname;
-			if (isMulti)
-			{
-				imgname = rocval.Substring(rocval.IndexOf(' ') + 1, rocval.IndexOf("\r\n") - rocval.IndexOf(' ') - 1);
-			}
-			else
-			{
-				imgname = rocval.Substring(0, rocval.IndexOf('\n'));
-			}
-			int thedot = imgname.LastIndexOf('.');
-			string fname = imgname;
-			if (thedot == -1 || (thedot != (imgname.Length - 4)))
-			{
-				RODbConfig roDbCfg = new RODbConfig(rodb.Config);
-				fname += string.Format(".{0}", roDbCfg.GetDefaultGraphicExtension());
-			}
-
-			string imgfile = Path.Combine(rodbpath, fname);
-			return imgfile;
-		}
-
-		//For Exporting an RO that is an image
-		//returns an xmlElement
-		// - that is a child to xindivid
-		// - that has a name of Name
-		// - that has a value of the binary representation of the image
-		// - that has an attribute designating the location of the image file
-		private XmlElement AddGraphic(XmlElement xindivid, string Name, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-            Name = Name.Replace("<", "").Replace(">", "");
-
-			XmlElement xroid = xindivid.OwnerDocument.CreateElement(Name);
-
-			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
-			if (string.IsNullOrEmpty(imgfile)) return xroid;
-			xroid.Attributes.SetNamedItem(AddAttribute(xroid.OwnerDocument, "Location", imgfile));
-
-			if (File.Exists(imgfile))
-			{
-				using (FileStream fsIn = new FileStream(imgfile, FileMode.Open, FileAccess.Read, FileShare.Read))
-				{
-					// Create an instance of StreamReader that can read characters from the FileStream.
-					using (BinaryReader r = new BinaryReader(fsIn))
-						xroid.InnerText = Encoding.Default.GetString(r.ReadBytes((int)fsIn.Length));
-				}
-			}
-
-			return xroid;
-		}
-
-		//overridden - used to set the RO location for RO Images that are not in annotations
-		protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
-			if (!string.IsNullOrEmpty(imgfile)) xindivid.Attributes.SetNamedItem(AddAttribute(xindivid.OwnerDocument, "Location", imgfile));
-		}
-
-		//overridden - used to set specific enhanced doc info
-		protected override void SetEPEnhancedDocLinks(ref XmlElement xe, ItemInfo ii)
-		{
-			EnhancedDocuments eds = ii.GetMyEnhancedDocuments();
-
-			if (eds != null && eds.Count == 1)
-			{
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocType", eds[0].Type.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToItemID", eds[0].ItemID.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToDbSeq", dbSeq(eds[0].ItemID)));
-			}
-		}
-
-		//clear objects to release memory
-		private void OnClose(object sender, EventArgs e)
-		{
-			DocReplace.Clear();
-			DocReplace = null;
-		}
-
-
-	}
-}

PROMS/VEPROMS User Interface/dlgMSWordMessage.Designer.cs

@@ -1,100 +0,0 @@
-
-namespace VEPROMS
-{
-    partial class dlgMSWordMessage
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.cbRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
-            this.btnOpenTabs = new DevComponents.DotNetBar.ButtonX();
-            this.SuspendLayout();
-            // 
-            // labelX1
-            // 
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(20, 12);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(520, 78);
-            this.labelX1.TabIndex = 0;
-            this.labelX1.Text = "The _______________ will be opened in MS Word.\r\n\r\nYou can make modifications and " +
-    "copy it into a PROMS Word section.";
-            this.labelX1.WordWrap = true;
-            // 
-            // cbRemember
-            // 
-            // 
-            // 
-            // 
-            this.cbRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.cbRemember.Location = new System.Drawing.Point(12, 96);
-            this.cbRemember.Name = "cbRemember";
-            this.cbRemember.Size = new System.Drawing.Size(566, 55);
-            this.cbRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.cbRemember.TabIndex = 1;
-            this.cbRemember.Text = "Check this box to not be prompted in the future when generating summaries that wi" +
-    "ll be opened in MS Word. \r\n\nNote that these settings can be adjusted at any time" +
-    " from the OPTIONS menu for PROMS.";
-            // 
-            // btnOpenTabs
-            // 
-            this.btnOpenTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnOpenTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnOpenTabs.DialogResult = System.Windows.Forms.DialogResult.Yes;
-            this.btnOpenTabs.Location = new System.Drawing.Point(490, 126);
-            this.btnOpenTabs.Name = "btnOpenTabs";
-            this.btnOpenTabs.Size = new System.Drawing.Size(64, 25);
-            this.btnOpenTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnOpenTabs.TabIndex = 2;
-            this.btnOpenTabs.Text = "OK";
-            this.btnOpenTabs.Click += new System.EventHandler(this.btnTabs_Click);
-            // 
-            // dlgMSWordMessage
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(567, 163);
-            this.ControlBox = false;
-            this.Controls.Add(this.btnOpenTabs);
-            this.Controls.Add(this.cbRemember);
-            this.Controls.Add(this.labelX1);
-            this.Name = "dlgMSWordMessage";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevComponents.DotNetBar.LabelX labelX1;
-        private DevComponents.DotNetBar.Controls.CheckBoxX cbRemember;
-        private DevComponents.DotNetBar.ButtonX btnOpenTabs;
-    }
-}

PROMS/VEPROMS User Interface/dlgMSWordMessage.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using VEPROMS.CSLA.Library;
-using Volian.Base.Library;
-
-namespace VEPROMS
-{
-    public partial class dlgMSWordMessage : Form
-    {
-        //C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-        //typeofitem will be: Continuous Action/Time Critical Action
-        public dlgMSWordMessage(string typeofitem)
-        {
-            InitializeComponent();
-            Text = $"{typeofitem} Summary";
-            labelX1.Text = $"The {typeofitem} Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-        }
-
-        public bool ShouldDisplay()
-        {
-            UserSettings usersettings = new UserSettings(VlnSettings.UserID);
-            return usersettings.UserSetting_MSWord_Summary_Prompt;
-        }
-
-        private void btnTabs_Click(object sender, EventArgs e)
-        {
-            //if checkbox was checked in form, then update User Settings in database
-            if (cbRemember.Checked)
-            {
-                UserSettings usersettings = new UserSettings(VlnSettings.UserID);
-                usersettings.SetUserSetting_MSWord_Summary_Prompt(false);
-            }
-
-            this.Close();
-        }
-
-    }
-}

PROMS/VEPROMS User Interface/dlgMSWordMessage.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -40,7 +40,6 @@ namespace VEPROMS
 				rb.Parent = pnlGroups;
 				rb.Dock = DockStyle.Top;
 				rb.Tag = gi;
-				rb.CheckedChanged -= new EventHandler(rb_CheckedChanged);
 				rb.CheckedChanged += new EventHandler(rb_CheckedChanged);
 				pnlGroups.Controls.Add(rb);
 				rb.BringToFront();

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -254,7 +254,6 @@ namespace VEPROMS
 			if (CancelStop) btnCancel.Visible = true;
 			Application.DoEvents();
 
-			MyPromsPrinter.StatusChanged -= new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.DocReplace = DocReplace;  // used when approve generates an export with unlinked ROs and Transitions
 
@@ -396,11 +395,8 @@ namespace VEPROMS
 				// this will display the generated Continuous Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
 				if (MyPromsPrinter.MyContActSummary != null)
 				{
-                    //C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
+					string instructions = "The Continuous Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-                    using (dlgMSWordMessage msg = new dlgMSWordMessage("Continuous Action"))
+					MessageBox.Show(instructions, "Continuous Action Summary");
-                    {
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
 
 					// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
 					// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds
@@ -414,11 +410,8 @@ namespace VEPROMS
 				// F2022-024 this will display the generated Time Critical Action Summary in MS Word (starting a new instance of MS Word outside of PROMS)
 				if (MyPromsPrinter.MyTimeCriticalActSummary != null)
 				{
-					//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
+					string instructions = "The Time Critical Action Summary will be opened in MS Word.\n\nYou can make modifications and copy it into a PROMS Word section.";
-					using (dlgMSWordMessage msg = new dlgMSWordMessage("Time Critical Action"))
+					MessageBox.Show(instructions, "Time Critical Action Summary");
-					{
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
 
 					// The ContActSummaryDelay is a switch that can be added to the PROMS.exe shortcut
 					// ex: VEPROMS.EXE /ContActSummaryDelay=2.5 will delay it 2 1/2 seconds

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -100,9 +100,7 @@ namespace VEPROMS
 			cbOTRemember.Checked = _usersettings.UserSetting_OpenTabs_Remember;
 			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
 			cbOTAutoOpen.Checked = _usersettings.UserSetting_OpenTabs_AutoOpen || !cbOTRemember.Checked;
-
+			
-			//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-			cbMSWordPrompt.Checked = _usersettings.UserSetting_MSWord_Summary_Prompt;
 		}
 		private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
 		{
@@ -174,9 +172,6 @@ namespace VEPROMS
             }
             _usersettings.SetUserSettings(cbOTRemember.Checked, OTAuto);
 
-			//C2025-013 - Allow not continuously generate message that opening Summaries in MS Word
-			_usersettings.SetUserSetting_MSWord_Summary_Prompt(cbMSWordPrompt.Checked);
-
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
@@ -365,11 +360,5 @@ namespace VEPROMS
 			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
 			Properties.Settings.Default.Save(); // save settings
 		}
-
+    }
-		private void cbShwAnnoFilter_Click(object sender, EventArgs e)
-		{
-			frmVEPROMS.tv_SelectAnnotations();
-		}
-
-	}
 }

PROMS/VEPROMS User Interface/frmSysOptions.resx

@@ -125,7 +125,7 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
         JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
-        QVQ4T2P4//8/AyUYQjAwgAiSMYoB6CYTwqMGjBowXA0gB8MNoAQDALEslYfhkv70AAAAAElFTkSuQmCC
+        QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -47,13 +47,13 @@ namespace VEPROMS
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
+			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
 			this.icRecentDocs = new DevComponents.DotNetBar.ItemContainer();
 			this.labelItem8 = new DevComponents.DotNetBar.LabelItem();
 			this.itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnOptions = new DevComponents.DotNetBar.ButtonItem();
 			this.btnExit = new DevComponents.DotNetBar.ButtonItem();
 			this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
-			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
 			this.galleryGroup1 = new DevComponents.DotNetBar.GalleryGroup();
 			this.galleryGroup2 = new DevComponents.DotNetBar.GalleryGroup();
 			this.galleryGroup3 = new DevComponents.DotNetBar.GalleryGroup();
@@ -208,13 +208,13 @@ namespace VEPROMS
 			this.btnHelp.KeyTips = "?";
 			this.btnHelp.Name = "btnHelp";
 			this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btnHelpManual,
+			this.btnHelpManual,
-            this.btnShortCuts,
+			this.btnShortCuts,
-            this.btnHelpVWeb,
+			this.btnHelpVWeb,
-            this.btnSendErrorLog,
+			this.btnSendErrorLog,
-            this.btnShowErrFld,
+			this.btnShowErrFld,
-            this.btnShowPrtFld,
+			this.btnShowPrtFld,
-            this.btnHelpAbout});
+			this.btnHelpAbout});
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -249,19 +249,23 @@ namespace VEPROMS
 			this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
 			// 
 			// btnShowErrFld
-			// 
+			//
+			//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
 			this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
 			this.btnShowErrFld.Name = "btnShowErrFld";
 			this.btnShowErrFld.Text = "Open Log Folder";
 			this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
 			// 
 			// btnShowPrtFld
-			// 
+			//
+			//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
 			this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
 			this.btnShowPrtFld.Name = "btnShowPrtFld";
 			this.btnShowPrtFld.Text = "Open Default Print Folder";
 			this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
 			// 
+			// 
+			// 
 			// btnHelpAbout
 			// 
 			this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
@@ -299,10 +303,6 @@ namespace VEPROMS
 			this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.itemContainer2,
             this.itemContainer5});
-			// 
-			// 
-			// 
-			this.itemContainer1.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -320,10 +320,6 @@ namespace VEPROMS
 			this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.itemContainer3,
             this.icRecentDocs});
-			// 
-			// 
-			// 
-			this.itemContainer2.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -344,10 +340,6 @@ namespace VEPROMS
             this.btnOpen,
             this.btnPrepare,
             this.btnAdmin});
-			// 
-			// 
-			// 
-			this.itemContainer3.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -371,6 +363,7 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
+
 			// 
 			// btnPrepare
 			// 
@@ -389,8 +382,16 @@ namespace VEPROMS
 			this.btnAdmin.CanCustomize = false;
 			this.btnAdmin.Image = global::VEPROMS.Properties.Resources.Admin;
 			this.btnAdmin.Name = "btnAdmin";
+			//this.btnAdmin.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+			//this.btnUpdateFormats});
 			this.btnAdmin.Text = "A&dministration";
 			// 
+			// btnUpdateFormats
+			// 
+			this.btnUpdateFormats.Name = "btnUpdateFormats";
+			this.btnUpdateFormats.Text = "Update Formats";
+			this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
+			// 
 			// icRecentDocs
 			// 
 			// 
@@ -403,10 +404,6 @@ namespace VEPROMS
 			this.icRecentDocs.Name = "icRecentDocs";
 			this.icRecentDocs.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.labelItem8});
-			// 
-			// 
-			// 
-			this.icRecentDocs.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -435,10 +432,6 @@ namespace VEPROMS
 			this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnOptions,
             this.btnExit});
-			// 
-			// 
-			// 
-			this.itemContainer5.TitleMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
@@ -451,7 +444,6 @@ namespace VEPROMS
 			this.btnOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOptions.Image")));
 			this.btnOptions.Name = "btnOptions";
 			this.btnOptions.SubItemsExpandWidth = 24;
-			this.superTooltip1.SetSuperTooltip(this.btnOptions, new DevComponents.DotNetBar.SuperTooltipInfo("Options", "", "Set User-Based PROMS Editing Preferences", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnOptions.Text = "Opt&ions";
 			this.btnOptions.Click += new System.EventHandler(this.btnOptions_Click);
 			// 
@@ -462,7 +454,6 @@ namespace VEPROMS
 			this.btnExit.Image = ((System.Drawing.Image)(resources.GetObject("btnExit.Image")));
 			this.btnExit.Name = "btnExit";
 			this.btnExit.SubItemsExpandWidth = 24;
-			this.superTooltip1.SetSuperTooltip(this.btnExit, new DevComponents.DotNetBar.SuperTooltipInfo("Exit", "", "Close and Exit PROMS", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.btnExit.Text = "E&xit";
 			this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
 			// 
@@ -470,12 +461,6 @@ namespace VEPROMS
 			// 
 			this.qatCustomizeItem1.Name = "qatCustomizeItem1";
 			// 
-			// btnUpdateFormats
-			// 
-			this.btnUpdateFormats.Name = "btnUpdateFormats";
-			this.btnUpdateFormats.Text = "Update Formats";
-			this.btnUpdateFormats.Click += new System.EventHandler(this.btnUpdateFormat_Click);
-			// 
 			// galleryGroup1
 			// 
 			this.galleryGroup1.Name = "galleryGroup1";
@@ -550,7 +535,7 @@ namespace VEPROMS
 			// 
 			this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
 			this.txtSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.txtSearch.Location = new System.Drawing.Point(810, 0);
+			this.txtSearch.Location = new System.Drawing.Point(820, 0);
 			this.txtSearch.Multiline = true;
 			this.txtSearch.Name = "txtSearch";
 			this.txtSearch.Size = new System.Drawing.Size(100, 25);
@@ -559,7 +544,7 @@ namespace VEPROMS
 			// btnPrevious
 			// 
 			this.btnPrevious.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnPrevious.Location = new System.Drawing.Point(910, 0);
+			this.btnPrevious.Location = new System.Drawing.Point(920, 0);
 			this.btnPrevious.Name = "btnPrevious";
 			this.btnPrevious.Size = new System.Drawing.Size(23, 25);
 			this.btnPrevious.TabIndex = 1;
@@ -569,7 +554,7 @@ namespace VEPROMS
 			// btnPrint1
 			// 
 			this.btnPrint1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnPrint1.Location = new System.Drawing.Point(933, 0);
+			this.btnPrint1.Location = new System.Drawing.Point(943, 0);
 			this.btnPrint1.Name = "btnPrint1";
 			this.btnPrint1.Size = new System.Drawing.Size(23, 25);
 			this.btnPrint1.TabIndex = 2;
@@ -581,7 +566,7 @@ namespace VEPROMS
 			this.cbScrunch.Checked = true;
 			this.cbScrunch.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.cbScrunch.Dock = System.Windows.Forms.DockStyle.Right;
-			this.cbScrunch.Location = new System.Drawing.Point(956, 0);
+			this.cbScrunch.Location = new System.Drawing.Point(966, 0);
 			this.cbScrunch.Name = "cbScrunch";
 			this.cbScrunch.Size = new System.Drawing.Size(24, 25);
 			this.cbScrunch.TabIndex = 3;
@@ -590,7 +575,7 @@ namespace VEPROMS
 			// btnNext
 			// 
 			this.btnNext.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnNext.Location = new System.Drawing.Point(980, 0);
+			this.btnNext.Location = new System.Drawing.Point(990, 0);
 			this.btnNext.Name = "btnNext";
 			this.btnNext.Size = new System.Drawing.Size(23, 25);
 			this.btnNext.TabIndex = 4;
@@ -601,7 +586,7 @@ namespace VEPROMS
 			// 
 			this.cmbFont.Dock = System.Windows.Forms.DockStyle.Right;
 			this.cmbFont.FormattingEnabled = true;
-			this.cmbFont.Location = new System.Drawing.Point(1003, 0);
+			this.cmbFont.Location = new System.Drawing.Point(1013, 0);
 			this.cmbFont.Name = "cmbFont";
 			this.cmbFont.Size = new System.Drawing.Size(172, 23);
 			this.cmbFont.TabIndex = 0;
@@ -611,10 +596,9 @@ namespace VEPROMS
 			// 
 			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
 			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-			this.lblDummy.Location = new System.Drawing.Point(1175, 0);
+			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
 			this.lblDummy.Name = "lblDummy";
 			this.lblDummy.Size = new System.Drawing.Size(10, 25);
-			this.lblDummy.TabIndex = 5;
 			this.lblDummy.Visible = false;
 			// 
 			// labelItem10
@@ -721,7 +705,7 @@ namespace VEPROMS
 			this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.epAnnotations.Enabled = false;
 			this.epAnnotations.Expanded = false;
-			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(5, 371, 1185, 202);
+			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202);
 			this.epAnnotations.ExpandOnTitleClick = true;
 			this.epAnnotations.Location = new System.Drawing.Point(5, 547);
 			this.epAnnotations.Name = "epAnnotations";
@@ -750,9 +734,8 @@ namespace VEPROMS
 			// ctrlAnnotationDetails
 			// 
 			this.ctrlAnnotationDetails.AnnotationDirty = false;
-			this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 " +
+			this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
-    "Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
-    "d\\f0\\fs20\\par\r\n}\r\n";
 			this.ctrlAnnotationDetails.Annotations = null;
 			this.ctrlAnnotationDetails.AnnotationText = "";
 			this.ctrlAnnotationDetails.ClientProcess = null;
@@ -761,7 +744,7 @@ namespace VEPROMS
 			this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ctrlAnnotationDetails.Enabled = false;
 			this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26);
-			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2);
+			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.ctrlAnnotationDetails.MyUserInfo = null;
 			this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
 			this.ctrlAnnotationDetails.ProcItem = null;
@@ -823,7 +806,6 @@ namespace VEPROMS
 			// tv
 			// 
 			this.tv.AllowDrop = true;
-			this.tv.DelProcReason = null;
 			this.tv.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tv.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.tv.HideSelection = false;
@@ -944,7 +926,7 @@ namespace VEPROMS
 			this.displayTags.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.displayTags.IsVisible = false;
 			this.displayTags.Location = new System.Drawing.Point(0, 0);
-			this.displayTags.Margin = new System.Windows.Forms.Padding(2);
+			this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.displayTags.MinimumSize = new System.Drawing.Size(100, 630);
 			this.displayTags.MyEditItem = null;
 			this.displayTags.Name = "displayTags";
@@ -1129,8 +1111,8 @@ namespace VEPROMS
 			this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.displayRO.Location = new System.Drawing.Point(1, 1);
 			this.displayRO.Margin = new System.Windows.Forms.Padding(4);
-			this.displayRO.MyDvi = null;
 			this.displayRO.MyROFST = null;
+			//this.displayRO.MyROFSTLookup = null;
 			this.displayRO.MyRTB = null;
 			this.displayRO.Name = "displayRO";
 			this.displayRO.ProgressBar = null;
@@ -1144,7 +1126,6 @@ namespace VEPROMS
 			this.tc.ChgId = null;
 			this.tc.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tc.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.tc.LastSelectedDisplayTabItem = null;
 			this.tc.Location = new System.Drawing.Point(334, 57);
 			this.tc.Margin = new System.Windows.Forms.Padding(4);
 			this.tc.MyAnnotationDetails = null;
@@ -1392,7 +1373,6 @@ namespace VEPROMS
 			// displaySearch1
 			// 
 			this.displaySearch1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.displaySearch1.LastSearchWasAnnotations = false;
 			this.displaySearch1.LoadingList = false;
 			this.displaySearch1.Location = new System.Drawing.Point(1, 1);
 			this.displaySearch1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1402,7 +1382,6 @@ namespace VEPROMS
 			this.displaySearch1.ProgressBar = null;
 			this.displaySearch1.ReportTitle = null;
 			this.displaySearch1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.displaySearch1.SearchIncTransII = null;
 			this.displaySearch1.SearchResults = null;
 			this.displaySearch1.SearchString = null;
 			this.displaySearch1.Size = new System.Drawing.Size(314, 462);

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -533,7 +533,6 @@ namespace VEPROMS
 
 			tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
 			tv.PrintSection += new vlnTreeViewEvent(tv_PrintSection);
-			tv.QPrintSection += new vlnTreeViewEvent(tv_QPrintSection);
 			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
@@ -543,6 +542,7 @@ namespace VEPROMS
 			tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures);
 			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);
@@ -707,32 +707,15 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
+					
+					dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
+					dlg.ShowDialog(this);
 
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					MySessionInfo.CheckInItem(ownerid);
-					//form for exporting Electronic Procedures from FolderInfo
+
-					if (args.AnnotationTypeId > 0)
+					if (args.Index == 1 && dlg.MyNewFolder != null)
 					{
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", fi, this, args.AnnotationTypeId, args.UnitIndex);
+						tv.AddNewNode(dlg.MyNewFolder);
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-
-						if (args.Index == 1 && dlg.MyNewFolder != null)
-						{
-							tv.AddNewNode(dlg.MyNewFolder);
-						}
-					}
-					else
-					{
-						dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-
-						if (args.Index == 1 && dlg.MyNewFolder != null)
-						{
-							tv.AddNewNode(dlg.MyNewFolder);
-						}
 					}
 				}
 			}
@@ -758,40 +741,18 @@ namespace VEPROMS
 
 					int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
 
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
-					//form for exporting Electronic Procedures from DocVersionInfo
+					dlg.MyNewProcedure = null;
-					if (args.AnnotationTypeId > 0)
+					dlg.ExternalTransitionItem = null;
-					{
+					dlg.ShowDialog(this);
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", dvi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.MyNewProcedure = null;
-						dlg.ExternalTransitionItem = null;
-						dlg.ShowDialog(this);
 
-						MySessionInfo.CheckInItem(ownerid);
+					MySessionInfo.CheckInItem(ownerid);
 
-						if (dlg.MyNewProcedure != null)
+					if (dlg.MyNewProcedure != null)
-							tv.AddNewNode(dlg.MyNewProcedure);
+						tv.AddNewNode(dlg.MyNewProcedure);
-
-						if (dlg.ExternalTransitionItem != null)
-							tc.OpenItem(dlg.ExternalTransitionItem);
-					}
-					else
-					{
-
-						dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
-						dlg.MyNewProcedure = null;
-						dlg.ExternalTransitionItem = null;
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-
-						if (dlg.MyNewProcedure != null)
-							tv.AddNewNode(dlg.MyNewProcedure);
-
-						if (dlg.ExternalTransitionItem != null)
-							tc.OpenItem(dlg.ExternalTransitionItem);
-					}
 
+					if (dlg.ExternalTransitionItem != null)
+						tc.OpenItem(dlg.ExternalTransitionItem);
 				}
 			}
 
@@ -807,24 +768,10 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(pi.ItemID, CheckOutType.Procedure);
+					dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter
+					dlg.ShowDialog(this);
 
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					MySessionInfo.CheckInItem(ownerid);
-					//form for exporting Electronic Procedures from ProcedureInfo
-					if (args.AnnotationTypeId > 0)
-					{
-						dlgExportImportEP dlg = new dlgExportImportEP("Export", pi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-					}
-					else
-					{
-
-						dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-					}
 				}
 			}
 		}
@@ -1266,19 +1213,7 @@ namespace VEPROMS
 
 		}
 
-		//Print Section
+		void tv_PrintSection(object sender, vlnTreeEventArgs args)  // Quick Print right click menu on Procedure name.
-		//C2025-028 Add a Quick Print Section option
-
-		void tv_PrintSection(object sender, vlnTreeEventArgs args)
-		{
-			PrintSection(sender, args, false);
-		}
-		void tv_QPrintSection(object sender, vlnTreeEventArgs args)
-		{
-			PrintSection(sender, args, true);
-		}
-
-		void PrintSection(object sender, vlnTreeEventArgs args, bool quickprint)
 		{
 			try
 			{
@@ -1290,9 +1225,7 @@ namespace VEPROMS
 
 				tc.SaveCurrentEditItem(si2.MyProcedure);
 
-				//B2025-032 Fix Section not Printing Applicability Properly
 				si2.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
-				si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(si2.MyProcedure))
 				{
@@ -1300,14 +1233,8 @@ namespace VEPROMS
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
+					prnDlg.ShowDialog(this);  // Create Print report
 
-					if (quickprint)
-						prnDlg.QPCreatePDF();  // Create Print report
-					else
-						prnDlg.ShowDialog(this);  // Create Print report
-
-					//B2025-032 Fix Section not Printing Applicability Properly
-					si2.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 					si2.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				}
 			}
@@ -1348,11 +1275,7 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-		public static void tv_SelectAnnotations()
+
-		{
-			dlgAnnotationsSelect sannoDlg = new dlgAnnotationsSelect(VlnSettings.UserID);
-			sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window
-		}
 		void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -1539,11 +1462,9 @@ namespace VEPROMS
 			// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
 			ProcedureInfo piThis = null;
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
+
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-			{
-				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-			}
 
 			// Check if Procedure Info is null
 			if (pi == null) return;
@@ -1585,11 +1506,8 @@ namespace VEPROMS
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
 
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
+			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
 
-			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
-			{
-				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-			}
 			// Check if Procedure Info is null
 			if (pi == null) return;
 
@@ -2249,14 +2167,14 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
-			// C2025-031 added tool tip messages
+			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
-			// remove commented out line below when User Control of Formats code is deleted
+			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
-			//this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", null, null, null, null, eTooltipColor.Gray));
-			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", null, null, null, null, eTooltipColor.Gray));
-
+			
 			try
 			{
 				MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID);
@@ -2278,9 +2196,6 @@ namespace VEPROMS
 			}
 
 			ctrlAnnotationDetails.MyUserInfo = MyUserInfo;
-			// re-set to old RTF initialization to older RFT string
-			ctrlAnnotationDetails.AnnotationRTFText= "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft Sans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs20\\par\r\n}\r\n";
-
 			DisplayRO.MyUserInfo = MyUserInfo; // set the user's security information in the properties RO panel
 			StepTabRibbon.MyUserInfo = MyUserInfo; // set the user's security information in the ribbon
 			DisplayTransition.MyUserInfo = MyUserInfo; // set the user's security information in the Transition panel
@@ -3662,13 +3577,9 @@ namespace VEPROMS
 			if (tn == null)
 				return;
 			_ExpandingTree = true;
-			tn.LoadingChildrenDone -= new VETreeNodeEvent(tn_LoadingChildrenDone);
 			tn.LoadingChildrenDone += new VETreeNodeEvent(tn_LoadingChildrenDone);
-			tn.LoadingChildrenMax -= new VETreeNodeEvent(tn_LoadingChildrenMax);
 			tn.LoadingChildrenMax += new VETreeNodeEvent(tn_LoadingChildrenMax);
-			tn.LoadingChildrenValue -= new VETreeNodeEvent(tn_LoadingChildrenValue);
 			tn.LoadingChildrenValue += new VETreeNodeEvent(tn_LoadingChildrenValue);
-			tn.LoadingChildrenSQL -= new VETreeNodeEvent(tn_LoadingChildrenSQL);
 			tn.LoadingChildrenSQL += new VETreeNodeEvent(tn_LoadingChildrenSQL);
 			tn.LoadChildren(true);
 		}
@@ -4389,11 +4300,7 @@ namespace VEPROMS
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
 			_LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null;
-			if (_LastStepRTB != null)
+			if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
-			{
-				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
-				_LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
-			}
 			lblEditView.Text = "    ";
 
 			if (args == null)
@@ -4528,7 +4435,6 @@ namespace VEPROMS
 					displayHistory.MyEditItem = args.MyEditItem;
 
 					lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View";
-					_CurrentItem.Deleted -= new ItemInfoEvent(_CurrentItem_Deleted);
 					_CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted);
 					dlgFindReplace.MyEditItem = args.MyEditItem;
 					SpellChecker.MyEditItem = args.MyEditItem;

PROMS/VEPROMS User Interface/frmVEPROMS.resx

@@ -172,16 +172,16 @@
   </data>
   <data name="btnShowErrFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
-        dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
+        oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnShowPrtFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
+        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
-        dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
+        oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnHelpAbout.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -339,9 +339,6 @@
         HM29CO23pWh3l/Bz4QZPYlnkk5YA/gbYS8m5Qty18AAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>240, 17</value>
-  </metadata>
   <data name="btnExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -392,6 +389,9 @@
         2AlZGRmMVIjXgI7OLub6xkaVtLS0ovT09IjCwkIWdDUgDAAMn43RSw4q2AAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>240, 17</value>
+  </metadata>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>651, 17</value>
   </metadata>

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

@@ -346,21 +346,21 @@ namespace VEPROMS.CSLA.Library
 			{
 				var ii = _CacheByPrimaryKey.FirstOrDefault();
 
-				while (ii.Value.Count > 0)
+					while (ii.Value.Count > 0)
-				{
+					{
-					if (ii.Value[0]?.MyContent?.ContentParts != null)
+						if (ii.Value[0]?.MyContent?.ContentParts != null)
-					{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
+							{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
-					ii.Value[0].Dispose();
+						ii.Value[0].Dispose();
-				}
+					}
 				_CacheByPrimaryKey.Remove(ii.Key);
 			}
 
 			while (_CacheList.Count > 0)
-			{
+				{
-				if (_CacheList[0]?.MyContent?.ContentParts != null)
+					if (_CacheList[0]?.MyContent?.ContentParts != null)
-					{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.Dispose(); }
+						{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.Dispose(); }
-				_CacheList[0].Dispose();
+					_CacheList[0].Dispose();
-			}
+				}
 		}
 
 		private bool _PrintAllAtOnce = false;
@@ -449,87 +449,88 @@ namespace VEPROMS.CSLA.Library
 		{
 			StringBuilder sret = new StringBuilder();
 			ItemInfo pitem = this;
+
 			while (!pitem.IsSection && !pitem.IsHigh)
-			{
+            {
-				using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
+                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
-				{
+                {
-					string thisTab = stpinfo.MyTab.CleanText;
+                    string thisTab = stpinfo.MyTab.CleanText;
 
-					string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
+                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
 
-					if (!string.IsNullOrEmpty(thisTab))
+                    if (!string.IsNullOrEmpty(thisTab))
-					{
+                    {
-						thisTab = thisTab.Trim();
+                        thisTab = thisTab.Trim();
-					}
+                    }
 
-					// if the tab is null or
+                    // if the tab is null or
-					// if the the tab is not a letter or number OR
+                    // if the the tab is not a letter or number OR
-					// the tab is an AND or OR type and is the letter "o"
+                    // the tab is an AND or OR type and is the letter "o"
-					// then reset the tab an empty string so that the type name along with the count of that type 
+                    // then reset the tab an empty string so that the type name along with the count of that type 
-					// (ex. "AND 2", "OR 3")
+                    // (ex. "AND 2", "OR 3")
-					if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
+                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
-					{
+                    {
-						thisTab = string.Empty;
+                        thisTab = string.Empty;
-					}
+                    }
 
-					if (pitem.IsRNOPart)
+                    if (pitem.IsRNOPart)
-					{
+                    {
-						if (string.IsNullOrEmpty(thisTab))
+                        if (string.IsNullOrEmpty(thisTab))
-						{
+                        {
-							sret.Insert(0, "RNO.");
+                            sret.Insert(0, "RNO.");
-						}
+                        }
-						else
+                        else
-						{
+                        {
-							thisTab = thisTab.Trim();
+                            thisTab = thisTab.Trim();
 
-							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-							{
+                            {
-								thisTab += ".";
+                                thisTab += ".";
-							}
+                            }
 
-							sret.Insert(0, "RNO." + thisTab);
+                            sret.Insert(0, "RNO." + thisTab);
-						}
+                        }
-					}
+                    }
-					else if (pitem.IsCaution || pitem.IsNote)
+                    else if (pitem.IsCaution || pitem.IsNote)
-					{
+                    {
-						// add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
+                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
-						if (string.IsNullOrEmpty(thisTab))
+                        if (string.IsNullOrEmpty(thisTab))
-						{
+                        {
-							sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
+                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
-						}
+                        }
-						else
+                        else
-						{
+                        {
-							thisTab = thisTab.Trim(" ".ToCharArray());
+                            thisTab = thisTab.Trim(" ".ToCharArray());
-							sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
+                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
-						}
+                        }
-					}
+                    }
-					else
+                    else
-					{
+                    {
-						if (!string.IsNullOrEmpty(thisTab))
+                        if (!string.IsNullOrEmpty(thisTab))
-						{
+                        {
-							thisTab = thisTab.Trim(" ".ToCharArray());
+                            thisTab = thisTab.Trim(" ".ToCharArray());
 
-							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-							{
+                            {
-								thisTab += ".";
+                                thisTab += ".";
-							}
+                            }
-						}
+                        }
-						else
+                        else
-						{
+                        {
-							thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
+                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
-						}
+                        }
 
-						sret.Insert(0, thisTab);
+                        sret.Insert(0, thisTab);
-					}
+                    }
-				}
+                }
 
-				pitem = pitem.ActiveParent as ItemInfo;
+                pitem = pitem.ActiveParent as ItemInfo;
 
-				if (pitem == null)
+                if (pitem == null)
-					break;
+                    break;
-			}
+            }
 
-			return sret.ToString().Trim(" .)".ToCharArray());
+            return sret.ToString().Trim(" .)".ToCharArray());
 		}
 
 		public void SetHeader(VE_Font myFont, string myText)
@@ -574,11 +575,11 @@ namespace VEPROMS.CSLA.Library
 			}
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
-																   //if (_ContentID != tmp.ContentID)
+			//if (_ContentID != tmp.ContentID)
-																   //{
+			//{
 			if (MyContent != null) MyContent.RefreshContentItems(); // Update List for old value
 			_ContentID = tmp.ContentID; // Update the value
-										//}
+			//}
 			_MyContent = null; // Reset list so that the next line gets a new list
 			if (MyContent != null) MyContent.RefreshContentItems(); // Update List for new value
 			_DTS = tmp.DTS;
@@ -674,12 +675,12 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-
+		
 		internal static void SetParentSectionAndDocVersion(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, ProcedureInfo procInfo, DocVersionInfo docVersionInfo, bool isAutomatic = false)
 		{
 			// B2022-107: Display Progress Bar Messages/Statuses when a new ROFST binary file is loaded into the database
 			// 						Added Optional Parameter "bool isAutomatic = false" to disable the RofstLoadingStatus pop-up screen when printing baselines
-
+			
 			if (itemInfo == null) return;
 			itemInfo.LoadAllAtOnce = true;
 			itemInfo.ActiveParent = itemParent;
@@ -721,7 +722,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 		}
-
+		
 		/// <summary>
 		/// The following method is used only in print because the 'printed' data is loaded into
 		/// memory before printing. Find the next item from memory (do not go out to database).
@@ -784,7 +785,7 @@ namespace VEPROMS.CSLA.Library
 				{
 					bool forceConvertToText = false;
 					TranCheckCount++;
-
+					
 					if (!forceConvertToText)
 					{
 						if (traninfo.MyItemToID.ActiveSection != null)
@@ -802,7 +803,7 @@ namespace VEPROMS.CSLA.Library
 								content.FixTransitionText(traninfo, true);
 								content.Save();
 							}
-						}
+ 						}
 					}
 					// B2025-020 Null Reference fix. Added check for valid index into the TransitionTypeList
 					if (!forceConvertToText)
@@ -812,7 +813,7 @@ namespace VEPROMS.CSLA.Library
 							forceConvertToText = true;
 							TranFixCount++;
 							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change: Transition type is not available");
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID))
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) 
 							{
 								content.FixTransitionText(traninfo, true);
 								content.Save();
@@ -835,14 +836,14 @@ namespace VEPROMS.CSLA.Library
 										content.FixTransitionText(traninfo, true);
 										content.Save();
 									}
-								}
+ 								}
 							}
 						}
 					}
 
 					if (!forceConvertToText)
 					{
-						if (itemInfo.MyDocVersion != null && traninfo.MyItemToID.MyDocVersion != null && itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID) //different doc version
+						if (itemInfo.MyDocVersion != null && traninfo.MyItemToID.MyDocVersion != null && itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID)	//different doc version
 						{
 							if (!itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[traninfo.TranType].TransMenu.Contains("Proc"))    //internal format
 							{
@@ -903,7 +904,7 @@ namespace VEPROMS.CSLA.Library
 				if (itemInfo.MyContent.Text.Contains("Link:Transition"))
 				{
 					Content content = Content.Get(itemInfo.MyContent.ContentID);
-
+					
 					if (itemInfo.MyContent.ContentTransitions != null)
 					{
 						foreach (TransitionInfo ct in itemInfo.MyContent.ContentTransitions)
@@ -913,7 +914,7 @@ namespace VEPROMS.CSLA.Library
 					}
 
 					itemInfo.MyContent.RefreshContentTransitions();
-
+				
 					while (content.Text.Contains("Link:Transition"))
 					{
 						TranCheckCount++;
@@ -931,7 +932,7 @@ namespace VEPROMS.CSLA.Library
 						else // B2018-043 Eliminate infinite loop for invalid transition structure
 						{
 							// Add annotation for Invalid Transition
-							AddInvalidTransitionAnnotation(itemInfo, "Invalid Transition Format");
+							AddInvalidTransitionAnnotation(itemInfo,"Invalid Transition Format");
 							break;
 						}
 					}
@@ -984,16 +985,16 @@ namespace VEPROMS.CSLA.Library
 			ContentInfo myContent = itemInfo.MyContent;
 			string txt = myContent.Text;
 			string regDelete = @"(\\v |)\<START\]\#Link\:Transition(|Range)\:[0-9]+ [0-9]+ [0-9]+(| [0-9]+)\[END\>(\\v0 |)";
-			string txt2 = txt;
+			string txt2=txt;
 
-			do {
+			do{
 				txt = txt2;
 				txt2 = Regex.Replace(txt, regDelete, "");
-			} while (txt2 != txt);
+			} while(txt2 != txt);
 
-			if (txt2 != myContent.Text)
+			if(txt2 != myContent.Text)
 			{
-				using (Content tmp = myContent.Get())
+				using(Content tmp = myContent.Get())
 				{
 					tmp.Text = txt2;
 					tmp.Save();
@@ -1001,7 +1002,7 @@ namespace VEPROMS.CSLA.Library
 				AddInvalidTransitionAnnotation(itemInfo, "Removed Empty Transition Text");
 			}
 		}
-
+		
 		private static bool IsTransitionToNonEditable(TransitionInfo ti)
 		{
 			foreach (TransitionInfo til in TransitionsToNonEditable)
@@ -1032,7 +1033,7 @@ namespace VEPROMS.CSLA.Library
 		public static int ROCheckCount = 0;
 		public static int ROFixCount = 0;
 		private static AnnotationType _VolianCommentType = null; // Using this to flag ro value issues with byron to braidwood
-
+		
 		public static AnnotationType VolianCommentType
 		{
 			get
@@ -1065,7 +1066,7 @@ namespace VEPROMS.CSLA.Library
 
 						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
-
+						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
 						string newText = this.MyContent.Text;
 
@@ -1263,7 +1264,7 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-
+		
 		public static string GetCombinedTab(ItemInfo itemInfo, string parTab)
 		{
 			string pTab = parTab == null ? "" : parTab;
@@ -1276,7 +1277,7 @@ namespace VEPROMS.CSLA.Library
 			// for supplemental information, bulleted tabs need to be included in the tab.  The 'isletterordigit' should not occur for supinfo items -
 			// and this includes the parent of the supinfo since that is the tab used for supinfo concatenated with its parent. (B2017-120)
 			// // B2020-154: Added check for the tab to start with '(', tabs that started with this were not included in the combined tab
-			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0)) return pTab;
+			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0 )) return pTab;
 			if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
 			// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them 
 			// also, include use the separator for bullets if doing the supplemental information tab (B2017-120)
@@ -1285,7 +1286,7 @@ namespace VEPROMS.CSLA.Library
 			if (ms && mn) pTab = pTab.TrimEnd() + ".";
 			// remove ending '.' (if this is a hls, don't remove the '.')
 			if (!itemInfo.IsHigh && thisTab.EndsWith(".")) thisTab = thisTab.Substring(0, thisTab.Length - 1);
-			if (itemInfo.HasParentTab) return thisTab.Trim();       // F2020-023: if tab includes parent tab already, don't concatenate it
+			if (itemInfo.HasParentTab) return thisTab.Trim();		// F2020-023: if tab includes parent tab already, don't concatenate it
 			return pTab + thisTab.Trim();
 		}
 
@@ -1341,8 +1342,8 @@ namespace VEPROMS.CSLA.Library
 							// B2023-037: loading print text, resolve the RO symbols 
 
 							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GLTArrows = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -1367,7 +1368,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 			}
-
+			
 			if (itemInfo.MyContent.ContentTransitionCount > 0)
 			{
 				foreach (TransitionInfo traninfo in itemInfo.MyContent.ContentTransitions)
@@ -1440,14 +1441,14 @@ namespace VEPROMS.CSLA.Library
 		private float _MSWordPageCount = 0;
 		public float MSWordPageCount
 		{
-			get {
+			get { 
 				if (_MSWordPageCount == 0) // C2018-011 Get the proper word page count from the saved pdf attachment
 					if (MyContent.MyEntry != null && MyContent.MyEntry.MyDocument != null)
 					{
 						PdfInfo pi = PdfInfo.Get(this, false);
-						if (pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
+						if(pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
 					}
-				return _MSWordPageCount;
+				return _MSWordPageCount; 
 			}
 			set { _MSWordPageCount = value; }
 		}
@@ -1649,7 +1650,7 @@ namespace VEPROMS.CSLA.Library
 			// the addition of the parent.IsNote, the note was breaking between 2 ANDs (the 1st AND was a 
 			// steplevel of 5, but the 2nd was a steplevel of 4).  If something similar is seen with Cautions, 
 			// that check could be added.
-			if (!item.IsRNOPart && !item.IsHigh && (item.MyPrevious == null || (((item.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.EnhancedBackgrounds) != E_PurchaseOptions.EnhancedBackgrounds)
+			if (!item.IsRNOPart && !item.IsHigh && (item.MyPrevious == null || (((item.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.EnhancedBackgrounds) != E_PurchaseOptions.EnhancedBackgrounds) 
 				&& item.MyParent != null && item.MyParent.IsNote)))
 				level += firstInc;
 			else
@@ -1716,7 +1717,7 @@ namespace VEPROMS.CSLA.Library
 				}
 				return maxRNOLevel;
 			}
-
+		
 		}
 		private bool ParentAndOr
 		{
@@ -1767,7 +1768,7 @@ namespace VEPROMS.CSLA.Library
 			RemoveEnhancedFromConfig(false);
 		}
 
-		public void RemoveEnhancedFromConfig(bool doOneStepOnly)
+	public void RemoveEnhancedFromConfig(bool doOneStepOnly)
 		{
 			XmlDocument xd = new XmlDocument();
 			if (this.MyContent.Config == null || this.MyContent.Config == "") return;  // B2017-164 & B2017-172 check for null or empty config
@@ -1782,7 +1783,7 @@ namespace VEPROMS.CSLA.Library
 					ctmp.Config = config;
 					ctmp.Save();
 					ContentInfo.Refresh(ctmp);
-					_MyConfig = null;               // refresh the memory value
+					_MyConfig = null;				// refresh the memory value
 				}
 			}
 			if (doOneStepOnly) return;
@@ -2071,7 +2072,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				bool rval = false;
 				ItemInfo itm = this;
-				while (itm != null && !itm.IsHigh && !rval)
+				while (itm != null &&!itm.IsHigh && !rval)
 				{
 					rval = itm.IsCautionOrNotePart;
 					if (!rval) itm = itm.MyParent;
@@ -2111,29 +2112,16 @@ namespace VEPROMS.CSLA.Library
 			return (sd.Type == type);
 		}
 
-		// C2025-024 - Electronic Procedures - Export
-		//return if should export blanks
-		public bool EPexportblank(int AnnTypeID)
-		{
-			if (ActiveFormat.PlantFormat.EPFormatFiles.Count == 0 || !ActiveFormat.PlantFormat.EPFormatFiles.Exists(x => x.AnnotationTypeID == AnnTypeID)) 
-				return true;
-			else
-				return ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == AnnTypeID).exportblank;
-		}
-
 		// C2025-023 - Electronic Procedures - Modifications to PROMS
 		//return EPFields that match this step type or a parent step type
 		public EPFields GetValidEPFields(int AnnTypeID)
 		{
 			EPFields filtered = new EPFields();
-
+			EPFields unfiltered = ActiveFormat.PlantFormat.EPFormatFiles.First(x => x.AnnotationTypeID == AnnTypeID).FieldList;
-			if (ActiveFormat.PlantFormat.EPFormatFiles.Count == 0) return filtered;
-			if ((int)MyContent.Type < 20000) return filtered;
-			EPFields unfiltered = ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == AnnTypeID)?.FieldList;
-			if (unfiltered == null) return filtered;
 
 			//Build list of step type and step type of it's parents
 			List<string> steptypelist = new List<string>();
+			if ((int)MyContent.Type < 20000) return filtered;
 			int stepType = ((int)MyContent.Type) % 10000;
 			StepDataList sdlist = ActiveFormat.PlantFormat.FormatData.StepDataList;
 			if (stepType > sdlist.MaxIndex)
@@ -2164,13 +2152,6 @@ namespace VEPROMS.CSLA.Library
 			return filtered;
 		}
 
-		// C2025-023 - Electronic Procedures - Modifications to PROMS
-		//return true if any EP Format files attached to the item's 
-		public bool HasEPformat(int AnnTypeID)
-		{
-			return GetValidEPFields(AnnTypeID).Count > 0;
-		}
-
 		// determine if the the current step should automatically be placed on the Continuous Action Summary
 		// Note, this logic only checks the format setting of the step.  We will check the value of the Tag's Check Box later on.
 		public bool IncludeOnContActSum
@@ -4714,50 +4695,43 @@ namespace VEPROMS.CSLA.Library
 			int localPrintLevel = PrintLevel;
 			StepSectionData sd = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData;
 			bool doMeta = false;
-			if (sd.StepSectionLayoutData.TieTabToLevel) // C2025-036 reduce un-needed processing
+			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
 			{
-				if (ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
+				if (sd.StepSectionLayoutData.ShowSectionTitles
-				{
+				&& !MyDocStyle.CancelSectTitle
-					if (sd.StepSectionLayoutData.ShowSectionTitles
+				&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
-					&& !MyDocStyle.CancelSectTitle
+					localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential)) ? 0 : CurrentSectionLevel());
-					&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
+				if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
-						localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential)) ? 0 : CurrentSectionLevel());
-					if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
-				}
-				if (ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel && (SectionLevel() > 1))
-					localPrintLevel += 1;
 			}
-
+			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
+				if (SectionLevel() > 1)
+					localPrintLevel += 1;
 			SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
-
 			// Start with basic cases of alpha/numeric/seq:
 			// If we have metasections AND...
 			// If the seqtabs for this given level does not get a section number, use the seqtab rather than
 			// the ident of the step:
 			bool useSubStepTabs = false;
-			if (doMeta) // C2025-036 reduce un-needed processing
+			if (doMeta && IsHigh
-			{
+				&& !seqtabs[(localPrintLevel < 0 ? 0 : localPrintLevel) % seqtabs.MaxIndex].TabToken.Contains("{numericWpar}")
-				if (IsHigh
+				&& tbformat.Contains("{")) useSubStepTabs = true;
-					&& !seqtabs[(localPrintLevel < 0 ? 0 : localPrintLevel) % seqtabs.MaxIndex].TabToken.Contains("{numericWpar}")
-					&& tbformat.Contains("{")) useSubStepTabs = true;
 
-				// Check to be sure the parent tab should be included...  If this sequential is within a note
+			// Check to be sure the parent tab should be included...  If this sequential is within a note
-				// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
+			// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
-				if (IsSequential && (InNote() || InCaution() ||
+			if (doMeta && IsSequential && (InNote() || InCaution() ||
-					(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
+				(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
+			{
+				// if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
+				localPrintLevel = 0;
+				int lv = 0;
+				ItemInfo ii = MyParent;
+				while (!ii.IsCaution && !ii.IsNote && !ii.IsEquipmentList)
 				{
-					// if immediate parent is note, caution or equip, use numeric, otherwise use alpha.
+					lv++;
-					localPrintLevel = 0;
+					ii = ii.MyParent;
-					int lv = 0;
-					ItemInfo ii = MyParent;
-					while (!ii.IsCaution && !ii.IsNote && !ii.IsEquipmentList)
-					{
-						lv++;
-						ii = ii.MyParent;
-					}
-					lv = lv % 2;
-					tbformat = (lv == 0) ? "{numeric}." : "{alpha}.";
 				}
+				lv = lv % 2;
+				tbformat = (lv == 0) ? "{numeric}." : "{alpha}.";
 			}
 			bool trimTabStart = false;
 			bool dontTrimParentTabBeforeAppending = false; // B2019-011 for Barakah Alarm format
@@ -4823,7 +4797,7 @@ namespace VEPROMS.CSLA.Library
 				PrintLevel = 0;
 
 			// If token includes 'Wpar', the parent tab prefix's the tab.
-			if (localPrintLevel > 0 && tbformat.Contains("Wpar}"))  // C2025-036 reduce un-needed processing
+			if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1))
 			{
 				string parentTab = null;
 				ItemInfo myparent = ActiveParent as ItemInfo;
@@ -4938,21 +4912,18 @@ namespace VEPROMS.CSLA.Library
 			}
 			string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
 			if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
-			if (tbformat.ToUpper().Contains("{ALPHA")) // C2025-036 reduce un-needed processing
+			// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
-			{
+			if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
-				// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
+				tbformat = tbformat.Replace("{alpha}", alpha);
-				if (_ActiveFormat.Name == "BGESAM1" && MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
+			else
-					tbformat = tbformat.Replace("{alpha}", alpha);
+				tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
-				else
+			tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
-					tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
+			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
-				tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
+				tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
-				if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
+			else
-					tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
+				tbformat = tbformat.Replace("{ALPHA}", alpha);
-				else
-					tbformat = tbformat.Replace("{ALPHA}", alpha);
 
-				tbformat = tbformat.Replace("{ALPHAWpar}", alpha);
+			tbformat = tbformat.Replace("{ALPHAWpar}", alpha);
-			}
 			if (tbformat.ToUpper().Contains("ROMAN"))
 			{
 				string roman = RomanNumbering(ordinal);
@@ -4960,18 +4931,15 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{ROMAN}", roman);
 				tbformat = tbformat.Substring(0, tbformat.Length - ((roman.Length - 1) > 0 ? (roman.Length - 1) : 0));
 			}
-			if (tbformat.Contains("{numeric}")) // C2025-036 reduce un-needed processing
+			if (tbformat.Contains("{numeric}") && ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002)
 			{
-				if (((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS) && MyContent.Type == 20002)
+				tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
-				{
+				tbformat = tbformat.Substring(0, tbformat.Length - 2);
-					tbformat = tbformat.Replace("{numeric}", ordinal.ToString().PadLeft(2) + ".0");
+			}
-					tbformat = tbformat.Substring(0, tbformat.Length - 2);
+			if (tbformat.Contains("{numeric}") && (this.FormatStepData.AppendDotZero)) // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1)
-				}
+			{
-				if (this.FormatStepData.AppendDotZero) // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1)
+				string numtxt = ordinal.ToString().PadLeft(2) + ".0";
-				{
+				tbformat = tbformat.Replace("{numeric}.", numtxt).Replace("{numeric}", numtxt);
-					string numtxt = ordinal.ToString().PadLeft(2) + ".0";
-					tbformat = tbformat.Replace("{numeric}.", numtxt).Replace("{numeric}", numtxt);
-				}
 			}
 			// if this is a wolf creek background, if the tbformat ends with a '.' don't add a space,
 			// otherwise add a space.
@@ -6169,10 +6137,9 @@ namespace VEPROMS.CSLA.Library
 		}
 		private bool IsLowestLevelStep
 		{
-			//F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions
 			get
 			{
-				return (!(IsCaution || IsNote || IsInCautionOrNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
+				return (!(IsCaution || IsNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
 			}
 		}
 		private bool RNOsHighHasCheckOff()
@@ -8335,7 +8302,6 @@ namespace VEPROMS.CSLA.Library
 				if (_ProcedureConfig == null)
 				{
 					_ProcedureConfig = new ProcedureConfig(this);
-					this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 					this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 				}
 				return _ProcedureConfig;
@@ -8345,7 +8311,6 @@ namespace VEPROMS.CSLA.Library
 
 		void MyContent_Changed(object sender)
 		{
-			this.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 			this.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 		}
 		#endregion

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

@@ -547,17 +547,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc");
 			}
 		}
-
-		// this will add additional spacing between the Section Numbers and Titles
-		private LazyLoad<float?> _SectTitleOffsetOverride;
-		public float? SectTitleOffsetOverride
-		{
-			get
-			{
-				return LazyLoad(ref _SectTitleOffsetOverride, "@SectTitleOffsetOverride");
-			}
-		}
-
 		#endregion AdjSectTitleLoc
 
 		#region ShowAlarmPointWindowInfo
@@ -664,21 +653,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
-
-		#region AltMultiUnitWording
-		[Category("Miscellaneous")]
-		[Description("Alternate Wording for Printing when MultiUnit")]
-
-		// this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set
-		private LazyLoad<string> _AltMultiUnitWording;
-		public string AltMultiUnitWording
-		{
-			get
-			{
-				return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording");
-			}
-		}
-		#endregion IncludeInTOC
 		public override string ToString()
 		{
 			return String.Format("{0:D2} - {1}", Index, Name);

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

@@ -11,157 +11,138 @@ using static VEPROMS.CSLA.Library.ROFSTLookup;
 
 namespace VEPROMS.CSLA.Library
 {
-    //C2025-023 - Electronic Procedures - Modifications to PROMS
+	//C2025-023 - Electronic Procedures - Modifications to PROMS
-    // class to handle storage and access of EPFormatFile and EPFormatFile details
+	// class to handle storage and access of EPFormatFile and EPFormatFile details
-    #region EPFormatFiles
+	#region EPFormatFiles
-    [TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
+	[TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
-    public class EPFormatFiles : vlnFormatList<EPFormatFile>
+	public class EPFormatFiles : vlnFormatList<EPFormatFile>
-    {
+	{
-        public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
+		public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-    }
+	}
-    #endregion
+	#endregion
-    #region EPFormatFile
+	#region EPFormatFile
-    public class EPFormatFile : vlnFormatItem
+	public class EPFormatFile : vlnFormatItem
-    {
+	{
-        #region Constructor
+		#region Constructor
-        public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
+		public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
-        public EPFormatFile() : base() { }
+		public EPFormatFile() : base() { }
-        #endregion
+		#endregion
-        #region Business Fields
+		#region Business Fields
-        // Name of the EP Viewer Format File
+		// Name of the EP Viewer Format File
-        private LazyLoad<string> _Name;
+		private LazyLoad<string> _Name;
-        [DisplayName("Name")]
+		[DisplayName("Name")]
-        [Description("EP Viewer File Name")]
+		[Description("EP Viewer File Name")]
-        public string Name
+		public string Name
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _Name, "@Name");
+				return LazyLoad(ref _Name, "@Name");
-            }
+			}
-        }
+		}
-        // Name of the EP Viewer Format File
+		// Name of the EP Viewer Format File
-        private LazyLoad<string> _Description;
+		private LazyLoad<string> _Description;
-        [DisplayName("Description")]
+		[DisplayName("Description")]
-        [Description("EP Viewer Description")]
+		[Description("EP Viewer Description")]
-        public string Description
+		public string Description
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _Description, "@Description");
+				return LazyLoad(ref _Description, "@Description");
-            }
+			}
-        }
+		}
-        // Id of Annotation Type Associated with this file
+		// Id of Annotation Type Associated with this file
-        private LazyLoad<int?> _AnnotationTypeID;
+		private LazyLoad<int?> _AnnotationTypeID;
-        [DisplayName("AnnotationTypeID")]
+		[DisplayName("AnnotationTypeID")]
-        [Description("Id of Annotation Type Associated with this file")]
+		[Description("Id of Annotation Type Associated with this file")]
-        public int? AnnotationTypeID
+		public int? AnnotationTypeID
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
+				return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
-            }
+			}
-        }
+		}
-
+		// returns a list of fields that are defined in the EP format's structure
-        // Return Name of Annotation that EP Format File is Attached to
+		private EPFields _FieldList;
-        public string AnnotationName()
+		public EPFields FieldList
-        {
+		{
-            return AnnotationTypeInfo.Get((int) AnnotationTypeID).Name;
+			get
-        }
+			{
-
+				XmlDocument xd = GetEPFormatData(Name);
-        //if xml value is blank, should element export?
+				return _FieldList == null ? _FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")) : _FieldList;
-        //defaults to true
+			}
-        private LazyLoad<bool> _exportblank;
+		}
-        [DisplayName("exportblank")]
+		#endregion
-        [Description("if xml value is blank, should element export?")]
+		#region Business Methods
-        public bool exportblank
+		// update all in-use annotation types that have Electronic Procedures
-        {
+		public static void UpdateAllInUseEPAnnotationTypes()
-            get
+		{
-            {
+			foreach (int formatid in GetAllInUseFormats())
-                return LazyLoad(ref _exportblank, "@exportblank");
+			{
-            }
+				PlantFormat frmt = FormatInfo.Get(formatid).PlantFormat;
-        }
+				foreach (EPFormatFile EP in frmt.EPFormatFiles)
-        // returns a list of fields that are defined in the EP format's structure
-        private EPFields _FieldList;
-        public EPFields FieldList
-        {
-            get
-            {
-                XmlDocument xd = GetEPFormatData(Name);
-                return _FieldList ?? (_FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")));
-            }
-        }
-        #endregion
-        #region Business Methods
-        // update all in-use annotation types that have Electronic Procedures
-        public static void UpdateAllInUseEPAnnotationTypes()
-        {
-            foreach (int formatid in GetAllInUseFormats())
-            {
-                PlantFormat frmt = FormatInfo.Get(formatid).PlantFormat;
-                foreach (EPFormatFile EP in frmt.EPFormatFiles)
                 {
-                    UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
+					UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
-                }
+				}			
-            }
+			}
-        }
+		}
-        #endregion
+		#endregion
-        #region Data Access
+		#region Data Access
-        // static - Load EP Format details - save to db (insert/update)
+		// static - Load EP Format details - save to db (insert/update)
-        public static void UpdateEPFormat(string name, string data, string userID)
+		public static void UpdateEPFormat(string name, string data, string userID)
-        {
+		{
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
+			{
-                using (SqlCommand cm = cn.CreateCommand())
+				using (SqlCommand cm = cn.CreateCommand())
-                {
+				{
-                    cm.CommandType = CommandType.StoredProcedure;
+					cm.CommandType = CommandType.StoredProcedure;
-                    cm.CommandText = "vesp_UpdateEPFormat";
+					cm.CommandText = "vesp_UpdateEPFormat";
-                    cm.Parameters.AddWithValue("@name", name);
+					cm.Parameters.AddWithValue("@name", name);
-                    cm.Parameters.AddWithValue("@data", data);
+					cm.Parameters.AddWithValue("@data", data);
-                    cm.Parameters.AddWithValue("@userID", userID);
+					cm.Parameters.AddWithValue("@userID", userID);
-                    cm.CommandTimeout = Database.DefaultTimeout;
+					cm.CommandTimeout = Database.DefaultTimeout;
-                    cm.ExecuteNonQuery();
+					cm.ExecuteNonQuery();
-                }
+				}
-            }
+			}
-        }
+		}
 
-        // load data for getting fieldlist for this EPFormat
+		// load data for getting fieldlist for this EPFormat
-        public static XmlDocument GetEPFormatData(string name)
+		public static XmlDocument GetEPFormatData(string name)
-        {
+		{
-            name = name.Replace(".xml", "");
+			name = name.Replace(".xml", "");
 
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
+			{
-                using (SqlCommand cm = cn.CreateCommand())
+				using (SqlCommand cm = cn.CreateCommand())
-                {
+				{
-                    cm.CommandType = CommandType.Text;
+					cm.CommandType = CommandType.Text;
-                    cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
+					cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
-                    cm.Parameters.AddWithValue("@Name", name);
+					cm.Parameters.AddWithValue("@Name", name);
-                    cm.CommandTimeout = Database.DefaultTimeout;
+					cm.CommandTimeout = Database.DefaultTimeout;
-                    using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+					using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-                    {
+					{
-                        if (dr.Read())
+						if (dr.Read())
-                        {
+						{
-                            XmlDocument xd = new XmlDocument();
+							XmlDocument xd = new XmlDocument();
-                            xd.XmlResolver = null;
+							xd.XmlResolver = null;
-                            xd.LoadXml(dr.GetString("Data"));
+							xd.LoadXml(dr.GetString("Data"));
-                            return xd;
+							return xd;
-                        }
+						}
-                    }
+					}
-                }
+				}
-            }
+			}
 
-            return null;
+			return null;
-        }
+		}
 
-        // Get all in-use formats
+		// Get all in-use formats
-        public static List<int> GetAllInUseFormats()
+		public static List<int> GetAllInUseFormats()
-        {
+		{
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
+			{
-                using (SqlCommand cm = cn.CreateCommand())
+				using (SqlCommand cm = cn.CreateCommand())
-                {
+				{
-                    cm.CommandType = CommandType.Text;
+					cm.CommandType = CommandType.Text;
-                    cm.CommandText = @"SELECT Distinct Formats.[FormatID]
+					cm.CommandText = @"SELECT Distinct Formats.[FormatID]
 										FROM 
 										(
 											 SELECT FormatID FROM Contents
@@ -172,272 +153,260 @@ namespace VEPROMS.CSLA.Library
 										) inuse
 										inner join Formats
 										on inuse.FormatID = Formats.FormatID";
-                    cm.CommandTimeout = Database.DefaultTimeout;
+					cm.CommandTimeout = Database.DefaultTimeout;
 
-                    using (DataTable dt = new DataTable())
+					using (DataTable dt = new DataTable())
-                    {
+					{
-                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
+						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-                        {
+						{
-                            da.Fill(dt);
+							da.Fill(dt);
-                            return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
+							return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
-                        }
+						}
-                    }
+					}
 
-                }
+				}
-            }
+			}
-        }
+		}
 
-        // update an annotation type as an Electronic Procedure Annotation Type
+		// update an annotation type as an Electronic Procedure Annotation Type
-        public static void UpdateAnnotationTypeAsEP(int typeID)
+		public static void UpdateAnnotationTypeAsEP(int typeID)
-        {
+		{
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
+			{
-                using (SqlCommand cm = cn.CreateCommand())
+				using (SqlCommand cm = cn.CreateCommand())
-                {
+				{
-                    cm.CommandType = CommandType.Text;
+					cm.CommandType = CommandType.Text;
-                    cm.CommandText = @"Update AnnotationTypes
+					cm.CommandText = @"Update AnnotationTypes
 										SET IsEPAnnotationType = 1
 									    WHERE TypeID = @typeID";
-                    cm.Parameters.AddWithValue("@typeID", typeID);
+					cm.Parameters.AddWithValue("@typeID", typeID);
-                    cm.CommandTimeout = Database.DefaultTimeout;
+					cm.CommandTimeout = Database.DefaultTimeout;
-                    cm.ExecuteNonQuery();
+					cm.ExecuteNonQuery();
-                }
+				}
-            }
+			}
-        }
+		}
 
-        // Returns true if there are any EP Annotation Types
+		// Returns true if there are any EP Annotation Types
-        public static bool IsEPAnnotationType()
+		public static bool IsEPAnnotationType()
-        {
+		{
-            try
+			try
-            {
+			{
-                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-                {
+				{
-                    using (SqlCommand cm = cn.CreateCommand())
+					using (SqlCommand cm = cn.CreateCommand())
-                    {
+					{
-                        cm.CommandType = CommandType.Text;
+						cm.CommandType = CommandType.Text;
-                        cm.CommandText = @"SELECT RESULT = CASE WHEN 
+						cm.CommandText = @"SELECT RESULT = CASE WHEN 
 						EXISTS(SELECT 1 FROM AnnotationTypes where IsEPAnnotationType = 1) 
 						THEN 1 ELSE 0 END";
-                        cm.CommandTimeout = Database.DefaultTimeout;
+						cm.CommandTimeout = Database.DefaultTimeout;
-                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-                        {
+						{
-                            if (dr.Read() && dr.GetInt32("RESULT") == 1)
+							if (dr.Read() && dr.GetInt32("RESULT") == 1)
-                                return true;
+								return true;
-                        }
+						}
-                    }
+					}
-                }
+				}
-            }
+			}
-            catch
+			catch
-            {
+			{
-                // EP Support has not yet been added for this DB
+				// EP Support has not yet been added for this DB
-                // IsEPAnnotationType does not exist
+				// IsEPAnnotationType does not exist
-                // need to run PROMS Fixes
+				// need to run PROMS Fixes
-                // until then will ignore EP code
+				// until then will ignore EP code
-                // instead of crashing for a field not found
+				// instead of crashing for a field not found
-            }
+			}
 
-            return false;
+			return false;
-        }
+		}
-        #endregion
+		#endregion
-    }
+	}
 
-    public class EPFields : vlnFormatList<EPField>
+	public class EPFields : vlnFormatList<EPField>
-    {
+	{
         public EPFields()
         {
         }
 
         public EPFields(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-    }
+	}
-    // EP field class
+	// EP field class
-    public class EPField : vlnFormatItem
+	public class EPField : vlnFormatItem
-    {
+	{
-        public EPField(XmlNode xmlNode) : base(xmlNode) { }
+		public EPField(XmlNode xmlNode) : base(xmlNode) { }
-        public EPField() : base() { }
+		public EPField() : base() { }
-        private LazyLoad<string> _name;
+		private LazyLoad<string> _name;
-        public string name
+		public string name
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _name, "@name");
+				return LazyLoad(ref _name, "@name");
-            }
+			}
-        }
+		}
-        private LazyLoad<string> _type;
+		private LazyLoad<string> _type;
-        public string type
+		public string type
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _type, "@type");
+				return LazyLoad(ref _type, "@type");
-            }
+			}
-        }
+		}
-        private LazyLoad<string> _label;
+		private LazyLoad<string> _label;
-        public string label
+		public string label
-        {
+		{
-            get
+			get
-            {
+			{
-                string tmp = LazyLoad(ref _label, "@label");
+				string tmp = LazyLoad(ref _label, "@label");
 
-                if (string.IsNullOrEmpty(tmp))
+				if (string.IsNullOrEmpty(tmp))
-                    return LazyLoad(ref _name, "@name");
+					return LazyLoad(ref _name, "@name");
-                else
+				else
-                    return tmp;
+					return tmp;
-            }
+			}
-        }
+		}
-        private LazyLoad<string> _text;
+		private LazyLoad<string> _text;
-        public string text
+		public string text
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _text, "@text");
+				return LazyLoad(ref _text, "@text");
-            }
+			}
-        }
+		}
-        //roid of group item that individual sub-items will be the choices for the list/combobox for ROSINGLE and ROMULTI
+		//roid of group item that individual sub-items will be the choices for the list/combobox for ROSINGLE and ROMULTI
-        private LazyLoad<string> _rosource;
+		private LazyLoad<string> _rosource;
-        public string rosource
+		public string rosource
-        {
+		{
-            get
+			get
-            {
+			{
-                return LazyLoad(ref _rosource, "@rosource");
+				return LazyLoad(ref _rosource, "@rosource");
-            }
+			}
-        }
+		}
-        //the columns in the RO that will be included in the exports
+		//the columns in the RO that will be included in the exports
-        private LazyLoad<string> _returncols;
+		private LazyLoad<string> _returncols;
-        public List<string> returncols()
+		public List<string> returncols()
-        {
+		{
-            try
+			try
-            {
+			{
-                string tmp = LazyLoad(ref _returncols, "@returncols");
+				string tmp = LazyLoad(ref _returncols, "@returncols");
 
-                if (string.IsNullOrEmpty(tmp))
+				if (string.IsNullOrEmpty(tmp))
-                    return new List<string>();
+					return new List<string>();
-                else
+				else
-                    return tmp.Split(',').Select(p => p.Trim()).ToList();
+					return tmp.Split(',').Select(p => p.Trim()).ToList();
-            }
+			}
-            catch
+			catch
-            {
+			{
-                throw new ArgumentException($"Error in returncols for EP file, field: {name}");
+				throw new ArgumentException($"Error in returncols for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
-            }
+			}
-        }
+		}
 
-        //number of lines for a multi-line text box to span
+		//number of lines for a multi-line text box to span
-        private LazyLoad<int?> _numlines;
+		private LazyLoad<int?> _numlines;
-        public int numlines
+		public int numlines
-        {
+		{
-            get
+			get
-            {
+			{
-                int? tmp = LazyLoad(ref _numlines, "@numlines");
+				int? tmp = LazyLoad(ref _numlines, "@numlines");
 
-                if (tmp == null)
+				if (tmp == null)
-                    return 1;
+					return 1;
 
-                return (int) tmp;
+				return (int) tmp;
-            }
+			}
-        }
+		}
-        //step types that the EPForma Item is valid for (as a list of types)
+		//step types that the EPForma Item is valid for (as a list of types)
-        private LazyLoad<string> _validforsteptypes;
+		private LazyLoad<string> _validforsteptypes;
         public List<string> validforsteptypes()
-        {
+		{
-            try
+			try
-            {
+			{
-                string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
+				string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
-                return tmp.Split(',').Select(p => p.Trim()).ToList();
+				return tmp.Split(',').Select(p => p.Trim()).ToList();
-            }
+			}
-            catch
+			catch
-            {
+			{
-                throw new ArgumentException($"Error in validforsteptypes for EP file, field: {name}");
+				throw new ArgumentException($"Error in validforsteptypes for EP file: {((EPFormatFile) MyParentFormat).Name}.xml, field: {name}");
-            }
+			}
-        }
+		}
-        public bool IsValidForStepType(string StepType)
+		public bool IsValidForStepType(string StepType)
-        {
+		{
-            List<string> tmp = validforsteptypes();
+			List<string> tmp = validforsteptypes();
-            return tmp.Contains(StepType);
+			return tmp.Contains(StepType);
-        }
+		}
 
-        //return a list of items based on the ROsource specified in the EPFormat File
+		//return a list of items based on the ROsource specified in the EPFormat File
-        //will return all RO items under the Group that's roid = the rosource
+		//will return all RO items under the Group that's roid = the rosource
-        public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
+		public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
-        {
+		{
-            if (string.IsNullOrEmpty(rosource))
+			if (string.IsNullOrEmpty(rosource))
-                return new List<ROListItem>();
+				return new List<ROListItem>();
 
-            try
+			try
-            {
+			{
-                DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+				DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+				ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
-                if (MyDocVersion.DocVersionAssociations != null && MyDocVersion.DocVersionAssociations.Any())
+				string roid = FormatRoidKey(rosource, false);
-                {
+				rochild[] children = lookup.GetRoChildrenByRoid(roid);
-                    ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
-                    string roid = FormatRoidKey(rosource, false);
+				List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
-                    rochild[] children = lookup.GetRoChildrenByRoid(roid);
+				if (includeblank)
+					mylist.Insert(0, new ROListItem("", ""));
 
-                    List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
+				return mylist;
-                    if (includeblank)
+			}
-                        mylist.Insert(0, new ROListItem("", ""));
+			catch (Exception Ex)
+			{
+				throw new ArgumentException($"Error in rosource for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
+			}
+		}
 
-                    return mylist;
-                }
-                else
-                {
-                    return new List<ROListItem>
-                    {
-                        new ROListItem("", "")
-                    };
-                }
 
-            }
+		//return a list of values for the specified ROID
-            catch
+		//given the EP items return columns
-            {
+		//will return all RO items under the Group that's roid = the rosource
-                throw new ArgumentException($"Error in rosource for EP file, field: {name}");
+		public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
-            }
+		{
-        }
+			if (string.IsNullOrEmpty(roid))
+				return new List<string>();
 
-        //return a list of values for the specified ROID
+			List<string> values = new List<string>();
-        //given the EP items return columns
+			DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-        //will return all RO items under the Group that's roid = the rosource
+			ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-        public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
+			rochild ro = lookup.GetRoChild(roid);
-        {
-            if (string.IsNullOrEmpty(roid))
-                return new List<string>();
 
-            List<string> values = new List<string>();
+			List<string> rtncols = returncols();
-            DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-            ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-            rochild ro = lookup.GetRoChild(roid);
 
-            List<string> rtncols = returncols();
+			if (rtncols.Count == 0)
+			{
+				values.Add(ro.value);
+			}
+			else 
+			{
+				foreach (string rcol in rtncols)
+				{
+					rochild ro_indiv = Array.Find(ro.children, x => x.appid.EndsWith($".{rcol}"));
+					if (ro_indiv.value != null) values.Add(ro_indiv.value);
+				}
+			}
 
-            if (rtncols.Count == 0)
+			return values;
-            {
-                values.Add(ro.value);
-            }
-            else
-            {
-                foreach (string rcol in rtncols)
-                {
-                    rochild ro_indiv = Array.Find(ro.children, x => x.appid.EndsWith($".{rcol}"));
-                    if (ro_indiv.value != null) values.Add(ro_indiv.value);
-                }
-            }
 
-            return values;
+		}
-
+	}
-        }
+	#endregion
-    }
+	//C2025-023 - Electronic Procedures - Modifications to PROMS
-
+	// class to handle return of RO Lists
-    #endregion
+	#region EPFormatFiles
-    //C2025-023 - Electronic Procedures - Modifications to PROMS
+	public class ROListItem
-    // class to handle return of RO Lists
+	{
-    #region EPFormatFiles
+		public string Text { get; private set; }
-    public class ROListItem
+		public string Value { get; private set; }
-    {
+		public ROListItem(string _text, string _value)
-        public string Text { get; private set; }
+		{
-        public string Value { get; private set; }
+			Text = _text; Value = _value;
-        public ROListItem(string _text, string _value)
+		}
-        {
+	}
-            Text = _text; Value = _value;
+	#endregion
-        }
-    }
-    #endregion
 }
 

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

@@ -244,16 +244,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _TrimEnding, "@TrimEnding");
 			}
 		}
-		// C2025-033 to specify to print pagestyle item for a specific Child procedure
-		private LazyLoad<int?> _ChildNum;
-		public int? ChildNum
-		{
-			get
-			{
-				return (LazyLoad(ref _ChildNum, "@ChildNum"));
-			}
-		}
-
 		#endregion
 		#region Override ToString
 		public override string ToString()

PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs

@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Data;
-using System.Data.SqlClient;
-using System.Text.RegularExpressions;
-using Csla;
-using Csla.Data;
-using System.Configuration;
-using System.IO;
-using System.ComponentModel;
-
-
-//namespace VEPROMS.CSLA.Library;
-
-// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen.  This is related to Annotation type filtering through V->Options.
-
-namespace VEPROMS.CSLA.Library
-{
-	public class AnnotationstypeSelections
-	{
-		public static DataTable Get(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationstypeFiltered";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UsrID", UserID);
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-						// if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table.
-						if (dt.Rows.Count < 1)
-						{
-							DataRow row;
-							int rowflg = 0;
-							foreach (AnnotationTypeInfo annosel in DataPortal.Fetch<AnnotationTypeInfoList>())
-							{
-								// C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections
-								if (rowflg == 0)
-								{
-									row = dt.NewRow();
-									dt.Rows.Add(row);
-									rowflg = 1;
-								}
-								else
-								{
-									row = dt.NewRow();
-									row["TypeID"] = annosel.TypeID;
-									row["Name"] = annosel.Name;
-									row["Config"] = annosel.Config;
-									row["DTS"] = annosel.DTS;
-									row["UserID"] = annosel.UserID;
-									row["IsEPAnnotationType"] = annosel.IsEPAnnotationType;
-									dt.Rows.Add(row);
-								}
-
-
-							};
-						}
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-		public static DataTable Retrieve(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationstypeSelections";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UsrID", UserID);
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-		public static DataTable GetAnnoTypes(string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "getAnnotationSelectListTypes";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						SqlDataReader reader = cm.ExecuteReader();
-						DataTable dt = new DataTable();
-						dt.Load(reader);
-
-						return dt;
-
-					}
-					catch (Exception ex)
-					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
-					}
-
-				}
-			}
-		}
-
-		public static void Update(DataTable dt, string UserID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "UpdateAnnotationstypeSelections";
-						cm.CommandTimeout = Database.DefaultTimeout;
-
-						//Pass table Valued parameter to Store Procedure
-						SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt);
-						sqlParam.SqlDbType = SqlDbType.Structured;
-						cm.Parameters.AddWithValue("@UserID", UserID);
-						cm.ExecuteNonQuery();
-					}
-					catch (Exception ex)
-					{
-						throw new DbCslaException("Error in UpdateAnnotationstypeSelections: update failed", ex);
-					}
-				}
-			}
-		}
-
-	}
-}
-

PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs

@@ -16,7 +16,6 @@ namespace VEPROMS.CSLA.Library
 		#region Public Properties
 		public bool UserSetting_OpenTabs_Remember { get; protected set; } = false;
 		public bool UserSetting_OpenTabs_AutoOpen { get; protected set; } = true;
-		public bool UserSetting_MSWord_Summary_Prompt { get; protected set; } = true;
 		#endregion
 
 
@@ -32,7 +31,7 @@ namespace VEPROMS.CSLA.Library
 					using (SqlCommand cm = cn.CreateCommand())
 					{
 						cm.CommandType = CommandType.Text;
-						cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs, MSWordSummaryPrompt FROM Users where UserID = @UID";
+						cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs FROM Users where UserID = @UID";
 						cm.Parameters.AddWithValue("@UID", _userid);
 						cm.CommandTimeout = Database.DefaultTimeout;
 						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
@@ -41,7 +40,6 @@ namespace VEPROMS.CSLA.Library
 							{
 								UserSetting_OpenTabs_Remember = (bool) dr.GetValue("RememberOpenTabs");
 								UserSetting_OpenTabs_AutoOpen = (bool) dr.GetValue("AutoOpenTabs");
-								UserSetting_MSWord_Summary_Prompt = (bool) dr.GetValue("MSWordSummaryPrompt");
 							}
 						}
 					}
@@ -86,33 +84,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("UserSettings_SetUserSettings", ex);
 			}
 
-		}
-
-		public void SetUserSetting_MSWord_Summary_Prompt(bool prompt)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "vesp_UpdateUserSettingMSWordSummaryPrompt";
-						cm.Parameters.AddWithValue("@UID", _userid);
-						UserSetting_MSWord_Summary_Prompt = prompt;
-						cm.Parameters.AddWithValue("@Prompt", prompt);
-						cm.CommandTimeout = Database.DefaultTimeout;
-
-						cm.ExecuteNonQuery();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Database.LogException("UserSettings_SetUserSettings", ex);
-				throw new DbCslaException("UserSettings_SetUserSettings", ex);
-			}
-
 		}
 		#endregion
 	}

PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs

@@ -386,19 +386,12 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo myItemInfo = o as ItemInfo;
 			if (myItemInfo != null)
 			{
-				myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted);
 				myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted);
-				myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted);
 				myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted);
-				myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed);
 				myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed);
-				myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed);
 				myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed);
-				myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
 				myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
-				myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
 				myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
-				myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild);
 				myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild);
 			}
 		}
@@ -436,19 +429,12 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo myItemInfo = o as ItemInfo;
 			if (myItemInfo != null)
 			{
-				myItemInfo.Deleted -= new ItemInfoEvent(myItemInfo_Deleted);
 				myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted);
-				myItemInfo.ChildrenDeleted -= new ItemInfoEvent(myItemInfo_ChildrenDeleted);
 				myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted);
-				myItemInfo.MyContent.Changed -= new ContentInfoEvent(NodeText_Changed);
 				myItemInfo.MyContent.Changed += new ContentInfoEvent(NodeText_Changed);
-				myItemInfo.OrdinalChanged -= new ItemInfoEvent(NodeText_Changed);
 				myItemInfo.OrdinalChanged += new ItemInfoEvent(NodeText_Changed);
-				myItemInfo.NewSiblingAfter -= new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
 				myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
-				myItemInfo.NewSiblingBefore -= new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
 				myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
-				myItemInfo.NewChild -= new ItemInfoInsertEvent(myItemInfo_NewChild);
 				myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild);
 			}
 		}

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -387,7 +387,6 @@
     <Compile Include="Generated\ZContentInfo.cs" />
     <Compile Include="Generated\ZTransition.cs" />
     <Compile Include="Generated\ZTransitionInfo.cs" />
-    <Compile Include="Minimal\AnnotationstypeSections.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />

PROMS/VEPROMS/VEPROMS.sln

@@ -38,9 +38,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -155,7 +155,7 @@ namespace Volian.Controls.Library
             this.btnEPAnnotation.Margin = new System.Windows.Forms.Padding(2);
             this.btnEPAnnotation.Name = "btnEPAnnotation";
             this.btnEPAnnotation.Size = new System.Drawing.Size(53, 20);
-            this.superTooltip1.SetSuperTooltip(this.btnEPAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Open Annotation", "", "This will open Electronic Procedure Details for this Annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.superTooltip1.SetSuperTooltip(this.btnEPAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.btnEPAnnotation.TabIndex = 5;
             this.btnEPAnnotation.Text = "Open";
             this.btnEPAnnotation.Visible = false;

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -119,8 +119,8 @@ namespace Volian.Controls.Library
 					if (CurrentItem.MyDocVersion != null)
 						if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0)
 							_ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath;
-
+					ProcItem = CurrentItem.MyProcedure;
-		}
+				}
 				public AnnotationInfo FirstExeAnnotation(ItemInfo ii) 
 				{
 					if (ii == null) return null;
@@ -340,7 +340,7 @@ namespace Volian.Controls.Library
 				if ((_Annotations != null) && (dgAnnotations.Rows.Count > 0))
 				{
 					CurrentAnnotation = _Annotations[dgAnnotations.CurrentRow.Index];
-					if (CurrentAnnotation.MyAnnotationType.IsEPAnnotationType && CurrentItem.HasEPformat(CurrentAnnotation.MyAnnotationType.TypeID))
+					if (CurrentAnnotation.MyAnnotationType.IsEPAnnotationType)
 						btnEPAnnotation.Visible = true;
 				}
 				else
@@ -364,11 +364,7 @@ namespace Volian.Controls.Library
 
 			cbGridAnnoType.DisplayMember = "Name";
 			cbGridAnnoType.ValueMember = "TypeId";
-
+			cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone();
-			//C2025 - 027 Annotation Type Filtering
-			cbGridAnnoType.WatermarkText = "Select Annotation Type";
-			cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID);
-
 			// If there are no annotatons, then selected index is -1 (not defined), otherwise select the first.
 			// This was done so that it could be saved if there was text entered but user moves to another steprtb without selecting save button
 			// so that annotation gets saved.

PROMS/Volian.Controls.Library/AnnotationSearch.cs

@@ -69,7 +69,6 @@ namespace Volian.Controls.Library
 			_AnnotationDetails = annotationDetails;
 			cbAnnoType.DisplayMember = "Name";
 			cbAnnoType.DataSource = AnnotationTypeInfoList.Get();
-            lbResults.MouseMove -= new MouseEventHandler(lbResults_MouseMove);
             lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove);
 			_TabControl = tc;
 		}

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -354,10 +354,7 @@ namespace Volian.Controls.Library
 		private void WireCheckboxes()
 		{
 			foreach (CheckBox cb in MyCheckBoxes.Values)
-			{
-				cb.CheckedChanged -= new EventHandler(cb_CheckedChanged);
 				cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
-			}
 		}
 		private void UnwireCheckboxes(bool reset)
 		{

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -897,7 +897,11 @@ namespace Volian.Controls.Library
 					// B2023-072: Don't crash if annotation type was deleted for the restore annotation
 					if (ai == null)
 					{
-						FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
+						if (ati == null)
+						{
+							FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						}
 						return;
 					}
 					OnAnnotationRestored(ai, ai.MyItem);

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -211,9 +211,7 @@ namespace Volian.Controls.Library
 					}
 					_myRTB = value;
 
-					MyRTB.LinkChanged -= new StepRTBLinkEvent(MyRTB_LinkChanged);
 					MyRTB.LinkChanged += new StepRTBLinkEvent(MyRTB_LinkChanged);
-					MyRTB.SelectionChanged -= new EventHandler(MyRTB_SelectionChanged);
 					MyRTB.SelectionChanged += new EventHandler(MyRTB_SelectionChanged);
 
 					if (string.IsNullOrEmpty(MyRTB.MyLinkText))

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -161,11 +161,8 @@ namespace Volian.Controls.Library
 
 			if (_MyROFSTLookup == null) return;
 
-			advTreeRO.BeforeExpand -= new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand);
 			advTreeRO.BeforeExpand += new AdvTreeNodeCancelEventHandler(advTreeRO_BeforeExpand);
-			advTreeRO.AfterExpand -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 			advTreeRO.AfterExpand += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
-			advTreeRO.AfterCollapse -= new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 			advTreeRO.AfterCollapse += new AdvTreeNodeEventHandler(advTreeRO_AfterExpandorCollapse);
 
 			topnode = new DevComponents.AdvTree.Node();
@@ -253,7 +250,6 @@ namespace Volian.Controls.Library
 				topnode.Tag = fi;
 			}
 
-			advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 			advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 
 			// position to the procedure set in the tree if we have a procedure open

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -468,9 +468,7 @@ namespace Volian.Controls.Library
 							lastLastFormatID = fv.FormatID;
 						}
 					}
-					cbxTranVersion.SelectedIndexChanged -= new EventHandler(cbxTranVersion_SelectedIndexChanged);
 					cbxTranVersion.SelectedIndexChanged += new EventHandler(cbxTranVersion_SelectedIndexChanged);
-					cbxTranFormat.SelectedIndexChanged -= new EventHandler(cbxTranFormat_SelectedIndexChanged);
 					cbxTranFormat.SelectedIndexChanged += new EventHandler(cbxTranFormat_SelectedIndexChanged);
 				}
 				this.Cursor = Cursors.Default;
@@ -894,7 +892,6 @@ namespace Volian.Controls.Library
 				topnode.DataKey = fi.FolderID;
 			}
 
-			advTreeProcSets.BeforeExpand -= new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 			advTreeProcSets.BeforeExpand += new DevComponents.AdvTree.AdvTreeNodeCancelEventHandler(advTreeProcSets_BeforeExpand);
 
 			// position to the procedure set in the tree if we have a procedure open
@@ -989,7 +986,6 @@ namespace Volian.Controls.Library
 				annoTypes.Add(new AnnotationTypeSearch(ati.Name, ati.TypeID.ToString()));
 			cbxAnnoTypes.DisplayMember = "Name";
 			cbxAnnoTypes.DataSource = annoTypes;
-			lbSrchResults.MouseMove -= new MouseEventHandler(lbSrchResults_MouseMove);
 			lbSrchResults.MouseMove += new MouseEventHandler(lbSrchResults_MouseMove);
 			_TabControl = tc;
 		}

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -10,7 +10,6 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Base.Library;
-using Microsoft.Win32;
 
 namespace Volian.Controls.Library
 {
@@ -378,10 +377,7 @@ namespace Volian.Controls.Library
 				{
 					_MyStepRTB = _MyEditItem.MyStepRTB;
 					if (_MyStepRTB != null)
-					{
-						_MyStepRTB.Disposed -= new EventHandler(_MyStepRTB_Disposed);
 						_MyStepRTB.Disposed += new EventHandler(_MyStepRTB_Disposed);
-					}
 				}
 				else
 					_MyStepRTB = null;
@@ -472,7 +468,6 @@ namespace Volian.Controls.Library
 				myBar.DockTabControl.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right;
 				myBar.DockTabControl.Width = ClientRectangle.Width;
 			}
-			myBar.DockTabClosing -= new DockTabClosingEventHandler(myBar_DockTabClosing);
 			myBar.DockTabClosing += new DockTabClosingEventHandler(myBar_DockTabClosing);
 			if (!myBar.Visible)
 				myBar.Visible = true;
@@ -663,35 +658,11 @@ namespace Volian.Controls.Library
 			}
 			else // Otherwise open it in the Word editor
 			{
-				// B2025-034 Check to make sure that EDWord is installed in PROMS.  If not return NULL.
+				Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
-				object EDOfficeViewerX = GetValue<object>(@"HKEY_CLASSES_ROOT\EDOfficeViewerX.Connect\CLSID\", @"", null);
+				return OpenDSOTabPage(myItemInfo);
-
-				object EDWordCtrl = GetValue<object>(@"HKEY_CLASSES_ROOT\EDWORD.EDWordCtrl.1\CLSID\", @"", null);
-
-				if (EDOfficeViewerX == null || EDWordCtrl == null)
-				{
-
-					MessageBox.Show("Edraw needs to be installed or reinstalled on this device. " + Environment.NewLine + "" + Environment.NewLine +
-						"Please contact your IT Administrator to install and register Edraw that was provided with the PROMS Installation media.  If additional support is needed, please contact Volian.", "Error in Word section",
-						MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-					return null;
-				}
-				else
-					{
-					Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
-					return OpenDSOTabPage(myItemInfo);
-				}
 			}
-
 		}
-		public T GetValue<T>(string registryKeyPath, string value, T defaultValue = default(T))
-		{
-			T retVal = default(T);
 
-			retVal = (T)Registry.GetValue(registryKeyPath, value, defaultValue);
-
-			return retVal;
-		}
 		public bool PasteRTBItem(ItemInfo myItemInfo, int copyStartID, ItemInfo.EAddpingPart pasteType, int type)
 		{
 			CleanUpClosedItems();

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -97,6 +97,21 @@ namespace Volian.Controls.Library
 			set { if (Visible != value) Visible = value; }
 		}
 
+		/// <summary>
+		/// Expose text properties for height and widht to handle selecting RO Image Types.
+		/// </summary>
+		public string TbFSwd
+		{
+			get	{return tbFSWd.Text;}
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
+		}
+
+		public string TbFSht
+		{
+			get { return tbFSHt.Text; }
+			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
+		}
+
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -157,18 +172,6 @@ namespace Volian.Controls.Library
 			tbFSWd.SelectionLength = 0;
 			tbFSWd.SelectionStart = tbFSWd.TextLength; // position to the end of the Width text box
 		}
-		/// <summary>
-		/// Update text properties for height and width for new RO Image Types.
-		/// </summary>
-		public void SetNewImageHeightAndWidth(int height, int width)
-		{
-			tbFSHt.Text = height.ToString();
-			tbFSWd.Text = width.ToString();
-			tbFSWd.Refresh();
-			tbFSHt.Refresh();
-			_origFigureSizeWidth = width;
-			_origFigureSizeRatio = (float)height / (float)width;
-		}
 		public void ToggleChangeBar() // for use with shortcut keystoke <ALT><F2>
 		{
 			if (rbChgBarOff.Checked)

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -524,56 +524,7 @@ namespace Volian.Controls.Library
 			ItemInfo secitm = (ItemInfo)cbTranSects.SelectedItem;
 			bool hasMetaSubs = secitm.IsSection && secitm.Sections != null && secitm.Sections.Count > 0;
 			bool editSteps = !hasMetaSubs || (secitm.MyConfig is SectionConfig && (secitm.MyConfig as SectionConfig).SubSection_Edit == "Y");
-			if (!editSteps)
+			if (!editSteps) return;
-			{
-				if (secitm.Sections != null)
-				{
-					// if the transition to point is a section or procedure, just return
-					if (startitm.MyContent.Type < 20000) return;
-					groupPanelTranstionSteps.Style.BackColor = Color.Cornsilk;
-					// For the tree view, use parent, unless already at HLS.  If at HLS, use this level.
-					//ItemInfo selitm2 = startitm.MyHLS;
-					ItemInfo selSubSec = secitm.Sections[0];
-
-						// The commented out code below is for displaying the steps from the first sub-section B2025-035
-					//ItemInfo subSelStep = selSubSec.Steps[0];
-					//E_TransUI etm2 = (E_TransUI)_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[listBoxTranFmt.SelectedIndex].TransUI;
-					//if (subSelStep.IsInRNO)
-					//	startitm = subSelStep.FirstSibling;   // if in RNO tree, start out with HLS
-					//else
-					//	startitm = subSelStep != null ? subSelStep.FirstSibling : startitm.FirstSibling;
-
-						// B2025-035
-					ItemInfo subSelStep = secitm.Sections[0];
-					E_TransUI etm2 = (E_TransUI)_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[listBoxTranFmt.SelectedIndex].TransUI;
-					if (subSelStep.IsInRNO)
-						startitm = subSelStep.FirstSibling;   // if in RNO tree, start out with HLS
-					else
-						startitm = subSelStep != null ? subSelStep.FirstSibling : startitm.FirstSibling;
-
-						// B2025-035
-					bool setsel2 = false;
-					while (startitm != null)
-					{
-						VETreeNode tvn = new VETreeNode(startitm, false);
-						tvn.Tag = startitm;
-						int active = this.tvTran.Nodes.Add(tvn);
-						if (subSelStep != null && startitm.ItemID == subSelStep.ItemID)
-						{
-							tvTran.SelectedNode = tvTran.Nodes[active];
-							setsel2 = true;
-						}
-						startitm = startitm.GetNext();
-					}
-					if (!setsel2) tvTran.SelectedNode = tvTran.Nodes[0];
-					tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand);
-					tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand);
-					// bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010
-					tvTran.ItemHeight++;
-					tvTran.ItemHeight--;
-				}
-				return;
-			}
 			
 			// if the transition to point is a section or procedure, just return
 			if (startitm.MyContent.Type < 20000) return;
@@ -600,7 +551,6 @@ namespace Volian.Controls.Library
 				startitm = startitm.GetNext();
 			}
 			if (!setsel) tvTran.SelectedNode = tvTran.Nodes[0];
-			tvTran.BeforeExpand -= new TreeViewCancelEventHandler(tvTran_BeforeExpand);
 			tvTran.BeforeExpand += new TreeViewCancelEventHandler(tvTran_BeforeExpand);
 			// bug fix. TreeView needs the next two lines to properly display the bottom node. jsj 01/08/2010
 			tvTran.ItemHeight++;
@@ -984,13 +934,7 @@ namespace Volian.Controls.Library
 			//	a different section was selected, if step section, update step list, otherwise, empty
 			//	it & disable.
 			ItemInfo secitm = (ItemInfo)cbTranSects.SelectedItem;
-
+			if (!secitm.IsStepSection)
-			//if (secitm.IsStepSection)
-			//{
-			//	cbTranSects.SelectedItem.Sections[0];
-
-			//}
-				if (!secitm.IsStepSection)
 			{
 				tvTran.Nodes.Clear();
 				tvTran.Enabled = false;

PROMS/Volian.Controls.Library/EditItem.cs

@@ -214,14 +214,10 @@ namespace Volian.Controls.Library
 					UserCheckOffChar = (char)co.UIMark;
 				}
 				// Deal with changes in content data
-				value.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 				value.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
-				value.MyProcedure.MyContent.Changed -= new ContentInfoEvent(MyContent_Changed);
 				value.MyProcedure.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
 				// Deal with change in item data
-				value.Changed -= new ItemInfoEvent(value_Changed);
 				value.Changed += new ItemInfoEvent(value_Changed);
-				value.OrdinalChanged -= new ItemInfoEvent(value_OrdinalChanged);
 				value.OrdinalChanged += new ItemInfoEvent(value_OrdinalChanged);
 				// do something like this to draw circle around step numbers - note got NULL reference error on NSP data
 				//if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true;
@@ -762,7 +758,7 @@ namespace Volian.Controls.Library
 		// clear tabs, clears then all so that next 'get' will calculate new.
 		public void SetAllTabs()
 		{
-				RefreshTab();
+			RefreshTab();
 
 			if (_MyAfterEditItems != null) _MyAfterEditItems[0].SetAllTabs();	// B2020-043: used to loop through all, but then recursion would redo.
 			if (_MyNextEditItem != null) _MyNextEditItem.SetAllTabs();
@@ -1164,7 +1160,7 @@ namespace Volian.Controls.Library
 		{
 			if (myItemInfoList != null)
 				foreach (ItemInfo item in myItemInfoList)
-					AddChildBefore(item, expand); 
+					AddChildBefore(item, expand);
 		}
 		public EditItem AddChildBefore(ItemInfoList myItemInfoList, EditItem nextEditItem)
 		{
@@ -3998,16 +3994,11 @@ namespace Volian.Controls.Library
 			// TODO: Adjust top based upon format
 			// TODO: Remove Label and just output ident on the paint event
 			TabLeft = 20;
-			if (!itemInfo.IsStep)  // C2025-036 reduce un-needed processing - this will prevent duplicat calls that generate step tabs when loading a procedure
+			SetupHeader(itemInfo);
-				SetupHeader(itemInfo);
 			SetupAlarmTableView(itemInfo); // C2021-018 display alarm point table information in the step editor (if the format flag is set)
-			this.Paint -= new PaintEventHandler(EditItem_Paint);
 			this.Paint += new PaintEventHandler(EditItem_Paint);
-			this.BackColorChanged -= new EventHandler(EditItem_BackColorChanged);
 			this.BackColorChanged += new EventHandler(EditItem_BackColorChanged);
-			this.Move -= new EventHandler(EditItem_Move);
 			this.Move += new EventHandler(EditItem_Move);
-			this.Resize -= new EventHandler(EditItem_Resize);
 			this.Resize += new EventHandler(EditItem_Resize);
 			if (itemInfo != null)
 			{
@@ -4058,7 +4049,6 @@ namespace Volian.Controls.Library
 					SeqLevel = myParentEditItem.SeqLevel + ((myChildRelation == ChildRelation.After || myChildRelation == ChildRelation.Before) && itemInfo.IsSequential ? 1 : 0);
 				//// TIMING: DisplayItem.TimeIt("CSLARTB seqLevel");
 				MyItemInfo = itemInfo;
-				MyItemInfo.MyConfig.PropertyChanged -= new PropertyChangedEventHandler(MyConfig_PropertyChanged);
 				MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged);
 			}
 			//// TIMING: DisplayItem.TimeIt("CSLARTB MyItem");

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -340,8 +340,9 @@ namespace Volian.Controls.Library
 			this.Height = MyPictureBox.Height + 10;
 			if (_displayTags != null)
 			{
-				// Set the Height and Width on the step properties page for the new image
+				_displayTags._origFigureSizeWidth = wd;
-				_displayTags.SetNewImageHeightAndWidth(ht, wd);
+				_displayTags.TbFSwd = wd.ToString();
+				_displayTags.TbFSht = ht.ToString();
 			}
 		}
 

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1284,7 +1284,7 @@ namespace Volian.Controls.Library
 			}
 			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
             if (!isFixed)
-                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // C2017-036 get best available proportional font for symbols - B2025-039 add Blue for Colored Replace Words
+                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}");  // C2017-036 get best available proportional font for symbols
             else
 				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 			selectedRtfSB.Append("\r\n");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -618,15 +618,6 @@ namespace Volian.Controls.Library
 		}
 		private int _MyLastFormatID = -1;
 		private StepRTB _MyStepRTB;
-		private static int _OringFlg; 
-		public static int OringFlg
-		{
-			get { return _OringFlg; }
-			set
-			{
-				_OringFlg = value;
-			}
-		}
 		public StepRTB MyStepRTB
 		{
 			get { return _MyStepRTB; }
@@ -3597,9 +3588,7 @@ namespace Volian.Controls.Library
 			if (tmp.MyDisplayTabControl.MyCopyStep != null &&
 				tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyEditItem.MyItemInfo.ItemID)
 			{
-				//B2025-031 - Improve wording for if attempting to delete copied section	
+				if (FlexibleMessageBox.Show("Are you sure?\n\nIf you delete this step you will not able to paste it.\nYou should paste it before you delete it.", "Attempting to delete copied step.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
-				string stype = MyEditItem.MyItemInfo.IsSection ? "section" : "step";
-				if (FlexibleMessageBox.Show($"Are you sure?\n\nIf you delete this {stype} you will not able to paste it.\nYou should paste it before you delete it.", $"Attempting to delete copied {stype}.", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
 				clearCopyStep = true;
 			}
 
@@ -4152,22 +4141,16 @@ namespace Volian.Controls.Library
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)
 		{
-				// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
-			_OringFlg = 0;
-			DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
-			if (oring == eEventSource.Keyboard)
-				_OringFlg = 1;
-
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
 		}
 
 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1);
 		}
 
 		private void btnCASCreate_Click(object sender, EventArgs e)
@@ -4829,10 +4812,9 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
+		public StepTabRibbonEventArgs(ItemInfo proc)
 		{
 			_Proc = proc;
-			OringFlg = oringFlg;
 		}
 		private ItemInfo _Proc;
 
@@ -4841,13 +4823,6 @@ namespace Volian.Controls.Library
 			get { return _Proc; }
 			set { _Proc = value; }
 		}
-			// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
-		private int _OringFlg;
-		public int OringFlg
-		{
-			get { return _OringFlg; }
-			set { _OringFlg = value; }
-		}
 	}
 	public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
 

PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs

@@ -20,7 +20,7 @@ namespace Volian.Controls.Library
 		private AnnotationConfig MyConfig;
 
 		private StepTabRibbon _MyStepTabRibbon;
-		private Dictionary<string, TextBox> _DicTB;
+		private Dictionary<string, StepRTB> _DicStepRtb;
 		private Dictionary<string, CheckBox> _DicCheckBox;
 		private Dictionary<string, ComboBox> _DicComboBox;
 		private Dictionary<string, ComboBox> _DicSingleRO;
@@ -32,7 +32,7 @@ namespace Volian.Controls.Library
 		public frmEPAnnotationDetails(AnnotationInfo currAnn)
 		{
 			InitializeComponent();
-			_DicTB = new Dictionary<string, TextBox>();
+			_DicStepRtb = new Dictionary<string, StepRTB>();
 			_DicCheckBox = new Dictionary<string, CheckBox>();
 			_DicComboBox = new Dictionary<string, ComboBox>();
 			_DicSingleRO = new Dictionary<string, ComboBox>();
@@ -72,20 +72,28 @@ namespace Volian.Controls.Library
 
 				if (EP.type.ToLower() == "text")
 				{
-					TextBox tb = new TextBox();
+					StepRTB tb = new StepRTB();
-					tb.Font = tb.Font = new Font("Arial", 8);
+					tb.Font = tb.FormatFont = new Font("Arial", 8);
+					tb.FieldToEdit = E_FieldToEdit.PSI; //use same right click menu as PSI
 					tb.BorderStyle = BorderStyle.FixedSingle;
 					//aligning to both left and right stretches the textbox to the width of the form
 					tb.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
-					string val = MyConfig.GetValue("EP", EP.name).Replace("\\u8209?", "-").Replace(@"\u9586?", @"\");
+					tb.Enter += new System.EventHandler(this.FieldStepRTB_Enter);
-					tb.Text = val;
+
+					string val = MyConfig.GetValue("EP", EP.name).Replace("\\u8209?", "-");
+					DisplayText dt = new DisplayText(val, new VE_Font("Arial", 10, E_Style.None, 12), false);
+					StringBuilder sb = new StringBuilder();
+					sb.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 Arial;}");
+					sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;}"); //C2017-036 changed to just Arial because Microsoft removed Arial Unicode MS with Word16
+					sb.Append(@"\viewkind4\uc1\pard\sl-240\slmult0\fs" + (int)(this.Font.SizeInPoints * 2) + " " + dt.StartText + @"}");
+					tb.Rtf = sb.ToString();
 					tb.Visible = true;
 					tb.Height = EP.numlines * tb.Font.Height + 1 + tb.Margin.Vertical;
 					tb.MinimumSize = new Size(0, EP.numlines * tb.Font.Height + 1 + tb.Margin.Vertical);
 					if (EP.numlines > 1)
 					{
 						tb.Multiline = true;
-						tb.ScrollBars = ScrollBars.Both;
+						tb.ScrollBars = RichTextBoxScrollBars.Both;
 						panelEP.RowStyles.Insert(panelEP.RowCount - 1, new RowStyle(SizeType.Absolute, 50));
 					}
 					else
@@ -93,7 +101,7 @@ namespace Volian.Controls.Library
 						panelEP.RowStyles.Insert(panelEP.RowCount - 1, new RowStyle(SizeType.AutoSize));
 					}
 
-					_DicTB.Add(EP.name, tb);
+					_DicStepRtb.Add(EP.name, tb);
 					panelEP.Controls.Add(tb, 1, panelEP.RowCount - 1);
 				}
 				else
@@ -120,7 +128,7 @@ namespace Volian.Controls.Library
                     foreach (string t in tmps) cmb.Items.Add(t.Trim());
                     string val = MyConfig.GetValue("EP", EP.name);
                     if (val != null && val != "") cmb.SelectedItem = val;
-					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Length).FirstOrDefault(), cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Length).First(), cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 					cmb.Width = cmb.DropDownWidth;
 					_DicComboBox.Add(EP.name, cmb);
 					panelEP.Controls.Add(cmb, 1, panelEP.RowCount - 1);
@@ -135,7 +143,7 @@ namespace Volian.Controls.Library
 					cmb.ValueMember = "Value";
 					cmb.DataSource = tmps;
 					cmb.DropDownStyle = ComboBoxStyle.DropDownList;
-					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).FirstOrDefault()?.Text, cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).First().Text, cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 					cmb.Width = cmb.DropDownWidth;
 
 					_DicSingleRO.Add(EP.name, cmb);
@@ -148,7 +156,7 @@ namespace Volian.Controls.Library
 					List<ROListItem> tmps = EP.getROList(currAnn, false);
 					lb.DisplayMember = "Text";
 					lb.ValueMember = "Value";
-					lb.Width = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).FirstOrDefault()?.Text, lb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					lb.Width = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).First().Text, lb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 
 					lb.DataSource = tmps;
 					_DicMultiRO.Add(EP.name, lb);
@@ -218,8 +226,9 @@ namespace Volian.Controls.Library
 			{
 				if (EP.type.ToLower() == "text")
 				{
-					TextBox cur = _DicTB[EP.name];
+					StepRTB cur = _DicStepRtb[EP.name];
-					string newval = cur.Text;
+					string rtf = cur.Rtf;
+					string newval = DisplayText.StaticStripRtfCommands(rtf, false);
 					string oldval = MyConfig.GetValue("EP", EP.name);
 					if (oldval != newval) 
 					{
@@ -309,6 +318,11 @@ namespace Volian.Controls.Library
 		//remove events so no memory loss
 		private void frmEPAnnotationDetails_FormClosing(object sender, FormClosingEventArgs e)
         {
+			foreach (StepRTB tb in _DicStepRtb.Values)
+			{
+				tb.Enter -= FieldStepRTB_Enter;
+			}
+
 			foreach (ListBoxMulti lb in _DicMultiRO.Values)
 			{
 				lb.Dispose();

PROMS/Volian.Print.Library/PDFReport.cs

@@ -1688,7 +1688,7 @@ namespace Volian.Print.Library
 			System.Windows.Forms.MessageBox.Show(msg.ToString(), "Error during PDF creation for search:", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation);
 		}
 
-		public static string BuildStepTab(ItemInfo item)
+		private static string BuildStepTab(ItemInfo item)
 		{
 			if (item == null)
 				return string.Empty;

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -252,14 +252,6 @@ namespace Volian.Print.Library
 			get { return _CountInApplProcs; }
 			set { _CountInApplProcs = value; }
 		}
-		// C2025-033 Child (slave) being printed
-		private static int _PrintingChild = 0;
-		public static int PrintingChild
-		{
-			get { return _PrintingChild; }
-			set { _PrintingChild = value; }
-		}
-
 		//private bool _AddBlankPagesForDuplexPrinting = false;
 		//public bool AddBlankPagesForDuplexPrinting // Tells us if a the option to add a blank page is turn on (for procedures with duplex foldouts)
 		//{
@@ -1371,8 +1363,6 @@ i = 0;
 			foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
 			{
 				if (pageItem.Token == null) continue;   // can be null if token is dependent on PSI lookup!
-				// 2024-089 selectively print pagestyle item base on Child Procedure being printed
-				if (PrintingChild > 0 && pageItem.ChildNum > 0 && pageItem.ChildNum != PrintingChild) continue; // C2025-033 item should not be printed for this child
 				DidHLSText = false;    // reset to false for this group of tokens.
 				//if (pageItem.Token.Contains("HLSTEXT"))
 				//    Console.WriteLine("{0} - PageList Token", pageItem.Token);
@@ -1771,16 +1761,6 @@ i = 0;
 				case "[HEADER4]":
 				case "{HEADER5}":
 				case "[HEADER5]":
-				case "{HEADER6}":
-				case "[HEADER6]":
-				case "{HEADER7}":
-				case "[HEADER7]":
-				case "{HEADER8}":
-				case "[HEADER8]":
-				case "{HEADER9}":
-				case "[HEADER9]":
-				case "{HEADER10}":
-				case "[HEADER10]":
 				case "{BOX1}":
 				case "[BOX1]":
 				case "{BOX2}":
@@ -2119,12 +2099,7 @@ i = 0;
 				case "[UNITNUMBER]":
 					string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
 					if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
-					{ 
+						plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
-						if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording))
-							plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
-						else
-							plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2"
-					}
 					else
 						plstr = plstr.Replace(token, unbr);
 					break;