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", "PROMSDemo" };
-		
-		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
-		// dialog is check
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
+
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis) 
-					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
+				if (fn.ToUpper().StartsWith(excludeThis)) return true;
 			return false;
 		}
 
@@ -165,5 +161,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-	}
+}
 }

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -735,27 +735,23 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				if (parentName != "#whitespace")
+				//applicValues = "";
+				applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+				int pcChildIdx = 0;
+				//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+				foreach (string c in pcChildern)
 				{
-					//applicValues = "";
-					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
-					int pcChildIdx = 0;
-					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
-
-					foreach (string c in pcChildern)
+					//string csufx = CvtUserFldToFld(c);
+					pcChildIdx++;
+					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
+					//applicValues += ",";
+					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
+					else
 					{
-						//string csufx = CvtUserFldToFld(c);
-						pcChildIdx++;
-						string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-						//applicValues += ",";
-						XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-						if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
-						else
-						{
-							if (parentValue != cn.InnerText)
-								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
-						}
+						if (parentValue != cn.InnerText)
+							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
 					}
 				}
 				applicValues += " /APL>";

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 parentid = ((TextBoxAttrTag)tb.Tag).GetParentHTId;
-				if (!string.IsNullOrEmpty(parentid))
-				{
-					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)
-			}
-
+			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

@@ -66,12 +66,6 @@ namespace VEPROMS
 			set { _prtSectID = value; }
 		}
 
-		private bool _OverwritePDF;
-		public bool OverwritePDF
-		{
-			get { return cbxOverwritePDF2.Checked; }
-			set { cbxOverwritePDF2.Checked = value; }
-		}
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -399,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;
@@ -425,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
-			VlnSvgPageHelper.PrintingChild = SelectedSlave;
-			if (SelectedSlave > 0)
-			{
-				pc.SelectedSlave = 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'))
@@ -13635,8 +13637,8 @@ WITH EXECUTE AS OWNER
 AS
 BEGIN TRY -- Try Block
 	BEGIN TRANSACTION
-    Update Contents set Text = Replace(Replace(Replace(Replace(Replace(Replace(Replace(Replace(Text,'\emdash','\u8209?'),'\endash','\u8209?'),'\u8213?','\u8209?'),'\u8212?','\u8209?'),'\u8211?','\u8209?'),'\u8210?','\u8209?'),'\u8208?','\u8209?'),NCHAR(8209),'\u8209?')
-    where Text Like '%\u8208?%' or Text Like '%\u8210?%' or Text Like '%\u8211?%' or Text Like '%\u8212?%' or Text Like '%\u8213?%' or Text Like '%\endash%' or Text Like '%\emdash%'or Text Like '%' + NCHAR(8209) + '%'	IF( @@TRANCOUNT > 0 ) COMMIT
+	Update Contents set Text = Replace(Replace(Replace(Replace(Replace(Replace(Replace(Text,'\emdash','\u8209?'),'\endash','\u8209?'),'\u8213?','\u8209?'),'\u8212?','\u8209?'),'\u8211?','\u8209?'),'\u8210?','\u8209?'),'\u8208?','\u8209?')
+	where Text Like '%\u8208?%' or Text Like '%\u8210?%' or Text Like '%\u8211?%' or Text Like '%\u8212?%' or Text Like '%\u8213?%' or Text Like '%\endash%' or Text Like '%\emdash%'
 	IF( @@TRANCOUNT > 0 ) COMMIT
 END TRY
 BEGIN CATCH -- Catch Block
@@ -17320,7 +17322,7 @@ GO
 			[RofstID] [int] NOT NULL,
 			[roid] [varchar](50) NOT NULL,
 			[value] [varchar](max) NOT NULL,
-			[AccPageID] [varchar](100) NULL,
+			[AccPageID] [varchar](max) NULL,
 		 CONSTRAINT [PK_RofstDefaultValue] PRIMARY KEY CLUSTERED 
 		(
 			[RofstID] ASC,
@@ -18917,10 +18919,9 @@ GO
 			Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
 	*****************************************************************************/
 	/*
-		==========================================================================================================
-		Author:			Jake Ropar / Matthew Schill
+	==========================================================================================================
+		Author:			Jake Ropar
 		Create Date:	06/23/2022
-		Modify Date:    08/18/2025
 		Description:	Finalizes Rofst Header Record / Updates LoadedDate if Success
 	==========================================================================================================
 	*/
@@ -18937,18 +18938,13 @@ GO
 		Set LoadedDate = GetDate()
 		Where RofstID = @RofstID;
 
-
-		--always rebuild the rofst child and default indexes
-		DBCC DBREINDEX ('RofstChild');
-		DBCC DBREINDEX ('RofstDefaultValue');	
-
 		-- Rebuild/Reorganize Indexes
 		Exec [dbo].[vesp_UtilityCheckIndexes] 20.0, 5.0, 0, 1;
 
-
+	
 		Return;
 	End
-	GO
+	Go
 
 	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Succeeded'
 	ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
@@ -23814,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.
@@ -24030,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'
@@ -24039,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
@@ -24080,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
@@ -24299,57 +24029,6 @@ Go
 ---  end changes for:
 ---C2025-023 - Electronic Procedures - Modifications to PROMS
 
-/*
-==========================================================================================================
- Begin: C2025-045: Improve Performance loading procedures with Alarms
-==========================================================================================================
-*/
-
-IF Exists(SELECT 1 from information_schema.columns where character_maximum_length=-1 and column_name = 'AccPageID' and table_name = 'RofstDefaultValue')
-Begin
-ALTER TABLE RofstDefaultValue ALTER COLUMN AccPageID varchar(100)
-END
-GO
-
-IF (@@Error = 0) PRINT 'Updating size of RofstDefaultValue.AccPageID Succeeded'
-ELSE PRINT 'Updating size of RofstDefaultValue.AccPageID Failed to Execute'
-GO
-
-EXEC sp_refreshview [dbo.vwRofstData_RofstDefaultValues]
-EXEC sp_refreshview [dbo.vwRofstData_RofstBaseRoids]
-GO
-
-IF (@@Error = 0) PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Succeeded'
-ELSE PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Failed to Execute'
-GO
-
-IF NOT EXISTS (SELECT * FROM dbo.sysindexes WHERE name = 'IX_RofstDefaultValue_RofstID_AccPageID')
-BEGIN
-CREATE NONCLUSTERED INDEX [IX_RofstDefaultValue_RofstID_AccPageID] ON [dbo].[RofstDefaultValue]
-(
-    [RofstID] ASC,
-	[AccPageID] ASC
-)
-INCLUDE
-(
-       [roid]
-      ,[value]
-)
-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]
-
-END
-GO
-
-IF (@@Error = 0) PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Succeeded'
-ELSE PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Failed to Execute'
-GO
-
-/*
-==========================================================================================================
- End: C2025-045: Improve Performance loading procedures with Alarms
-==========================================================================================================
-*/
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24383,8 +24062,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '08/18/2025 2:07 PM'
-	set @RevDescription = 'Updated Index maintenance that occurs after RO FST Load to improve RO Performance'
+	set @RevDate = '4/8/2025 11:24'
+	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/Properties/Resources.Designer.cs

@@ -250,16 +250,6 @@ namespace VEPROMS.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap toolbox {
-            get {
-                object obj = ResourceManager.GetObject("toolbox", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -111,6 +111,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="Itenso.Rtf.Interpreter">
       <HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
     </Reference>
@@ -129,8 +133,6 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -150,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>
@@ -173,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>
@@ -266,12 +248,6 @@
     <Compile Include="frmBatchRefreshCheckedOut.designer.cs">
       <DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmGenTools.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmGenTools.designer.cs">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmManageUser.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -355,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>
@@ -384,9 +353,6 @@
     <EmbeddedResource Include="frmAnnotationsCleanup.resx">
       <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGenTools.resx">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -512,7 +478,6 @@
     <Content Include="PROMSRollback %28v2.0%29.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\toolbox.png" />
     <Content Include="ROBuild.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

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)
@@ -1309,7 +1303,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0, selectedSlave); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");

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/frmBatchRefresh.Designer.cs

@@ -70,6 +70,17 @@
             this.labelX6 = new DevComponents.DotNetBar.LabelX();
             this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
             this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
+            this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
+            this.labelX7 = new DevComponents.DotNetBar.LabelX();
+            this.line1 = new DevComponents.DotNetBar.Controls.Line();
+            this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX3 = new DevComponents.DotNetBar.LabelX();
+            this.labelX2 = new DevComponents.DotNetBar.LabelX();
+            this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
             this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
             this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
             this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -86,10 +97,14 @@
             this.labelX8 = new DevComponents.DotNetBar.LabelX();
             this.line2 = new DevComponents.DotNetBar.Controls.Line();
             this.btnRunRepair = new DevComponents.DotNetBar.ButtonX();
+            this.sideNavPanel5 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
             this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.separator1 = new DevComponents.DotNetBar.Separator();
+            this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
+            this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
@@ -114,7 +129,9 @@
             this.sideNav1.SuspendLayout();
             this.sideNavPanel4.SuspendLayout();
             this.sideNavPanel3.SuspendLayout();
+            this.sideNavPanel1.SuspendLayout();
             this.sideNavPanel2.SuspendLayout();
+            this.sideNavPanel5.SuspendLayout();
             this.panelEx4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -450,17 +467,21 @@
             // sideNav1
             // 
             this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
-            this.sideNav1.Controls.Add(this.sideNavPanel2);
             this.sideNav1.Controls.Add(this.sideNavPanel4);
             this.sideNav1.Controls.Add(this.sideNavPanel3);
+            this.sideNav1.Controls.Add(this.sideNavPanel1);
+            this.sideNav1.Controls.Add(this.sideNavPanel2);
+            this.sideNav1.Controls.Add(this.sideNavPanel5);
             this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sideNav1.EnableClose = false;
             this.sideNav1.EnableMaximize = false;
             this.sideNav1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.sideNavItem1,
             this.separator1,
+            this.sideNavItmCheck,
             this.sideNavItmRepair,
             this.sideNavItmLinks,
+            this.sideNavItmUsers,
             this.sideNavItmDelete,
             this.sideNavItmExit});
             this.sideNav1.Location = new System.Drawing.Point(0, 0);
@@ -484,7 +505,6 @@
             this.sideNavPanel4.Name = "sideNavPanel4";
             this.sideNavPanel4.Size = new System.Drawing.Size(299, 493);
             this.sideNavPanel4.TabIndex = 27;
-            this.sideNavPanel4.Visible = false;
             // 
             // swDeleteFolder
             // 
@@ -739,6 +759,173 @@
             this.btnFixLinks.Text = "Process Links";
             this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
             // 
+            // sideNavPanel1
+            // 
+            this.sideNavPanel1.Controls.Add(this.warningBox3);
+            this.sideNavPanel1.Controls.Add(this.labelX7);
+            this.sideNavPanel1.Controls.Add(this.line1);
+            this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
+            this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
+            this.sideNavPanel1.Controls.Add(this.labelX3);
+            this.sideNavPanel1.Controls.Add(this.labelX2);
+            this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
+            this.sideNavPanel1.Controls.Add(this.labelX1);
+            this.sideNavPanel1.Controls.Add(this.btnRunCheck);
+            this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
+            this.sideNavPanel1.Name = "sideNavPanel1";
+            this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
+            this.sideNavPanel1.TabIndex = 2;
+            this.sideNavPanel1.Visible = false;
+            // 
+            // warningBox3
+            // 
+            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+            this.warningBox3.CloseButtonVisible = false;
+            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
+            this.warningBox3.Location = new System.Drawing.Point(17, 207);
+            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.warningBox3.Name = "warningBox3";
+            this.warningBox3.OptionsButtonVisible = false;
+            this.warningBox3.Size = new System.Drawing.Size(264, 32);
+            this.warningBox3.TabIndex = 29;
+            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
+            // 
+            // labelX7
+            // 
+            this.labelX7.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX7.Location = new System.Drawing.Point(5, 3);
+            this.labelX7.Name = "labelX7";
+            this.labelX7.Size = new System.Drawing.Size(251, 22);
+            this.labelX7.TabIndex = 19;
+            this.labelX7.Text = "Check for these Data Issues:";
+            // 
+            // line1
+            // 
+            this.line1.BackColor = System.Drawing.Color.Transparent;
+            this.line1.Location = new System.Drawing.Point(8, 179);
+            this.line1.Name = "line1";
+            this.line1.Size = new System.Drawing.Size(285, 12);
+            this.line1.TabIndex = 18;
+            this.line1.Text = "line1";
+            // 
+            // swCkObsoleteROData
+            // 
+            // 
+            // 
+            // 
+            this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+            this.swCkObsoleteROData.Name = "swCkObsoleteROData";
+            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+            this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.swCkObsoleteROData.SwitchClickTogglesValue = true;
+            this.swCkObsoleteROData.TabIndex = 14;
+            this.swCkObsoleteROData.Value = true;
+            this.swCkObsoleteROData.ValueObject = "Y";
+            this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // swHiddenDataLocs
+            // 
+            // 
+            // 
+            // 
+            this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+            this.swHiddenDataLocs.Name = "swHiddenDataLocs";
+            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+            this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.swHiddenDataLocs.SwitchClickTogglesValue = true;
+            this.swHiddenDataLocs.TabIndex = 15;
+            this.swHiddenDataLocs.Value = true;
+            this.swHiddenDataLocs.ValueObject = "Y";
+            this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // labelX3
+            // 
+            this.labelX3.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX3.Location = new System.Drawing.Point(107, 99);
+            this.labelX3.Name = "labelX3";
+            this.labelX3.Size = new System.Drawing.Size(154, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.labelX3.TabIndex = 11;
+            this.labelX3.Text = "Obsolete RO Data";
+            // 
+            // labelX2
+            // 
+            this.labelX2.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX2.Location = new System.Drawing.Point(107, 71);
+            this.labelX2.Name = "labelX2";
+            this.labelX2.Size = new System.Drawing.Size(140, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.labelX2.TabIndex = 12;
+            this.labelX2.Text = "Hidden Data Locations";
+            // 
+            // swCkOrphanDataRecs
+            // 
+            // 
+            // 
+            // 
+            this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+            this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
+            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+            this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
+            this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
+            this.swCkOrphanDataRecs.TabIndex = 9;
+            this.swCkOrphanDataRecs.Value = true;
+            this.swCkOrphanDataRecs.ValueObject = "Y";
+            this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // labelX1
+            // 
+            this.labelX1.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX1.Location = new System.Drawing.Point(107, 43);
+            this.labelX1.Name = "labelX1";
+            this.labelX1.Size = new System.Drawing.Size(172, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
+            this.labelX1.TabIndex = 8;
+            this.labelX1.Text = "Orphan Data Records";
+            // 
+            // btnRunCheck
+            // 
+            this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnRunCheck.Checked = true;
+            this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
+            this.btnRunCheck.Name = "btnRunCheck";
+            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+            this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
+            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
+            this.btnRunCheck.TabIndex = 7;
+            this.btnRunCheck.Text = "Run Check";
+            this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
+            // 
             // sideNavPanel2
             // 
             this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
@@ -757,10 +944,11 @@
             this.sideNavPanel2.Controls.Add(this.line2);
             this.sideNavPanel2.Controls.Add(this.btnRunRepair);
             this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel2.Location = new System.Drawing.Point(81, 31);
+            this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
             this.sideNavPanel2.Name = "sideNavPanel2";
-            this.sideNavPanel2.Size = new System.Drawing.Size(299, 493);
+            this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
             this.sideNavPanel2.TabIndex = 6;
+            this.sideNavPanel2.Visible = false;
             // 
             // swRefreshTblsForSrch
             // 
@@ -988,6 +1176,31 @@
             this.btnRunRepair.Text = "Run Repair";
             this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
             // 
+            // sideNavPanel5
+            // 
+            this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
+            this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel5.Location = new System.Drawing.Point(81, 31);
+            this.sideNavPanel5.Name = "sideNavPanel5";
+            this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
+            this.sideNavPanel5.TabIndex = 14;
+            this.sideNavPanel5.Visible = false;
+            // 
+            // btn_ShowUsers
+            // 
+            this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btn_ShowUsers.Checked = true;
+            this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
+            this.btn_ShowUsers.Name = "btn_ShowUsers";
+            this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
+            this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
+            "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
+            this.btn_ShowUsers.TabIndex = 0;
+            this.btn_ShowUsers.Text = "Show Users";
+            this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
+            // 
             // sideNavItem1
             // 
             this.sideNavItem1.IsSystemMenu = true;
@@ -1005,9 +1218,16 @@
             this.separator1.Padding.Top = 2;
             this.separator1.SeparatorOrientation = DevComponents.DotNetBar.eDesignMarkerOrientation.Vertical;
             // 
+            // sideNavItmCheck
+            // 
+            this.sideNavItmCheck.Name = "sideNavItmCheck";
+            this.sideNavItmCheck.Panel = this.sideNavPanel1;
+            this.sideNavItmCheck.Symbol = "";
+            this.sideNavItmCheck.Text = "Check";
+            this.sideNavItmCheck.Click += new System.EventHandler(this.sideNavItmCheck_Click);
+            // 
             // sideNavItmRepair
             // 
-            this.sideNavItmRepair.Checked = true;
             this.sideNavItmRepair.Name = "sideNavItmRepair";
             this.sideNavItmRepair.Panel = this.sideNavPanel2;
             this.sideNavItmRepair.Symbol = "";
@@ -1022,8 +1242,17 @@
             this.sideNavItmLinks.Text = "Links";
             this.sideNavItmLinks.Click += new System.EventHandler(this.sideNavItmLinks_Click);
             // 
+            // sideNavItmUsers
+            // 
+            this.sideNavItmUsers.Name = "sideNavItmUsers";
+            this.sideNavItmUsers.Panel = this.sideNavPanel5;
+            this.sideNavItmUsers.Symbol = "";
+            this.sideNavItmUsers.Text = "Users";
+            this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
+            // 
             // sideNavItmDelete
             // 
+            this.sideNavItmDelete.Checked = true;
             this.sideNavItmDelete.Name = "sideNavItmDelete";
             this.sideNavItmDelete.Panel = this.sideNavPanel4;
             this.sideNavItmDelete.Symbol = "";
@@ -1163,7 +1392,9 @@
             this.sideNav1.PerformLayout();
             this.sideNavPanel4.ResumeLayout(false);
             this.sideNavPanel3.ResumeLayout(false);
+            this.sideNavPanel1.ResumeLayout(false);
             this.sideNavPanel2.ResumeLayout(false);
+            this.sideNavPanel5.ResumeLayout(false);
             this.panelEx4.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -1191,6 +1422,16 @@
 		private System.Windows.Forms.CheckBox chkLater;
 		private System.Windows.Forms.Label label4;
 		private DevComponents.DotNetBar.Controls.SideNav sideNav1;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel1;
+		private DevComponents.DotNetBar.LabelX labelX7;
+		private DevComponents.DotNetBar.Controls.Line line1;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkObsoleteROData;
+		private DevComponents.DotNetBar.Controls.SwitchButton swHiddenDataLocs;
+		private DevComponents.DotNetBar.LabelX labelX3;
+		private DevComponents.DotNetBar.LabelX labelX2;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkOrphanDataRecs;
+		private DevComponents.DotNetBar.LabelX labelX1;
+		private DevComponents.DotNetBar.ButtonX btnRunCheck;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRmObsoleteROData;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshWordAttmts;
@@ -1203,12 +1444,16 @@
 		private DevComponents.DotNetBar.LabelX labelX8;
 		private DevComponents.DotNetBar.Controls.Line line2;
 		private DevComponents.DotNetBar.ButtonX btnRunRepair;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
+		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3;
 		private DevComponents.DotNetBar.ButtonX btnFixLinks;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
 		private DevComponents.DotNetBar.Separator separator1;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmCheck;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmRepair;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmLinks;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmUsers;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
 		private DevComponents.DotNetBar.LabelX lblAdmToolProgressType;
 		private DevComponents.DotNetBar.ProgressSteps progressSteps1;
@@ -1228,6 +1473,7 @@
 		private DevComponents.DotNetBar.LabelX labelX6;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox5;
 		private DevComponents.DotNetBar.Controls.Line line3;
+		private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox4;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshTblsForSrch;

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -34,8 +34,8 @@ namespace VEPROMS
 			_veProms = veProms;
 
 
-			// When opening Admin tools Repair tab will be default.
-			this.sideNavItmRepair.Checked = true;
+			// When opening Admin tools Check tab will be default.
+			this.sideNavItmCheck.Checked = true;
 
 			if (sideNavItmDelete.Checked)
 			{
@@ -95,6 +95,7 @@ namespace VEPROMS
 			int affectedRows = ESP_FixHyphens.Execute("vesp_FixHyphens") / 2;// Two results for each change
 			txtProcess.AppendText(string.Format("Fixed {0} Hyphens", affectedRows));
 			txtProcess.AppendText(Environment.NewLine);
+			//txtProcess.AppendText(Environment.NewLine);
 			txtResults.AppendText(string.Format("{0} Hyphens were Fixed.", affectedRows));
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
@@ -142,10 +143,16 @@ namespace VEPROMS
 			return false;
 		}
 
-        private void ResetTV(bool noProcs)
+		private List<string> myTreeNodePath;
+		private void ResetTV()
+		{
+			ResetTV(false);
+		}
+		private void ResetTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
 			this.Cursor = Cursors.WaitCursor;
+			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
 			myFolders.Clear();
@@ -158,6 +165,10 @@ namespace VEPROMS
 				myTV.SelectedNode.Expand();
 			this.Cursor = Cursors.Default;
 		}
+		private void ResetDelTV()
+		{
+			ResetDelTV(false);
+		}
 		private void ResetDelTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
@@ -197,10 +208,13 @@ namespace VEPROMS
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
 
-                if (fic.ChildFolderCount > 0 && LoadChildFolders(fic, tnc, noProcs))
-                    loadedChildWorkingDraft = true;
+				if (fic.ChildFolderCount > 0)
+				{
+					if (LoadChildFolders(fic, tnc, noProcs))
+						loadedChildWorkingDraft = true;
+				}
 
-                if (fic.FolderDocVersionCount > 0)
+				if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
 						tnc.Remove();
@@ -238,9 +252,12 @@ namespace VEPROMS
 				{
 					tnc.Tag = dvi;
 					myDocVersions.Add(tnc, dvi);
-                    if (!noProcs && dvi.Procedures.Count > 0)
-                        LoadProcedures(dvi, tnc);
-                    rtnval = true;
+					if (!noProcs)
+					{
+						if (dvi.Procedures.Count > 0)
+							LoadProcedures(dvi, tnc);
+					}
+					rtnval = true;
 				}
 				else
 				{
@@ -256,7 +273,7 @@ namespace VEPROMS
 		}
 		private void LoadProcedures(DocVersionInfo dvi, TreeNode tnc)
 		{
-			foreach (ProcedureInfo pi in dvi.Procedures.OfType<ProcedureInfo>())
+			foreach (ProcedureInfo pi in dvi.Procedures)
 			{
 				TreeNode tn = tnc.Nodes.Add(string.Format("{0} {1}", pi.DisplayNumber, pi.DisplayText));
 				myProcedures.Add(tn, pi);
@@ -310,7 +327,7 @@ namespace VEPROMS
 						// C2023-002:  Loop through the docversion's procedures to determine which cannot be open and add to
 						//	list.  The frmBatchRefreshCheckedOut dialog operates on procedures, not docversions.
 						string msgp = string.Empty;
-						foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
+						foreach (ProcedureInfo pi in dq.Procedures)
 						{
 							if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp)) pil.Add(pi);
 						}
@@ -503,6 +520,7 @@ namespace VEPROMS
 			foreach (TreeNode tn in myProcedures.Keys)
 				if (tn.Checked)
 					pil.Add(myProcedures[tn]);
+			//PopulateTransitionInfoLists(pil);
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refresh Transitions");
 			txtProcess.AppendText(Environment.NewLine);
@@ -692,7 +710,7 @@ namespace VEPROMS
 								cc.Save();
 							}
 						}
-						catch
+						catch (Exception ex)
 						{
 							this.Cursor = Cursors.Default;
 							return -cntfix;
@@ -704,6 +722,42 @@ namespace VEPROMS
 			}
 			return cntfix;
 		}
+		// C2017-030 - new Admin Tools user interface
+		// tool renamed to Identify Orphan Items
+		private void IdentifyDisconnectedItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Orphan Items");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
+			txtProcess.AppendText(string.Format("Orphan Items Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} Orphan items.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText("These can be removed via the Remove Orphan Data Records in the Repair tools");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Orphan Records Found");// B2017-108 Always output results even if there isn't any 
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+			//MessageBox.Show(string.Format("{0} Completed", "Orphan Items Check"), "Orphan Items");
+		}
 
 		// C2017-030 - new Admin Tools user interface
 		// tool renamed to Remove Orphan Items
@@ -723,6 +777,8 @@ namespace VEPROMS
 				int rowCount2 = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
 				txtProcess.AppendText(string.Format("Orphan Items Purged: {0}", rowCount));
 				txtProcess.AppendText(Environment.NewLine);
+				//txtProcess.AppendText(Environment.NewLine);
+				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
@@ -739,10 +795,11 @@ namespace VEPROMS
 			}
 			else
 			{
+				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Orpan Items to Purge!");
+				txtResults.AppendText(string.Format("No Orpan Items to Purge!"));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -754,6 +811,45 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
+		// C2017-030 - new Admin Tools user interface
+		// is one of two tools run from Check Obsolete RO Data
+		private void IdentifyUnusedRoFstsAndFigures()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
+			int rowCountFigures = ESP_GetUnusedFigures.Execute("vesp_GetUnusedFiguresCount");
+			txtProcess.AppendText(string.Format("Unused RoFsts Count:  {0}, Unused Figures Count:  {1}", rowCountRoFst, rowCountFigures));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCountRoFst > 0 || rowCountFigures > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RoFsts.", rowCountRoFst));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(string.Format("The database contains {0} unused Figures items.", rowCountFigures));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Unused  RoFsts or Figures Found"); // B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
 		// C2017-030 - new Admin Tools user interface is one of two tools run from Remove Obsolete RO Data
 		private void RemoveUnusedRoFstsAndFigures()
 		{
@@ -797,7 +893,41 @@ namespace VEPROMS
 			{
 				txtProcess.AppendText(string.Format("The database contained {0} unused RoFSTs or Figures.", rowCountRoFst + rowCountFigures));
 				txtProcess.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Unused ROFSTs To Remove.");
+				txtResults.AppendText(string.Format("No Unused ROFSTs To Remove."));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+		// C2017-030 - new Admin Tools user interface
+		// is one of two tools run from Check Obsolete RO Data
+		private void IdentifyROAssociations()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RO Associations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
+			txtProcess.AppendText(string.Format("Unused RO Associations Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -846,7 +976,7 @@ namespace VEPROMS
 				txtResults.AppendText(string.Format("The database contained {0} Unused RO Associations.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Unused RO Associations to Purge.");
+				txtResults.AppendText(string.Format("No Unused RO Associations to Purge."));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -858,6 +988,49 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
+		// C2017-030 - new Admin Tools user interface
+		// tool was renamed to Hidden Data Locations (on Check list)
+		private void IdentifyNonEditableItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Hidden Item Locations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
+			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
+			txtProcess.AppendText(Environment.NewLine);
+			if (myItems.Count > 0)
+			{
+				txtResults.AppendText("The following items are hidden (non-editable)...");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+				foreach (ItemInfo ii in myItems)
+				{
+					txtResults.AppendText(ii.Path);
+					txtResults.AppendText(Environment.NewLine);
+				}
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Hidden Data Found");// B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			//C2025-011 RO Update Admin Tool Memory Enhancements 
+			//clear the list since no longer using it
+			myItems.Clear();
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
 		// C2017-030 - new Admin Tools user interface
 		// tool was renamed to Show Users
 		private void GetDatabaseSessions()
@@ -922,6 +1095,7 @@ namespace VEPROMS
 				return;
 			}
 
+			//FileInfo fiRofst = new FileInfo(rofstPath);
 			Cursor = Cursors.WaitCursor;
 
 			using (DocVersion dv = DocVersion.Get(dq.VersionID))
@@ -935,6 +1109,7 @@ namespace VEPROMS
 				}
 				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
+				//ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, null);
 				roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
@@ -947,13 +1122,14 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 
+			return;
 		}
 
 		private void RefreshProcedureTransitions(ProcedureInfo pq)
 		{
 			DateTime start = DateTime.Now;
 			ProcedureInfo.ResetTranCounters();
-			ProcedureInfo.RefreshTransitions(pq);
+			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
 			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
@@ -969,6 +1145,41 @@ namespace VEPROMS
 			return VlnFlexGrid.ROTableUpdate(sender, args);
 		}
 
+		private void PopulateTransitionInfoLists(List<ProcedureInfo> pil)
+		{
+			Dictionary<int, int> dic = new Dictionary<int, int>();
+			StringBuilder sb = new StringBuilder();
+			foreach (ProcedureInfo pi in pil)
+				if (!dic.ContainsKey(pi.MyDocVersion.VersionID))
+				{
+					dic.Add(pi.MyDocVersion.VersionID, pi.MyDocVersion.VersionID);
+					sb.Append(sb.Length == 0 ? pi.MyDocVersion.VersionID.ToString() : "," + pi.MyDocVersion.VersionID.ToString());
+				}
+			txtProcess.AppendText("Preparing to process...");
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			//transitionsToDisconnected = TransitionInfoList.GetTransitionsToDisconnected(sb.ToString());
+			//transitionsToNonEditable = TransitionInfoList.GetTransitionsToNonEditable(sb.ToString());
+		}
+
+		private void ProgressBarShowText()
+		{
+			pbProcess.Refresh();
+			int percent = (int)(((double)(pbProcess.Value - pbProcess.Minimum) /
+			(double)(pbProcess.Maximum - pbProcess.Minimum)) * 100);
+			using (Graphics gr = pbProcess.CreateGraphics())
+			{
+				gr.DrawString(percent.ToString() + "%",
+						SystemFonts.DefaultFont,
+						Brushes.Black,
+						new PointF(pbProcess.Width / 2 - (gr.MeasureString(percent.ToString() + "%",
+								SystemFonts.DefaultFont).Width / 2.0F),
+						pbProcess.Height / 2 - (gr.MeasureString(percent.ToString() + "%",
+								SystemFonts.DefaultFont).Height / 2.0F)));
+			}
+			Application.DoEvents();
+		}
+
 		StringBuilder myFixes;
 		int myFixesCount = 0;
 		int myConvertCount = 0;
@@ -988,6 +1199,7 @@ namespace VEPROMS
 			{
 				txtResults.AppendText(string.Format("Fixed Referenced Object for {1}({4}){0}Old Text: {2}{0}New Text: {3}{0}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue, (sender as ItemInfo).ItemID));
 				Application.DoEvents();
+				//myFixes.AppendLine(string.Format("Fixed Referenced Object for {1}{0}Old Text: {2}{0}New Text: {3}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue));
 			}
 			else // B2018-002 - Invalid Transitions - Display Transition Cconversion Statistics
 			{
@@ -1142,6 +1354,14 @@ namespace VEPROMS
 			pnlLater.Enabled = chkLater.Checked;
 		}
 
+		// C2017-030 new Admin Tools user interface
+		private void sideNavItmCheck_Click(object sender, EventArgs e)
+		{
+			AdminToolType = E_AdminToolType.Check;
+			lblAdmToolProgressType.Text = "Checking:";
+			setupProgessSteps1();
+		}
+
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmRepair_Click(object sender, EventArgs e)
 		{
@@ -1167,6 +1387,13 @@ namespace VEPROMS
 				ResetTV(false);
 		}
 
+		// C2017-030 new Admin Tools user interface
+		private void sideNavItmUsers_Click(object sender, EventArgs e)
+		{
+			AdminToolType = E_AdminToolType.Users;
+			setupProgessSteps1();
+		}
+
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmExit_Click(object sender, EventArgs e)
 		{
@@ -1186,18 +1413,27 @@ namespace VEPROMS
 				ResetDelTV(false);
 		}
 
+		// new Admin Tools user interface for deletes
+		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
+		//{
+
+		//}
+
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
 		private enum E_AdminToolType : int
 		{
+			Check = 0,
 			Repair = 1,
 			Links = 2,
+			Users = 3,
 			Delete = 4
 		};
-		private E_AdminToolType AdminToolType = E_AdminToolType.Repair;
+		private E_AdminToolType AdminToolType = 0;
 
 		DevComponents.DotNetBar.StepItem siOrphDatRecs = new DevComponents.DotNetBar.StepItem("siOrphDatRecs", "Orphan Data Records");
+		DevComponents.DotNetBar.StepItem siHiddenDataLocs = new DevComponents.DotNetBar.StepItem("siHiddenDataLocs", "Hidden Data");
 		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
 		DevComponents.DotNetBar.StepItem siStandardHyphens = new DevComponents.DotNetBar.StepItem("siStandardHyphens", "Standardize Hyphens");
 		DevComponents.DotNetBar.StepItem siRefreshAttmts = new DevComponents.DotNetBar.StepItem("siRefreshAttmts", "Refresh Word Attachments");
@@ -1210,6 +1446,18 @@ namespace VEPROMS
 
 			switch (AdminToolType)
 			{
+				case E_AdminToolType.Check:
+					if (swCkOrphanDataRecs.Value)
+						progressSteps1.Items.Add(siOrphDatRecs);
+					if (swHiddenDataLocs.Value)
+						progressSteps1.Items.Add(siHiddenDataLocs);
+					if (swCkObsoleteROData.Value)
+						progressSteps1.Items.Add(siObsoleteROData);
+					splitContainer3.Panel2Collapsed = false;
+					progressSteps1.Visible = true;
+					progressSteps1.Refresh();
+					break;
+
 				case E_AdminToolType.Repair:
 					if (swRmOrphanDataRecs.Value)
 						progressSteps1.Items.Add(siOrphDatRecs);
@@ -1227,6 +1475,7 @@ namespace VEPROMS
 					break;
 
 				case E_AdminToolType.Links:
+				case E_AdminToolType.Users:
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
@@ -1283,6 +1532,7 @@ namespace VEPROMS
 		private void StepProgress(int prgStpIdx, int val)
 		{
 			((DevComponents.DotNetBar.StepItem)progressSteps1.Items[prgStpIdx]).Value = val;
+			return;
 		}
 
 		private void ClearStepProgress()
@@ -1345,6 +1595,42 @@ namespace VEPROMS
 				CheckROLinks(); // C2022-028 check for Bad RO Links
 		}
 
+		private void btnRunCheck_Click(object sender, EventArgs e)
+		{
+			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
+
+			int prgStpIdx = -1;
+			txtResults.Clear();
+			txtProcess.Clear();
+
+			if (swCkOrphanDataRecs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyDisconnectedItems(); // orphan items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swHiddenDataLocs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyNonEditableItems(); // hidden items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swCkObsoleteROData.Value)
+			{
+				StepProgress(++prgStpIdx, 25);
+				IdentifyROAssociations();
+				StepProgress(prgStpIdx, 50);
+				IdentifyUnusedRoFstsAndFigures();
+				StepProgress(prgStpIdx, 100);
+			}
+
+			MessageBox.Show("Check Functions Completed", "Check");
+
+			ClearStepProgress();
+		}
+
 		private void btnRunRepair_Click(object sender, EventArgs e)
 		{
 			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -1469,12 +1755,12 @@ namespace VEPROMS
 				if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg))
 				{
 					string msgp = string.Empty;
-					foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
+					foreach (ProcedureInfo pi in dq.Procedures)
 					{
 						if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp))
 						{
 							FolderInfo fi = (FolderInfo)dq.ActiveParent;
-							int itemID = fi.FolderID;
+							int itemID = (int)fi.FolderID;
 							string folderName = fi.Name;
 
 							if (swDeleteFolder.Value)
@@ -1567,7 +1853,7 @@ namespace VEPROMS
 			{
 				//Gather folder information			
 				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
-				int itemID = fi.FolderID;
+				int itemID = (int)fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1591,8 +1877,8 @@ namespace VEPROMS
 			foreach (var kvp in emptyFoldersToDelete)
 			{
 				//Gather folder information			
-				FolderInfo fi = kvp;
-				int itemID = fi.FolderID;
+				FolderInfo fi = (FolderInfo)kvp;
+				int itemID = (int)fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1643,8 +1929,9 @@ namespace VEPROMS
 
 				return true;
 			}
-			catch
+			catch (Exception ex)
 			{
+				string err = ex.ToString();
 				return false;
 			}
 		}

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -120,6 +120,196 @@
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
+    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
+
+Click on the on/off switches to turn on/off each tool.
+
+Note that only one of these tools can be run at a time.</value>
+  </data>
+  <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX12.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <data name="swRefreshTrans.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX11.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <data name="labelX6.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX3.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="labelX2.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX1.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
     <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
@@ -132,7 +322,6 @@ This function will remove all of the saved attachment PDFS stored in the databas
 This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
@@ -215,130 +404,6 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
     <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
 
 Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool removes any orphaned items from the database.
-</value>
-  </data>
-  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="labelX13.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="labelX14.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
-    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
-
-Click on the on/off switches to turn on/off each tool.
-
-Note that only one of these tools can be run at a time.</value>
-  </data>
-  <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="labelX12.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="swRefreshTrans.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="labelX11.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="labelX6.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

PROMS/VEPROMS User Interface/frmGenTools.cs

@@ -1,436 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using VEPROMS.CSLA.Library;
-using System.IO;
-using Volian.Controls.Library;
-using DevComponents.DotNetBar;
-using JR.Utils.GUI.Forms;
-using System.Linq;
-
-namespace VEPROMS
-{
-	public partial class frmGenTools : Form
-	{
-		private SessionInfo _MySessionInfo;
-		public SessionInfo MySessionInfo
-		{
-			get { return _MySessionInfo; }
-			set { _MySessionInfo = value; }
-		}
-
-		public frmGenTools(SessionInfo sessionInfo, frmVEPROMS veProms)
-		{
-			InitializeComponent();
-			_MySessionInfo = sessionInfo;
-
-			// When opening General tools Check tab will be default.
-			this.sideNavItmCheck.Checked = true;
-
-			setupProgessSteps1(); // C2017-030 - new Tools user interface
-
-		}
-
-		private void frmGenTools_Load(object sender, EventArgs e)
-		{
-			IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
-		}
-		private bool IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
-		private void frmGenTools_FormClosing(object sender, EventArgs e)
-		{
-			IsClosing = true;//B2017-221 Allow the batch dialog to close when waiting to process.
-		}
-
-		// C2017-030 - new Tools user interface
-		// tool renamed to Identify Orphan Items
-		private void IdentifyDisconnectedItems()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Orphan Items");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
-			txtProcess.AppendText(string.Format("Orphan Items Count:  {0}", rowCount));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCount > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} Orphan items.", rowCount));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("These can be removed via the Remove Orphan Data Records in the Repair tools");
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Orphan Records Found");// B2017-108 Always output results even if there isn't any 
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
-		// C2017-030 - new Tools user interface
-		// is one of two tools run from Check Obsolete RO Data
-		private void IdentifyUnusedRoFstsAndFigures()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
-			int rowCountFigures = ESP_GetUnusedFigures.Execute("vesp_GetUnusedFiguresCount");
-			txtProcess.AppendText(string.Format("Unused RoFsts Count:  {0}, Unused Figures Count:  {1}", rowCountRoFst, rowCountFigures));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCountRoFst > 0 || rowCountFigures > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} unused RoFsts.", rowCountRoFst));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(string.Format("The database contains {0} unused Figures items.", rowCountFigures));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Unused  RoFsts or Figures Found"); // B2017-108 Always output results even if there isn't any
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
-        // C2017-030 - new Tools user interface
-        // is one of two tools run from Check Obsolete RO Data
-        private void IdentifyROAssociations()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Unused RO Associations");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
-			txtProcess.AppendText(string.Format("Unused RO Associations Count:  {0}", rowCount));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCount > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
-		// C2017-030 - new Tools user interface
-		// tool was renamed to Hidden Data Locations (on Check list)
-		private void IdentifyNonEditableItems()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Hidden Item Locations");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
-			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
-			txtProcess.AppendText(Environment.NewLine);
-			if (myItems.Count > 0)
-			{
-				txtResults.AppendText("The following items are hidden (non-editable)...");
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-				foreach (ItemInfo ii in myItems)
-				{
-					txtResults.AppendText(ii.Path);
-					txtResults.AppendText(Environment.NewLine);
-				}
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Hidden Data Found");// B2017-108 Always output results even if there isn't any
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			//C2025-011 RO Update Tool Memory Enhancements 
-			//clear the list since no longer using it
-			myItems.Clear();
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
-		// C2017-030 - new Tools user interface
-		// tool was renamed to Show Users
-		private void GetDatabaseSessions()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Show Users in PROMS");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			txtResults.Clear();
-			txtResults.AppendText(ESP_GetDatabaseSessions.Execute("vesp_GetDatabaseSessions"));
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-			MessageBox.Show("Show Users Completed", "Show Users");
-		}
-
-        public List<string> roFstInfo_ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
-		{
-			return VlnFlexGrid.ROTableUpdate(sender, args);
-		}
-
-        private void btnClear_Click(object sender, EventArgs e)
-		{
-			txtResults.Clear();
-		}
-
-		private void btnSave_Click(object sender, EventArgs e)
-		{
-			SaveFileDialog sfd = new SaveFileDialog();
-			sfd.DefaultExt = "txt";
-			sfd.AddExtension = true;
-			sfd.Filter = "Text Files (*.txt)|*.txt";
-			sfd.FileName = string.Format("BatchRefreshResults_{0}", DateTime.Now.ToString("yyyyMMdd_HHmm"));
-			sfd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS";
-			DialogResult dr = sfd.ShowDialog();
-
-			if (dr == DialogResult.OK)
-			{
-				System.IO.StreamWriter sw = new System.IO.StreamWriter(sfd.FileName);
-				sw.Write(txtResults.Text);
-				sw.Close();
-			}
-		}
-
-		private ProgressBarItem _ProgressBar = null;
-
-		public ProgressBarItem ProgressBar
-		{
-			get { return _ProgressBar; }
-			set
-			{
-				_ProgressBar = value;
-				_ProgressBar.TextVisible = true;
-			}
-		}
-
-		private void chkLater_CheckedChanged(object sender, EventArgs e)
-		{
-			pnlLater.Enabled = chkLater.Checked;
-		}
-
-		// C2017-030 new Tools user interface
-		private void sideNavItmCheck_Click(object sender, EventArgs e)
-		{
-			GenToolType = E_GenToolType.Check;
-			lblAdmToolProgressType.Text = "Checking:";
-			setupProgessSteps1();
-		}
-
-		// C2017-030 new Tools user interface
-		private void sideNavItmUsers_Click(object sender, EventArgs e)
-		{
-			GenToolType = E_GenToolType.Users;
-			setupProgessSteps1();
-		}
-
-		// C2017-030 new Tools user interface
-		private void sideNavItmExit_Click(object sender, EventArgs e)
-		{
-			this.Close();
-		}
-
-		#region On/Off Swiches
-
-		// C2017-030 new Tools user interface
-		private enum E_GenToolType : int
-		{
-			Check = 0,
-			Users = 3
-		};
-		private E_GenToolType GenToolType = 0;
-
-		DevComponents.DotNetBar.StepItem siOrphDatRecs = new DevComponents.DotNetBar.StepItem("siOrphDatRecs", "Orphan Data Records");
-		DevComponents.DotNetBar.StepItem siHiddenDataLocs = new DevComponents.DotNetBar.StepItem("siHiddenDataLocs", "Hidden Data");
-		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
-
-		// this will update/rebuild the progress bar in the bottom panel of Tools
-		private void setupProgessSteps1()
-		{
-			progressSteps1.Visible = false;
-			progressSteps1.Items.Clear();
-
-			switch (GenToolType)
-			{
-				case E_GenToolType.Check:
-					if (swCkOrphanDataRecs.Value)
-						progressSteps1.Items.Add(siOrphDatRecs);
-					if (swHiddenDataLocs.Value)
-						progressSteps1.Items.Add(siHiddenDataLocs);
-					if (swCkObsoleteROData.Value)
-						progressSteps1.Items.Add(siObsoleteROData);
-					splitContainer3.Panel2Collapsed = false;
-					progressSteps1.Visible = true;
-					progressSteps1.Refresh();
-					break;
-
-				case E_GenToolType.Users:
-					splitContainer3.Panel2Collapsed = true;
-					progressSteps1.Visible = false;
-					break;
-			}
-		}
-
-		// used for all of the Switch buttons (ON/OFF buttons)
-		private void swCk_ValueChanged(object sender, EventArgs e)
-		{
-			setupProgessSteps1();
-		}
-
-		#endregion
-
-		// C2017-030 New Tools user interface
-		// functions to handle the progress bar in the bottom panel of Tools
-		private void StepProgress(int prgStpIdx, int val)
-		{
-			((DevComponents.DotNetBar.StepItem)progressSteps1.Items[prgStpIdx]).Value = val;
-		}
-
-		private void ClearStepProgress()
-		{
-			for (int i = 0; i < progressSteps1.Items.Count; i++)
-			{
-				((DevComponents.DotNetBar.StepItem)progressSteps1.Items[i]).Value = 0;
-			}
-		}
-
-		// C2017-030 New Tools user interface
-		// button clicks for processing selected tools
-		//B2017-221 Allow the batch dialog to close when waiting to process.
-		private bool CheckProcessLater()  // see if we should delay processing until later
-		{
-			if (chkLater.Checked)
-			{
-				long later = long.Parse(dtpDate.Value.ToString("yyyyMMdd") + dtpTime.Value.ToString("HHmm"));
-				long now = long.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
-
-				while (now < later)
-				{
-					txtProcess.Clear();
-					txtProcess.AppendText("Waiting...");
-					System.Threading.Thread.Sleep(1000);//Check each second
-					if (IsClosing) return false;//B2017-221 Allow the batch dialog to close when waiting to process.
-					Application.DoEvents();// Allow user interface to react
-					now = long.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
-				}
-			}
-
-			return true;// Close after complete
-		}
-
-		// C2017-030 new Tools user interface
-		private void btn_ShowUsers_Click(object sender, EventArgs e)
-		{
-			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
-
-			txtProcess.Clear();
-			txtResults.Clear();
-
-			GetDatabaseSessions();
-		}
-
-		private void btnRunCheck_Click(object sender, EventArgs e)
-		{
-			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
-
-			int prgStpIdx = -1;
-			txtResults.Clear();
-			txtProcess.Clear();
-
-			if (swCkOrphanDataRecs.Value)
-			{
-				StepProgress(++prgStpIdx, 50);
-				IdentifyDisconnectedItems(); // orphan items
-				StepProgress(prgStpIdx, 100);
-			}
-
-			if (swHiddenDataLocs.Value)
-			{
-				StepProgress(++prgStpIdx, 50);
-				IdentifyNonEditableItems(); // hidden items
-				StepProgress(prgStpIdx, 100);
-			}
-
-			if (swCkObsoleteROData.Value)
-			{
-				StepProgress(++prgStpIdx, 25);
-				IdentifyROAssociations();
-				StepProgress(prgStpIdx, 50);
-				IdentifyUnusedRoFstsAndFigures();
-				StepProgress(prgStpIdx, 100);
-			}
-
-			MessageBox.Show("Check Functions Completed", "Check");
-
-			ClearStepProgress();
-		}
-		
-		//C2025-011 RO Update Tool Memory Enhancements
-		private void txtProcess_TextChanged(object sender, EventArgs e)
-        {
-			//clears the stack to help with memory - should never need to undo text changes to this.
-			txtProcess.ClearUndo();
-		}
-
-        private void txtResults_TextChanged(object sender, EventArgs e)
-        {
-			//clears the stack to help with memory - should never need to undo text changes to this.
-			txtResults.ClearUndo();
-		}
-    }
-}
-
-
-
-

PROMS/VEPROMS User Interface/frmGenTools.designer.cs

@@ -1,853 +0,0 @@
-namespace VEPROMS
-{
-	partial class frmGenTools
-    {
-		/// <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()
-		{
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmGenTools));
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-            this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
-            this.txtResults = new System.Windows.Forms.TextBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnSave = new System.Windows.Forms.Button();
-            this.btnClear = new System.Windows.Forms.Button();
-            this.label3 = new System.Windows.Forms.Label();
-            this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter();
-            this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
-            this.txtProcess = new System.Windows.Forms.TextBox();
-            this.pbProcess = new System.Windows.Forms.ProgressBar();
-            this.label6 = new System.Windows.Forms.Label();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.pnlLater = new System.Windows.Forms.Panel();
-            this.label5 = new System.Windows.Forms.Label();
-            this.dtpTime = new System.Windows.Forms.DateTimePicker();
-            this.dtpDate = new System.Windows.Forms.DateTimePicker();
-            this.chkLater = new System.Windows.Forms.CheckBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
-            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
-            this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav();
-            this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
-            this.labelX7 = new DevComponents.DotNetBar.LabelX();
-            this.line1 = new DevComponents.DotNetBar.Controls.Line();
-            this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX3 = new DevComponents.DotNetBar.LabelX();
-            this.labelX2 = new DevComponents.DotNetBar.LabelX();
-            this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
-            this.sideNavPanel5 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-            this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
-            this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.separator1 = new DevComponents.DotNetBar.Separator();
-            this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
-            this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps();
-            this.stepItem1 = new DevComponents.DotNetBar.StepItem();
-            this.stepItem2 = new DevComponents.DotNetBar.StepItem();
-            this.stepItem3 = new DevComponents.DotNetBar.StepItem();
-            this.stepItem4 = new DevComponents.DotNetBar.StepItem();
-            this.lblAdmToolProgressType = new DevComponents.DotNetBar.LabelX();
-            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
-            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
-            this.splitContainer3.Panel1.SuspendLayout();
-            this.splitContainer3.Panel2.SuspendLayout();
-            this.splitContainer3.SuspendLayout();
-            this.panelEx3.SuspendLayout();
-            this.panel1.SuspendLayout();
-            this.panelEx2.SuspendLayout();
-            this.panel3.SuspendLayout();
-            this.pnlLater.SuspendLayout();
-            this.panelEx1.SuspendLayout();
-            this.sideNav1.SuspendLayout();
-            this.sideNavPanel1.SuspendLayout();
-            this.sideNavPanel5.SuspendLayout();
-            this.panelEx4.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Name = "splitContainer3";
-            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.panelEx3);
-            this.splitContainer3.Panel1.Controls.Add(this.expandableSplitter2);
-            this.splitContainer3.Panel1.Controls.Add(this.panelEx2);
-            this.splitContainer3.Panel1.Controls.Add(this.expandableSplitter1);
-            this.splitContainer3.Panel1.Controls.Add(this.panelEx1);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control;
-            this.splitContainer3.Panel2.Controls.Add(this.panelEx4);
-            this.splitContainer3.Size = new System.Drawing.Size(1177, 586);
-            this.splitContainer3.SplitterDistance = 525;
-            this.splitContainer3.TabIndex = 2;
-            // 
-            // panelEx3
-            // 
-            this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx3.Controls.Add(this.txtResults);
-            this.panelEx3.Controls.Add(this.panel1);
-            this.panelEx3.Controls.Add(this.label3);
-            this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelEx3.Location = new System.Drawing.Point(688, 0);
-            this.panelEx3.Name = "panelEx3";
-            this.panelEx3.Size = new System.Drawing.Size(489, 525);
-            this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelEx3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx3.Style.GradientAngle = 90;
-            this.panelEx3.TabIndex = 31;
-            this.panelEx3.Text = "panelEx3";
-            // 
-            // txtResults
-            // 
-            this.txtResults.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtResults.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtResults.Location = new System.Drawing.Point(0, 52);
-            this.txtResults.Multiline = true;
-            this.txtResults.Name = "txtResults";
-            this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtResults.Size = new System.Drawing.Size(489, 473);
-            this.txtResults.TabIndex = 4;
-            this.txtResults.TextChanged += new System.EventHandler(this.txtResults_TextChanged);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.btnSave);
-            this.panel1.Controls.Add(this.btnClear);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 23);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(489, 29);
-            this.panel1.TabIndex = 3;
-            // 
-            // btnSave
-            // 
-            this.btnSave.Dock = System.Windows.Forms.DockStyle.Left;
-            this.btnSave.Location = new System.Drawing.Point(95, 0);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(95, 29);
-            this.btnSave.TabIndex = 3;
-            this.btnSave.Text = "Save Results";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-            // 
-            // btnClear
-            // 
-            this.btnClear.Dock = System.Windows.Forms.DockStyle.Left;
-            this.btnClear.Location = new System.Drawing.Point(0, 0);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(95, 29);
-            this.btnClear.TabIndex = 2;
-            this.btnClear.Text = "Clear Results";
-            this.btnClear.UseVisualStyleBackColor = true;
-            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
-            // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.SystemColors.ActiveCaption;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label3.Location = new System.Drawing.Point(0, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(489, 23);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "Results";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // expandableSplitter2
-            // 
-            this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter2.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter2.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.expandableSplitter2.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter2.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
-            this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
-            this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
-            this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
-            this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter2.Location = new System.Drawing.Point(682, 0);
-            this.expandableSplitter2.Name = "expandableSplitter2";
-            this.expandableSplitter2.Size = new System.Drawing.Size(6, 525);
-            this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
-            this.expandableSplitter2.TabIndex = 38;
-            this.expandableSplitter2.TabStop = false;
-            // 
-            // panelEx2
-            // 
-            this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx2.Controls.Add(this.txtProcess);
-            this.panelEx2.Controls.Add(this.pbProcess);
-            this.panelEx2.Controls.Add(this.label6);
-            this.panelEx2.Controls.Add(this.panel3);
-            this.panelEx2.Controls.Add(this.label4);
-            this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panelEx2.Location = new System.Drawing.Point(391, 0);
-            this.panelEx2.Name = "panelEx2";
-            this.panelEx2.Size = new System.Drawing.Size(291, 525);
-            this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelEx2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx2.Style.GradientAngle = 90;
-            this.panelEx2.TabIndex = 22;
-            this.panelEx2.Text = "panelEx2";
-            // 
-            // txtProcess
-            // 
-            this.txtProcess.AcceptsReturn = true;
-            this.txtProcess.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtProcess.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtProcess.Location = new System.Drawing.Point(0, 150);
-            this.txtProcess.Multiline = true;
-            this.txtProcess.Name = "txtProcess";
-            this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtProcess.Size = new System.Drawing.Size(291, 375);
-            this.txtProcess.TabIndex = 5;
-            this.txtProcess.TextChanged += new System.EventHandler(this.txtProcess_TextChanged);
-            // 
-            // pbProcess
-            // 
-            this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pbProcess.Location = new System.Drawing.Point(0, 125);
-            this.pbProcess.Name = "pbProcess";
-            this.pbProcess.Size = new System.Drawing.Size(291, 25);
-            this.pbProcess.TabIndex = 6;
-            // 
-            // label6
-            // 
-            this.label6.BackColor = System.Drawing.SystemColors.ActiveCaption;
-            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label6.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label6.Location = new System.Drawing.Point(0, 102);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(291, 23);
-            this.label6.TabIndex = 3;
-            this.label6.Text = "Process Status";
-            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // panel3
-            // 
-            this.panel3.Controls.Add(this.pnlLater);
-            this.panel3.Controls.Add(this.chkLater);
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel3.Location = new System.Drawing.Point(0, 23);
-            this.panel3.Name = "panel3";
-            this.panel3.Padding = new System.Windows.Forms.Padding(6);
-            this.panel3.Size = new System.Drawing.Size(291, 79);
-            this.panel3.TabIndex = 2;
-            // 
-            // pnlLater
-            // 
-            this.pnlLater.Controls.Add(this.label5);
-            this.pnlLater.Controls.Add(this.dtpTime);
-            this.pnlLater.Controls.Add(this.dtpDate);
-            this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlLater.Enabled = false;
-            this.pnlLater.Location = new System.Drawing.Point(6, 23);
-            this.pnlLater.Name = "pnlLater";
-            this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
-            this.pnlLater.Size = new System.Drawing.Size(279, 37);
-            this.pnlLater.TabIndex = 3;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(105, 15);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(18, 13);
-            this.label5.TabIndex = 5;
-            this.label5.Text = "@";
-            // 
-            // dtpTime
-            // 
-            this.dtpTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtpTime.CustomFormat = "HH:mm";
-            this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpTime.Location = new System.Drawing.Point(129, 9);
-            this.dtpTime.Name = "dtpTime";
-            this.dtpTime.ShowUpDown = true;
-            this.dtpTime.Size = new System.Drawing.Size(133, 20);
-            this.dtpTime.TabIndex = 4;
-            // 
-            // dtpDate
-            // 
-            this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpDate.Location = new System.Drawing.Point(9, 9);
-            this.dtpDate.Name = "dtpDate";
-            this.dtpDate.Size = new System.Drawing.Size(90, 20);
-            this.dtpDate.TabIndex = 3;
-            // 
-            // chkLater
-            // 
-            this.chkLater.AutoSize = true;
-            this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
-            this.chkLater.Location = new System.Drawing.Point(6, 6);
-            this.chkLater.Name = "chkLater";
-            this.chkLater.Size = new System.Drawing.Size(279, 17);
-            this.chkLater.TabIndex = 4;
-            this.chkLater.Text = "Process Later";
-            this.chkLater.UseVisualStyleBackColor = true;
-            this.chkLater.CheckedChanged += new System.EventHandler(this.chkLater_CheckedChanged);
-            // 
-            // label4
-            // 
-            this.label4.BackColor = System.Drawing.SystemColors.ActiveCaption;
-            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label4.Location = new System.Drawing.Point(0, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(291, 23);
-            this.label4.TabIndex = 3;
-            this.label4.Text = "Process";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // expandableSplitter1
-            // 
-            this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
-            this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
-            this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
-            this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
-            this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
-            this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
-            this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.expandableSplitter1.Location = new System.Drawing.Point(385, 0);
-            this.expandableSplitter1.Name = "expandableSplitter1";
-            this.expandableSplitter1.Size = new System.Drawing.Size(6, 525);
-            this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
-            this.expandableSplitter1.TabIndex = 4;
-            this.expandableSplitter1.TabStop = false;
-            // 
-            // panelEx1
-            // 
-            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx1.Controls.Add(this.sideNav1);
-            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panelEx1.Location = new System.Drawing.Point(0, 0);
-            this.panelEx1.Name = "panelEx1";
-            this.panelEx1.Size = new System.Drawing.Size(385, 525);
-            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx1.Style.GradientAngle = 90;
-            this.panelEx1.TabIndex = 0;
-            this.panelEx1.Text = "panelEx1";
-            // 
-            // sideNav1
-            // 
-            this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
-            this.sideNav1.Controls.Add(this.sideNavPanel1);
-            this.sideNav1.Controls.Add(this.sideNavPanel5);
-            this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNav1.EnableClose = false;
-            this.sideNav1.EnableMaximize = false;
-            this.sideNav1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.sideNavItem1,
-            this.separator1,
-            this.sideNavItmCheck,
-            this.sideNavItmUsers,
-            this.sideNavItmExit});
-            this.sideNav1.Location = new System.Drawing.Point(0, 0);
-            this.sideNav1.Name = "sideNav1";
-            this.sideNav1.Padding = new System.Windows.Forms.Padding(1);
-            this.sideNav1.Size = new System.Drawing.Size(385, 525);
-            this.sideNav1.TabIndex = 3;
-            this.sideNav1.Text = "sideNav1";
-            // 
-            // sideNavPanel1
-            // 
-            this.sideNavPanel1.Controls.Add(this.warningBox3);
-            this.sideNavPanel1.Controls.Add(this.labelX7);
-            this.sideNavPanel1.Controls.Add(this.line1);
-            this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
-            this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
-            this.sideNavPanel1.Controls.Add(this.labelX3);
-            this.sideNavPanel1.Controls.Add(this.labelX2);
-            this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
-            this.sideNavPanel1.Controls.Add(this.labelX1);
-            this.sideNavPanel1.Controls.Add(this.btnRunCheck);
-            this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel1.Location = new System.Drawing.Point(88, 31);
-            this.sideNavPanel1.Name = "sideNavPanel1";
-            this.sideNavPanel1.Size = new System.Drawing.Size(292, 493);
-            this.sideNavPanel1.TabIndex = 2;
-            // 
-            // warningBox3
-            // 
-            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-            this.warningBox3.CloseButtonVisible = false;
-            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-            this.warningBox3.Location = new System.Drawing.Point(17, 207);
-            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
-            this.warningBox3.Name = "warningBox3";
-            this.warningBox3.OptionsButtonVisible = false;
-            this.warningBox3.Size = new System.Drawing.Size(264, 32);
-            this.warningBox3.TabIndex = 29;
-            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
-            // 
-            // labelX7
-            // 
-            this.labelX7.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX7.Location = new System.Drawing.Point(5, 3);
-            this.labelX7.Name = "labelX7";
-            this.labelX7.Size = new System.Drawing.Size(251, 22);
-            this.labelX7.TabIndex = 19;
-            this.labelX7.Text = "Check for these Data Issues:";
-            // 
-            // line1
-            // 
-            this.line1.BackColor = System.Drawing.Color.Transparent;
-            this.line1.Location = new System.Drawing.Point(8, 179);
-            this.line1.Name = "line1";
-            this.line1.Size = new System.Drawing.Size(285, 12);
-            this.line1.TabIndex = 18;
-            this.line1.Text = "line1";
-            // 
-            // swCkObsoleteROData
-            // 
-            // 
-            // 
-            // 
-            this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
-            this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
-            this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-            this.swCkObsoleteROData.SwitchClickTogglesValue = true;
-            this.swCkObsoleteROData.TabIndex = 14;
-            this.swCkObsoleteROData.Value = true;
-            this.swCkObsoleteROData.ValueObject = "Y";
-            this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // swHiddenDataLocs
-            // 
-            // 
-            // 
-            // 
-            this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
-            this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
-            this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.swHiddenDataLocs.SwitchClickTogglesValue = true;
-            this.swHiddenDataLocs.TabIndex = 15;
-            this.swHiddenDataLocs.Value = true;
-            this.swHiddenDataLocs.ValueObject = "Y";
-            this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX3
-            // 
-            this.labelX3.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX3.Location = new System.Drawing.Point(107, 99);
-            this.labelX3.Name = "labelX3";
-            this.labelX3.Size = new System.Drawing.Size(154, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-            this.labelX3.TabIndex = 11;
-            this.labelX3.Text = "Obsolete RO Data";
-            // 
-            // labelX2
-            // 
-            this.labelX2.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX2.Location = new System.Drawing.Point(107, 71);
-            this.labelX2.Name = "labelX2";
-            this.labelX2.Size = new System.Drawing.Size(140, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.labelX2.TabIndex = 12;
-            this.labelX2.Text = "Hidden Data Locations";
-            // 
-            // swCkOrphanDataRecs
-            // 
-            // 
-            // 
-            // 
-            this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
-            this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
-            this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
-            this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
-            this.swCkOrphanDataRecs.TabIndex = 9;
-            this.swCkOrphanDataRecs.Value = true;
-            this.swCkOrphanDataRecs.ValueObject = "Y";
-            this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX1
-            // 
-            this.labelX1.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(107, 43);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(172, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
-            this.labelX1.TabIndex = 8;
-            this.labelX1.Text = "Orphan Data Records";
-            // 
-            // btnRunCheck
-            // 
-            this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnRunCheck.Checked = true;
-            this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
-            this.btnRunCheck.Name = "btnRunCheck";
-            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
-            this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
-            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
-            this.btnRunCheck.TabIndex = 7;
-            this.btnRunCheck.Text = "Run Check";
-            this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
-            // 
-            // sideNavPanel5
-            // 
-            this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
-            this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel5.Location = new System.Drawing.Point(88, 31);
-            this.sideNavPanel5.Name = "sideNavPanel5";
-            this.sideNavPanel5.Size = new System.Drawing.Size(292, 493);
-            this.sideNavPanel5.TabIndex = 14;
-            this.sideNavPanel5.Visible = false;
-            // 
-            // btn_ShowUsers
-            // 
-            this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btn_ShowUsers.Checked = true;
-            this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
-            this.btn_ShowUsers.Name = "btn_ShowUsers";
-            this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
-            this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
-            "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
-            this.btn_ShowUsers.TabIndex = 0;
-            this.btn_ShowUsers.Text = "Show Users";
-            this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
-            // 
-            // sideNavItem1
-            // 
-            this.sideNavItem1.IsSystemMenu = true;
-            this.sideNavItem1.Name = "sideNavItem1";
-            this.sideNavItem1.Symbol = "";
-            this.sideNavItem1.Text = "General\r\nTools";
-            // 
-            // separator1
-            // 
-            this.separator1.FixedSize = new System.Drawing.Size(3, 1);
-            this.separator1.Name = "separator1";
-            this.separator1.Padding.Bottom = 2;
-            this.separator1.Padding.Left = 6;
-            this.separator1.Padding.Right = 6;
-            this.separator1.Padding.Top = 2;
-            this.separator1.SeparatorOrientation = DevComponents.DotNetBar.eDesignMarkerOrientation.Vertical;
-            // 
-            // sideNavItmCheck
-            // 
-            this.sideNavItmCheck.Checked = true;
-            this.sideNavItmCheck.Name = "sideNavItmCheck";
-            this.sideNavItmCheck.Panel = this.sideNavPanel1;
-            this.sideNavItmCheck.Symbol = "";
-            this.sideNavItmCheck.Text = "Check";
-            this.sideNavItmCheck.Click += new System.EventHandler(this.sideNavItmCheck_Click);
-            // 
-            // sideNavItmUsers
-            // 
-            this.sideNavItmUsers.Name = "sideNavItmUsers";
-            this.sideNavItmUsers.Panel = this.sideNavPanel5;
-            this.sideNavItmUsers.Symbol = "";
-            this.sideNavItmUsers.Text = "Users";
-            this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
-            // 
-            // sideNavItmExit
-            // 
-            this.sideNavItmExit.Name = "sideNavItmExit";
-            this.sideNavItmExit.Symbol = "";
-            this.sideNavItmExit.Text = "Exit";
-            this.sideNavItmExit.Click += new System.EventHandler(this.sideNavItmExit_Click);
-            // 
-            // panelEx4
-            // 
-            this.panelEx4.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx4.Controls.Add(this.progressSteps1);
-            this.panelEx4.Controls.Add(this.lblAdmToolProgressType);
-            this.panelEx4.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelEx4.Location = new System.Drawing.Point(0, 0);
-            this.panelEx4.Name = "panelEx4";
-            this.panelEx4.Size = new System.Drawing.Size(1177, 57);
-            this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.panelEx4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx4.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.panelEx4.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx4.Style.GradientAngle = 90;
-            this.panelEx4.TabIndex = 20;
-            // 
-            // progressSteps1
-            // 
-            this.progressSteps1.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.progressSteps1.BackgroundStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
-            this.progressSteps1.BackgroundStyle.Class = "ProgressSteps";
-            this.progressSteps1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.progressSteps1.ContainerControlProcessDialogKey = true;
-            this.progressSteps1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.progressSteps1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.stepItem1,
-            this.stepItem2,
-            this.stepItem3,
-            this.stepItem4});
-            this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-            this.progressSteps1.Location = new System.Drawing.Point(123, 18);
-            this.progressSteps1.Name = "progressSteps1";
-            this.progressSteps1.Size = new System.Drawing.Size(1032, 26);
-            this.progressSteps1.TabIndex = 18;
-            // 
-            // stepItem1
-            // 
-            this.stepItem1.Maximum = 10;
-            this.stepItem1.Name = "stepItem1";
-            this.stepItem1.SymbolSize = 13F;
-            this.stepItem1.Text = "Discon";
-            // 
-            // stepItem2
-            // 
-            this.stepItem2.Maximum = 10;
-            this.stepItem2.Name = "stepItem2";
-            this.stepItem2.SymbolSize = 13F;
-            this.stepItem2.Text = "Non-Edit";
-            // 
-            // stepItem3
-            // 
-            this.stepItem3.Maximum = 10;
-            this.stepItem3.Name = "stepItem3";
-            this.stepItem3.SymbolSize = 13F;
-            this.stepItem3.Text = "RO Assoc";
-            // 
-            // stepItem4
-            // 
-            this.stepItem4.Maximum = 10;
-            this.stepItem4.Name = "stepItem4";
-            this.stepItem4.SymbolSize = 13F;
-            this.stepItem4.Text = "FST+Figs";
-            // 
-            // lblAdmToolProgressType
-            // 
-            this.lblAdmToolProgressType.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.lblAdmToolProgressType.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lblAdmToolProgressType.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblAdmToolProgressType.Location = new System.Drawing.Point(19, 10);
-            this.lblAdmToolProgressType.Name = "lblAdmToolProgressType";
-            this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34);
-            this.lblAdmToolProgressType.TabIndex = 19;
-            this.lblAdmToolProgressType.Text = "Checking:";
-            // 
-            // buttonItem1
-            // 
-            this.buttonItem1.Name = "buttonItem1";
-            this.buttonItem1.Text = "buttonItem1";
-            // 
-            // superTooltip1
-            // 
-            this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-            // 
-            // frmGenTools
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1177, 586);
-            this.Controls.Add(this.splitContainer3);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "frmGenTools";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "General Tools";
-            this.Load += new System.EventHandler(this.frmGenTools_Load);
-            this.splitContainer3.Panel1.ResumeLayout(false);
-            this.splitContainer3.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
-            this.splitContainer3.ResumeLayout(false);
-            this.panelEx3.ResumeLayout(false);
-            this.panelEx3.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panelEx2.ResumeLayout(false);
-            this.panelEx2.PerformLayout();
-            this.panel3.ResumeLayout(false);
-            this.panel3.PerformLayout();
-            this.pnlLater.ResumeLayout(false);
-            this.pnlLater.PerformLayout();
-            this.panelEx1.ResumeLayout(false);
-            this.sideNav1.ResumeLayout(false);
-            this.sideNav1.PerformLayout();
-            this.sideNavPanel1.ResumeLayout(false);
-            this.sideNavPanel5.ResumeLayout(false);
-            this.panelEx4.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-		}
-
-		#endregion
-		private System.Windows.Forms.SplitContainer splitContainer3;
-		private DevComponents.DotNetBar.PanelEx panelEx3;
-		private System.Windows.Forms.TextBox txtResults;
-		private System.Windows.Forms.Panel panel1;
-		private System.Windows.Forms.Button btnSave;
-		private System.Windows.Forms.Button btnClear;
-		private System.Windows.Forms.Label label3;
-		private DevComponents.DotNetBar.PanelEx panelEx2;
-		private System.Windows.Forms.TextBox txtProcess;
-		private System.Windows.Forms.ProgressBar pbProcess;
-		private System.Windows.Forms.Label label6;
-		private System.Windows.Forms.Panel panel3;
-		private System.Windows.Forms.Panel pnlLater;
-		private System.Windows.Forms.Label label5;
-		private System.Windows.Forms.DateTimePicker dtpTime;
-		private System.Windows.Forms.DateTimePicker dtpDate;
-		private System.Windows.Forms.CheckBox chkLater;
-		private System.Windows.Forms.Label label4;
-		private DevComponents.DotNetBar.Controls.SideNav sideNav1;
-		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel1;
-		private DevComponents.DotNetBar.LabelX labelX7;
-		private DevComponents.DotNetBar.Controls.Line line1;
-		private DevComponents.DotNetBar.Controls.SwitchButton swCkObsoleteROData;
-		private DevComponents.DotNetBar.Controls.SwitchButton swHiddenDataLocs;
-		private DevComponents.DotNetBar.LabelX labelX3;
-		private DevComponents.DotNetBar.LabelX labelX2;
-		private DevComponents.DotNetBar.Controls.SwitchButton swCkOrphanDataRecs;
-		private DevComponents.DotNetBar.LabelX labelX1;
-		private DevComponents.DotNetBar.ButtonX btnRunCheck;
-		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
-		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
-		private DevComponents.DotNetBar.Separator separator1;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmCheck;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmUsers;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
-		private DevComponents.DotNetBar.LabelX lblAdmToolProgressType;
-		private DevComponents.DotNetBar.ProgressSteps progressSteps1;
-		private DevComponents.DotNetBar.StepItem stepItem1;
-		private DevComponents.DotNetBar.StepItem stepItem2;
-		private DevComponents.DotNetBar.StepItem stepItem3;
-		private DevComponents.DotNetBar.StepItem stepItem4;
-		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
-		private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter2;
-		private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1;
-		private DevComponents.DotNetBar.PanelEx panelEx1;
-		private DevComponents.DotNetBar.PanelEx panelEx4;
-		private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
-		private DevComponents.DotNetBar.ButtonItem buttonItem1;
-	}
-}
-
-

PROMS/VEPROMS User Interface/frmGenTools.resx

@@ -1,192 +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>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
-
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
-</value>
-  </data>
-  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
-
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
-
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="labelX3.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
-
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
-</value>
-  </data>
-  <data name="labelX2.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
-
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
-
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>46</value>
-  </metadata>
-</root>

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
-                    using (dlgMSWordMessage msg = new dlgMSWordMessage("Continuous Action"))
-                    {
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
+					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.";
+					MessageBox.Show(instructions, "Continuous Action Summary");
 
 					// 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
-					using (dlgMSWordMessage msg = new dlgMSWordMessage("Time Critical Action"))
-					{
-						if (msg.ShouldDisplay()) msg.ShowDialog();
-					}
+					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.";
+					MessageBox.Show(instructions, "Time Critical Action Summary");
 
 					// 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.btnShortCuts,
-            this.btnHelpVWeb,
-            this.btnSendErrorLog,
-            this.btnShowErrFld,
-            this.btnShowPrtFld,
-            this.btnHelpAbout});
+			this.btnHelpManual,
+			this.btnShortCuts,
+			this.btnHelpVWeb,
+			this.btnSendErrorLog,
+			this.btnShowErrFld,
+			this.btnShowPrtFld,
+			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 " +
-    "Microsoft Sans Serif;}}\r\n{\\*\\generator Riched20 10.0.26100}\\viewkind4\\uc1 \r\n\\par" +
-    "d\\f0\\fs20\\par\r\n}\r\n";
+			this.ctrlAnnotationDetails.AnnotationRTFText = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\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)
-					//form for exporting Electronic Procedures from FolderInfo
-					if (args.AnnotationTypeId > 0)
+					MySessionInfo.CheckInItem(ownerid);
+
+					if (args.Index == 1 && dlg.MyNewFolder != null)
 					{
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", fi, this, args.AnnotationTypeId, args.UnitIndex);
-						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);
-						}
+						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)
-					//form for exporting Electronic Procedures from DocVersionInfo
-					if (args.AnnotationTypeId > 0)
-					{
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", dvi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.MyNewProcedure = null;
-						dlg.ExternalTransitionItem = null;
-						dlg.ShowDialog(this);
+					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);
+					MySessionInfo.CheckInItem(ownerid);
 
-						if (dlg.MyNewProcedure != null)
-							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.MyNewProcedure != null)
+						tv.AddNewNode(dlg.MyNewProcedure);
 
+					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)
-					//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);
-					}
+					MySessionInfo.CheckInItem(ownerid);
 				}
 			}
 		}
@@ -1245,7 +1192,6 @@ namespace VEPROMS
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
-					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-041
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -1267,19 +1213,7 @@ namespace VEPROMS
 
 		}
 
-		//Print Section
-		//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)
+		void tv_PrintSection(object sender, vlnTreeEventArgs args)  // Quick Print right click menu on Procedure name.
 		{
 			try
 			{
@@ -1291,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))
 				{
@@ -1301,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;
 				}
 			}
@@ -1349,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;
@@ -1540,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;
@@ -1586,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;
 
@@ -1603,7 +1520,6 @@ namespace VEPROMS
 			{
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
-					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs C2025-048.
 					prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -2013,7 +1929,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormats;
 		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport;
 		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport;
-		private DevComponents.DotNetBar.ButtonItem btnGeneralTools;
 		private TabItemsToClose _MyCloseTabList = new TabItemsToClose();
 		
 		public TabItemsToClose MyCloseTabList
@@ -2252,25 +2167,14 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
-			//general Tools
-			btnGeneralTools = new ButtonItem("btnGeneralTools", "General Tools");
-			btnGeneralTools.Visible = btnGeneralTools.Enabled = true;
-			btnGeneralTools.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
-			btnGeneralTools.CanCustomize = false;
-			btnGeneralTools.Image = global::VEPROMS.Properties.Resources.toolbox;
-			btnGeneralTools.Click += new EventHandler(btnGeneralTools_Click);
-			itemContainer3.SubItems.Add(btnGeneralTools);
-
-
-			// C2025-031 added tool tip messages
-			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
-			// remove commented out line below when User Control of Formats code is deleted
-			//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(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", 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(btnGeneralTools, new SuperTooltipInfo("General Tools", "", "Open the PROMS General Tools Window", null, null, eTooltipColor.Gray));
-
+			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
+			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
+			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(btnResetSecurity, new SuperTooltipInfo("Reset Security", null, null, 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", null, null, null, null, eTooltipColor.Gray));
+			
 			try
 			{
 				MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID);
@@ -2292,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
@@ -2966,13 +2867,6 @@ namespace VEPROMS
 			frm.ShowDialog(this);
 		}
 
-		void btnGeneralTools_Click(object sender, EventArgs e)
-		{
-			frmGenTools frm = new frmGenTools(MySessionInfo, this);
-			frm.ProgressBar = bottomProgBar;
-			frm.ShowDialog(this);
-		}
-
 		private static VolianTimer _TimeActivity1 = new VolianTimer("frmVEPROMS.cs tmrCloseTabItems_Tick", 2108);
 
 		void tmrCloseTabItems_Tick(object sender, EventArgs e)
@@ -3683,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);
 		}
@@ -4410,11 +4300,7 @@ namespace VEPROMS
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
 			_LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null;
-			if (_LastStepRTB != null)
-			{
-				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
-				_LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
-			}
+			if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);
 			lblEditView.Text = "    ";
 
 			if (args == null)
@@ -4549,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
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
-        dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+        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
-        EwAACxMBAJqcGAAAADRJREFUOE9jYKAUfGoS/I8Nf2wU6EBXixWgayTZEHRN6JigIf+X6f2nBI8aMGoA
-        dQwYcAAA71z+QkP4emIAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+        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/Config/ROFSTLookup.cs

@@ -839,7 +839,7 @@ namespace VEPROMS.CSLA.Library
 				{
 					using (SqlCommand cmd = cn.CreateCommand())
 					{
-						cmd.CommandTimeout = 0;
+						cmd.CommandTimeout = Database.DefaultTimeout;
 						cmd.CommandType = CommandType.StoredProcedure;
 						cmd.CommandText = "vesp_RofstHeaderFinalizeLoad";
 

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

@@ -346,21 +346,21 @@ namespace VEPROMS.CSLA.Library
 			{
 				var ii = _CacheByPrimaryKey.FirstOrDefault();
 
-				while (ii.Value.Count > 0)
-				{
-					if (ii.Value[0]?.MyContent?.ContentParts != null)
-					{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
-					ii.Value[0].Dispose();
-				}
+					while (ii.Value.Count > 0)
+					{
+						if (ii.Value[0]?.MyContent?.ContentParts != null)
+							{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
+						ii.Value[0].Dispose();
+					}
 				_CacheByPrimaryKey.Remove(ii.Key);
 			}
 
 			while (_CacheList.Count > 0)
-			{
-				if (_CacheList[0]?.MyContent?.ContentParts != null)
-					{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.Dispose(); }
-				_CacheList[0].Dispose();
-			}
+				{
+					if (_CacheList[0]?.MyContent?.ContentParts != null)
+						{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.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))
-				{
-					string thisTab = stpinfo.MyTab.CleanText;
+            {
+                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
+                {
+                    string thisTab = stpinfo.MyTab.CleanText;
 
-					string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
+                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
 
-					if (!string.IsNullOrEmpty(thisTab))
-					{
-						thisTab = thisTab.Trim();
-					}
+                    if (!string.IsNullOrEmpty(thisTab))
+                    {
+                        thisTab = thisTab.Trim();
+                    }
 
-					// if the tab is null 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"
-					// then reset the tab an empty string so that the type name along with the count of that type 
-					// (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")))))
-					{
-						thisTab = string.Empty;
-					}
+                    // if the tab is null 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"
+                    // then reset the tab an empty string so that the type name along with the count of that type 
+                    // (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")))))
+                    {
+                        thisTab = string.Empty;
+                    }
 
-					if (pitem.IsRNOPart)
-					{
-						if (string.IsNullOrEmpty(thisTab))
-						{
-							sret.Insert(0, "RNO.");
-						}
-						else
-						{
-							thisTab = thisTab.Trim();
+                    if (pitem.IsRNOPart)
+                    {
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Insert(0, "RNO.");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim();
 
-							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-							{
-								thisTab += ".";
-							}
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
 
-							sret.Insert(0, "RNO." + thisTab);
-						}
-					}
-					else if (pitem.IsCaution || pitem.IsNote)
-					{
-						// add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
-						if (string.IsNullOrEmpty(thisTab))
-						{
-							sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
-						}
-						else
-						{
-							thisTab = thisTab.Trim(" ".ToCharArray());
-							sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
-						}
-					}
-					else
-					{
-						if (!string.IsNullOrEmpty(thisTab))
-						{
-							thisTab = thisTab.Trim(" ".ToCharArray());
+                            sret.Insert(0, "RNO." + thisTab);
+                        }
+                    }
+                    else if (pitem.IsCaution || pitem.IsNote)
+                    {
+                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
+                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
+                        }
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(thisTab))
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
 
-							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-							{
-								thisTab += ".";
-							}
-						}
-						else
-						{
-							thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
-						}
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
+                        }
+                        else
+                        {
+                            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)
-					break;
-			}
+                if (pitem == null)
+                    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;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							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);
 							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();
-
-			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;
+			EPFields unfiltered = ActiveFormat.PlantFormat.EPFormatFiles.First(x => x.AnnotationTypeID == AnnTypeID).FieldList;
 
 			//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
-					&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
-						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.ShowSectionTitles
+				&& !MyDocStyle.CancelSectTitle
+				&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
+					localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential)) ? 0 : CurrentSectionLevel());
+				if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
 			}
-
+			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 (IsHigh
-					&& !seqtabs[(localPrintLevel < 0 ? 0 : localPrintLevel) % seqtabs.MaxIndex].TabToken.Contains("{numericWpar}")
-					&& tbformat.Contains("{")) useSubStepTabs = true;
+			if (doMeta && IsHigh
+				&& !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
-				// or caution or equipment list, don't use parent tab AND always start the numbering as a numeric
-				if (IsSequential && (InNote() || InCaution() ||
-					(MyParent.IsEquipmentList && !MyParent.FormatStepData.TabData.IdentPrint.Contains("{seq}"))))
+			// 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
+			if (doMeta && IsSequential && (InNote() || InCaution() ||
+				(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.
-					localPrintLevel = 0;
-					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++;
+					ii = ii.MyParent;
 				}
+				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"))
-					tbformat = tbformat.Replace("{alpha}", alpha);
-				else
-					tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
-				tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
-				if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
-					tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
-				else
-					tbformat = tbformat.Replace("{ALPHA}", alpha);
+			// 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"))
+				tbformat = tbformat.Replace("{alpha}", alpha);
+			else
+				tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
+			tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
+			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
+				tbformat = tbformat.Replace("{ALPHA}. ", alpha + ".");   // if double chars, remove one of the space for BGE
+			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);
-				}
-				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);
-				}
+				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)
+			{
+				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
-    // class to handle storage and access of EPFormatFile and EPFormatFile details
-    #region EPFormatFiles
-    [TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
-    public class EPFormatFiles : vlnFormatList<EPFormatFile>
-    {
-        public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-    }
-    #endregion
-    #region EPFormatFile
-    public class EPFormatFile : vlnFormatItem
-    {
-        #region Constructor
-        public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
-        public EPFormatFile() : base() { }
-        #endregion
-        #region Business Fields
-        // Name of the EP Viewer Format File
-        private LazyLoad<string> _Name;
-        [DisplayName("Name")]
-        [Description("EP Viewer File Name")]
-        public string Name
-        {
-            get
-            {
-                return LazyLoad(ref _Name, "@Name");
-            }
-        }
-        // Name of the EP Viewer Format File
-        private LazyLoad<string> _Description;
-        [DisplayName("Description")]
-        [Description("EP Viewer Description")]
-        public string Description
-        {
-            get
-            {
-                return LazyLoad(ref _Description, "@Description");
-            }
-        }
-        // Id of Annotation Type Associated with this file
-        private LazyLoad<int?> _AnnotationTypeID;
-        [DisplayName("AnnotationTypeID")]
-        [Description("Id of Annotation Type Associated with this file")]
-        public int? AnnotationTypeID
-        {
-            get
-            {
-                return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
-            }
-        }
-
-        // Return Name of Annotation that EP Format File is Attached to
-        public string AnnotationName()
-        {
-            return AnnotationTypeInfo.Get((int) AnnotationTypeID).Name;
-        }
-
-        //if xml value is blank, should element export?
-        //defaults to true
-        private LazyLoad<bool> _exportblank;
-        [DisplayName("exportblank")]
-        [Description("if xml value is blank, should element export?")]
-        public bool exportblank
-        {
-            get
-            {
-                return LazyLoad(ref _exportblank, "@exportblank");
-            }
-        }
-        // 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)
+	//C2025-023 - Electronic Procedures - Modifications to PROMS
+	// class to handle storage and access of EPFormatFile and EPFormatFile details
+	#region EPFormatFiles
+	[TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
+	public class EPFormatFiles : vlnFormatList<EPFormatFile>
+	{
+		public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
+	}
+	#endregion
+	#region EPFormatFile
+	public class EPFormatFile : vlnFormatItem
+	{
+		#region Constructor
+		public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
+		public EPFormatFile() : base() { }
+		#endregion
+		#region Business Fields
+		// Name of the EP Viewer Format File
+		private LazyLoad<string> _Name;
+		[DisplayName("Name")]
+		[Description("EP Viewer File Name")]
+		public string Name
+		{
+			get
+			{
+				return LazyLoad(ref _Name, "@Name");
+			}
+		}
+		// Name of the EP Viewer Format File
+		private LazyLoad<string> _Description;
+		[DisplayName("Description")]
+		[Description("EP Viewer Description")]
+		public string Description
+		{
+			get
+			{
+				return LazyLoad(ref _Description, "@Description");
+			}
+		}
+		// Id of Annotation Type Associated with this file
+		private LazyLoad<int?> _AnnotationTypeID;
+		[DisplayName("AnnotationTypeID")]
+		[Description("Id of Annotation Type Associated with this file")]
+		public int? AnnotationTypeID
+		{
+			get
+			{
+				return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
+			}
+		}
+		// 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 == null ? _FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")) : _FieldList;
+			}
+		}
+		#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);
-                }
-            }
-        }
-        #endregion
-        #region Data Access
-        // static - Load EP Format details - save to db (insert/update)
-        public static void UpdateEPFormat(string name, string data, string userID)
-        {
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
-                using (SqlCommand cm = cn.CreateCommand())
-                {
-                    cm.CommandType = CommandType.StoredProcedure;
-                    cm.CommandText = "vesp_UpdateEPFormat";
-                    cm.Parameters.AddWithValue("@name", name);
-                    cm.Parameters.AddWithValue("@data", data);
-                    cm.Parameters.AddWithValue("@userID", userID);
-                    cm.CommandTimeout = Database.DefaultTimeout;
-                    cm.ExecuteNonQuery();
-                }
-            }
-        }
+					UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
+				}			
+			}
+		}
+		#endregion
+		#region Data Access
+		// static - Load EP Format details - save to db (insert/update)
+		public static void UpdateEPFormat(string name, string data, string userID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					cm.CommandType = CommandType.StoredProcedure;
+					cm.CommandText = "vesp_UpdateEPFormat";
+					cm.Parameters.AddWithValue("@name", name);
+					cm.Parameters.AddWithValue("@data", data);
+					cm.Parameters.AddWithValue("@userID", userID);
+					cm.CommandTimeout = Database.DefaultTimeout;
+					cm.ExecuteNonQuery();
+				}
+			}
+		}
 
-        // load data for getting fieldlist for this EPFormat
-        public static XmlDocument GetEPFormatData(string name)
-        {
-            name = name.Replace(".xml", "");
+		// load data for getting fieldlist for this EPFormat
+		public static XmlDocument GetEPFormatData(string name)
+		{
+			name = name.Replace(".xml", "");
 
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
-                using (SqlCommand cm = cn.CreateCommand())
-                {
-                    cm.CommandType = CommandType.Text;
-                    cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
-                    cm.Parameters.AddWithValue("@Name", name);
-                    cm.CommandTimeout = Database.DefaultTimeout;
-                    using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-                    {
-                        if (dr.Read())
-                        {
-                            XmlDocument xd = new XmlDocument();
-                            xd.XmlResolver = null;
-                            xd.LoadXml(dr.GetString("Data"));
-                            return xd;
-                        }
-                    }
-                }
-            }
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					cm.CommandType = CommandType.Text;
+					cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
+					cm.Parameters.AddWithValue("@Name", name);
+					cm.CommandTimeout = Database.DefaultTimeout;
+					using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+					{
+						if (dr.Read())
+						{
+							XmlDocument xd = new XmlDocument();
+							xd.XmlResolver = null;
+							xd.LoadXml(dr.GetString("Data"));
+							return xd;
+						}
+					}
+				}
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        // Get all in-use formats
-        public static List<int> GetAllInUseFormats()
-        {
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
-                using (SqlCommand cm = cn.CreateCommand())
-                {
-                    cm.CommandType = CommandType.Text;
-                    cm.CommandText = @"SELECT Distinct Formats.[FormatID]
+		// Get all in-use formats
+		public static List<int> GetAllInUseFormats()
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					cm.CommandType = CommandType.Text;
+					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 (SqlDataAdapter da = new SqlDataAdapter(cm))
-                        {
-                            da.Fill(dt);
-                            return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
-                        }
-                    }
+					using (DataTable dt = new DataTable())
+					{
+						using (SqlDataAdapter da = new SqlDataAdapter(cm))
+						{
+							da.Fill(dt);
+							return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
+						}
+					}
 
-                }
-            }
-        }
+				}
+			}
+		}
 
-        // update an annotation type as an Electronic Procedure Annotation Type
-        public static void UpdateAnnotationTypeAsEP(int typeID)
-        {
-            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-            {
-                using (SqlCommand cm = cn.CreateCommand())
-                {
-                    cm.CommandType = CommandType.Text;
-                    cm.CommandText = @"Update AnnotationTypes
+		// update an annotation type as an Electronic Procedure Annotation Type
+		public static void UpdateAnnotationTypeAsEP(int typeID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					cm.CommandType = CommandType.Text;
+					cm.CommandText = @"Update AnnotationTypes
 										SET IsEPAnnotationType = 1
 									    WHERE TypeID = @typeID";
-                    cm.Parameters.AddWithValue("@typeID", typeID);
-                    cm.CommandTimeout = Database.DefaultTimeout;
-                    cm.ExecuteNonQuery();
-                }
-            }
-        }
+					cm.Parameters.AddWithValue("@typeID", typeID);
+					cm.CommandTimeout = Database.DefaultTimeout;
+					cm.ExecuteNonQuery();
+				}
+			}
+		}
 
-        // Returns true if there are any EP Annotation Types
-        public static bool IsEPAnnotationType()
-        {
-            try
-            {
-                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-                {
-                    using (SqlCommand cm = cn.CreateCommand())
-                    {
-                        cm.CommandType = CommandType.Text;
-                        cm.CommandText = @"SELECT RESULT = CASE WHEN 
+		// Returns true if there are any EP Annotation Types
+		public static bool IsEPAnnotationType()
+		{
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.Text;
+						cm.CommandText = @"SELECT RESULT = CASE WHEN 
 						EXISTS(SELECT 1 FROM AnnotationTypes where IsEPAnnotationType = 1) 
 						THEN 1 ELSE 0 END";
-                        cm.CommandTimeout = Database.DefaultTimeout;
-                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-                        {
-                            if (dr.Read() && dr.GetInt32("RESULT") == 1)
-                                return true;
-                        }
-                    }
-                }
-            }
-            catch
-            {
-                // EP Support has not yet been added for this DB
-                // IsEPAnnotationType does not exist
-                // need to run PROMS Fixes
-                // until then will ignore EP code
-                // instead of crashing for a field not found
-            }
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (dr.Read() && dr.GetInt32("RESULT") == 1)
+								return true;
+						}
+					}
+				}
+			}
+			catch
+			{
+				// EP Support has not yet been added for this DB
+				// IsEPAnnotationType does not exist
+				// need to run PROMS Fixes
+				// until then will ignore EP code
+				// instead of crashing for a field not found
+			}
 
-            return false;
-        }
-        #endregion
-    }
+			return false;
+		}
+		#endregion
+	}
 
-    public class EPFields : vlnFormatList<EPField>
-    {
+	public class EPFields : vlnFormatList<EPField>
+	{
         public EPFields()
         {
         }
 
         public EPFields(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-    }
-    // EP field class
-    public class EPField : vlnFormatItem
-    {
-        public EPField(XmlNode xmlNode) : base(xmlNode) { }
-        public EPField() : base() { }
-        private LazyLoad<string> _name;
-        public string name
-        {
-            get
-            {
-                return LazyLoad(ref _name, "@name");
-            }
-        }
-        private LazyLoad<string> _type;
-        public string type
-        {
-            get
-            {
-                return LazyLoad(ref _type, "@type");
-            }
-        }
-        private LazyLoad<string> _label;
-        public string label
-        {
-            get
-            {
-                string tmp = LazyLoad(ref _label, "@label");
+	}
+	// EP field class
+	public class EPField : vlnFormatItem
+	{
+		public EPField(XmlNode xmlNode) : base(xmlNode) { }
+		public EPField() : base() { }
+		private LazyLoad<string> _name;
+		public string name
+		{
+			get
+			{
+				return LazyLoad(ref _name, "@name");
+			}
+		}
+		private LazyLoad<string> _type;
+		public string type
+		{
+			get
+			{
+				return LazyLoad(ref _type, "@type");
+			}
+		}
+		private LazyLoad<string> _label;
+		public string label
+		{
+			get
+			{
+				string tmp = LazyLoad(ref _label, "@label");
 
-                if (string.IsNullOrEmpty(tmp))
-                    return LazyLoad(ref _name, "@name");
-                else
-                    return tmp;
-            }
-        }
-        private LazyLoad<string> _text;
-        public string text
-        {
-            get
-            {
-                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
-        private LazyLoad<string> _rosource;
-        public string rosource
-        {
-            get
-            {
-                return LazyLoad(ref _rosource, "@rosource");
-            }
-        }
-        //the columns in the RO that will be included in the exports
-        private LazyLoad<string> _returncols;
-        public List<string> returncols()
-        {
-            try
-            {
-                string tmp = LazyLoad(ref _returncols, "@returncols");
+				if (string.IsNullOrEmpty(tmp))
+					return LazyLoad(ref _name, "@name");
+				else
+					return tmp;
+			}
+		}
+		private LazyLoad<string> _text;
+		public string text
+		{
+			get
+			{
+				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
+		private LazyLoad<string> _rosource;
+		public string rosource
+		{
+			get
+			{
+				return LazyLoad(ref _rosource, "@rosource");
+			}
+		}
+		//the columns in the RO that will be included in the exports
+		private LazyLoad<string> _returncols;
+		public List<string> returncols()
+		{
+			try
+			{
+				string tmp = LazyLoad(ref _returncols, "@returncols");
 
-                if (string.IsNullOrEmpty(tmp))
-                    return new List<string>();
-                else
-                    return tmp.Split(',').Select(p => p.Trim()).ToList();
-            }
-            catch
-            {
-                throw new ArgumentException($"Error in returncols for EP file, field: {name}");
-            }
-        }
+				if (string.IsNullOrEmpty(tmp))
+					return new List<string>();
+				else
+					return tmp.Split(',').Select(p => p.Trim()).ToList();
+			}
+			catch
+			{
+				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
-        private LazyLoad<int?> _numlines;
-        public int numlines
-        {
-            get
-            {
-                int? tmp = LazyLoad(ref _numlines, "@numlines");
+		//number of lines for a multi-line text box to span
+		private LazyLoad<int?> _numlines;
+		public int numlines
+		{
+			get
+			{
+				int? tmp = LazyLoad(ref _numlines, "@numlines");
 
-                if (tmp == null)
-                    return 1;
+				if (tmp == null)
+					return 1;
 
-                return (int) tmp;
-            }
-        }
-        //step types that the EPForma Item is valid for (as a list of types)
-        private LazyLoad<string> _validforsteptypes;
+				return (int) tmp;
+			}
+		}
+		//step types that the EPForma Item is valid for (as a list of types)
+		private LazyLoad<string> _validforsteptypes;
         public List<string> validforsteptypes()
-        {
-            try
-            {
-                string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
-                return tmp.Split(',').Select(p => p.Trim()).ToList();
-            }
-            catch
-            {
-                throw new ArgumentException($"Error in validforsteptypes for EP file, field: {name}");
-            }
-        }
-        public bool IsValidForStepType(string StepType)
-        {
-            List<string> tmp = validforsteptypes();
-            return tmp.Contains(StepType);
-        }
+		{
+			try
+			{
+				string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
+				return tmp.Split(',').Select(p => p.Trim()).ToList();
+			}
+			catch
+			{
+				throw new ArgumentException($"Error in validforsteptypes for EP file: {((EPFormatFile) MyParentFormat).Name}.xml, field: {name}");
+			}
+		}
+		public bool IsValidForStepType(string StepType)
+		{
+			List<string> tmp = validforsteptypes();
+			return tmp.Contains(StepType);
+		}
 
-        //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
-        public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
-        {
-            if (string.IsNullOrEmpty(rosource))
-                return new List<ROListItem>();
+		//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
+		public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
+		{
+			if (string.IsNullOrEmpty(rosource))
+				return new List<ROListItem>();
 
-            try
-            {
-                DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+			try
+			{
+				DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+				ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
-                if (MyDocVersion.DocVersionAssociations != null && MyDocVersion.DocVersionAssociations.Any())
-                {
-                    ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
+				string roid = FormatRoidKey(rosource, false);
+				rochild[] children = lookup.GetRoChildrenByRoid(roid);
 
-                    string roid = FormatRoidKey(rosource, false);
-                    rochild[] children = lookup.GetRoChildrenByRoid(roid);
+				List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
+				if (includeblank)
+					mylist.Insert(0, new ROListItem("", ""));
 
-                    List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
-                    if (includeblank)
-                        mylist.Insert(0, new ROListItem("", ""));
+				return mylist;
+			}
+			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("", "")
-                    };
-                }
 
-            }
-            catch
-            {
-                throw new ArgumentException($"Error in rosource for EP file, field: {name}");
-            }
-        }
+		//return a list of values for the specified ROID
+		//given the EP items return columns
+		//will return all RO items under the Group that's roid = the rosource
+		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
-        //given the EP items return columns
-        //will return all RO items under the Group that's roid = the rosource
-        public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
-        {
-            if (string.IsNullOrEmpty(roid))
-                return new List<string>();
+			List<string> values = new List<string>();
+			DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+			ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
+			rochild ro = lookup.GetRoChild(roid);
 
-            List<string> values = new List<string>();
-            DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-            ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-            rochild ro = lookup.GetRoChild(roid);
+			List<string> rtncols = returncols();
 
-            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)
-            {
-                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;
 
-            return values;
-
-        }
-    }
-
-    #endregion
-    //C2025-023 - Electronic Procedures - Modifications to PROMS
-    // class to handle return of RO Lists
-    #region EPFormatFiles
-    public class ROListItem
-    {
-        public string Text { get; private set; }
-        public string Value { get; private set; }
-        public ROListItem(string _text, string _value)
-        {
-            Text = _text; Value = _value;
-        }
-    }
-    #endregion
+		}
+	}
+	#endregion
+	//C2025-023 - Electronic Procedures - Modifications to PROMS
+	// class to handle return of RO Lists
+	#region EPFormatFiles
+	public class ROListItem
+	{
+		public string Text { get; private set; }
+		public string Value { get; private set; }
+		public ROListItem(string _text, string _value)
+		{
+			Text = _text; Value = _value;
+		}
+	}
+	#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";
-
-			//C2025 - 027 Annotation Type Filtering
-			cbGridAnnoType.WatermarkText = "Select Annotation Type";
-			cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID);
-
+			cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone();
 			// 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.
-				object EDOfficeViewerX = GetValue<object>(@"HKEY_CLASSES_ROOT\EDOfficeViewerX.Connect\CLSID\", @"", null);
-
-				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);
-				}
+				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();