revert 2b5becfa34

revert F2024-074 (Farley) Include the Cover Page in the total page count of the procedures

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.3.2410.815")]
+[assembly: AssemblyFileVersion("2.3.2410.815")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -92,5 +92,6 @@ using System.Runtime.CompilerServices;
 
 
 
+
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs

@@ -100,6 +100,7 @@ using System.Text;
 using RODBInterface;
 using ROFields;
 using VlnStatus;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -245,6 +246,37 @@ namespace ROEditor
 				return CvtFldToUserFld(origGroup);
 			}
 		}
+
+		//CSM C2024-023
+		//Part of 2024 PROMS Upgrades
+		//When the Overall Form is activated
+		//if there are any items that are Fields that are in use
+		//add them as auto-complete options to the
+		//Accessory Page Access - Value Textbox
+		//Typing < will bring up the auto-complete options
+		protected void tbValue_AddAutoComplete(object sender, EventArgs e)
+		{
+            string dummy = "";  // need for RODB_GetFIeldsInUse call, won't be used.
+            ArrayList AvailList, InUseList;
+            //first see if it is a valid 'InUse' Field.
+            AvailList = myrodb.RODB_GetFields(elem, (uint)RecordType.Schema);
+            InUseList = myrodb.RODB_GetFieldsInUse(elem, AvailList, "FieldsInUse", ref dummy, false);
+
+			//if any ROField items are in use, 
+			//use LINQ to get a string array of the FieldNames
+			if (InUseList.Count > 0)
+			{
+				string[] InUseListFieldNames = InUseList.OfType<ROField>().Select(x => $"<{x.GetFieldname}>").ToArray();
+				AutoCompleteStringCollection allowedTypes = new AutoCompleteStringCollection();
+				allowedTypes.AddRange(InUseListFieldNames);
+				tbValue.AutoCompleteCustomSource = allowedTypes;
+				tbValue.AutoCompleteMode = AutoCompleteMode.Suggest;
+				tbValue.AutoCompleteSource = AutoCompleteSource.CustomSource;
+
+			}
+
+        }
+
 		private void FillInData()
 		{
 			this.tbGroup.Text = DetermineGroupName();
@@ -432,6 +464,7 @@ namespace ROEditor
 			this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
 			this.Name = "GroupDefFrm";
 			this.Text = "Group Definition";
+			this.Activated += new EventHandler(tbValue_AddAutoComplete);
 			this.groupBox1.ResumeLayout(false);
 			this.ResumeLayout(false);
 

PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs

@@ -97,12 +97,12 @@ namespace VEPROMS
 			this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
 			this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
 			this.groupPag = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.cbxGenerateTimeCritActSum = new System.Windows.Forms.CheckBox();
 			this.expPrnSetting = new DevComponents.DotNetBar.ExpandablePanel();
 			this.ppGpDuplex = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.tbBlankPage = new DevComponents.DotNetBar.Controls.TextBoxX();
 			this.lblBlPg = new DevComponents.DotNetBar.LabelX();
 			this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.cbxGenerateTimeCritActSum = new System.Windows.Forms.CheckBox();
 			this.gpnlDebug.SuspendLayout();
 			this.grpDateSelector.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
@@ -1285,6 +1285,23 @@ namespace VEPROMS
 			this.groupPag.TabIndex = 111;
 			this.groupPag.Text = "Print using standard PROMS pagination rules by:";
 			// 
+			// cbxGenerateTimeCritActSum
+			// 
+			this.cbxGenerateTimeCritActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.cbxGenerateTimeCritActSum.AutoSize = true;
+			this.cbxGenerateTimeCritActSum.BackColor = System.Drawing.Color.Transparent;
+			this.cbxGenerateTimeCritActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxGenerateTimeCritActSum.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.cbxGenerateTimeCritActSum.Location = new System.Drawing.Point(240, 273);
+			this.cbxGenerateTimeCritActSum.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxGenerateTimeCritActSum.Name = "cbxGenerateTimeCritActSum";
+			this.cbxGenerateTimeCritActSum.Size = new System.Drawing.Size(294, 17);
+			this.cbxGenerateTimeCritActSum.TabIndex = 102;
+			this.cbxGenerateTimeCritActSum.Text = "Generate Time Critical Action Summary (hidden but used)";
+			this.cbxGenerateTimeCritActSum.UseVisualStyleBackColor = false;
+			this.cbxGenerateTimeCritActSum.Visible = false;
+			// 
 			// expPrnSetting
 			// 
 			this.expPrnSetting.CanvasColor = System.Drawing.SystemColors.Control;
@@ -1421,23 +1438,6 @@ namespace VEPROMS
 			this.swtbtnPDFdtPrefixSuffix.TabIndex = 111;
 			this.swtbtnPDFdtPrefixSuffix.ValueChanged += new System.EventHandler(this.swtbtnPDFdtPrefixSuffix_ValueChanged);
 			// 
-			// cbxGenerateTimeCritActSum
-			// 
-			this.cbxGenerateTimeCritActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.cbxGenerateTimeCritActSum.AutoSize = true;
-			this.cbxGenerateTimeCritActSum.BackColor = System.Drawing.Color.Transparent;
-			this.cbxGenerateTimeCritActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxGenerateTimeCritActSum.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.cbxGenerateTimeCritActSum.Location = new System.Drawing.Point(240, 273);
-			this.cbxGenerateTimeCritActSum.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxGenerateTimeCritActSum.Name = "cbxGenerateTimeCritActSum";
-			this.cbxGenerateTimeCritActSum.Size = new System.Drawing.Size(294, 17);
-			this.cbxGenerateTimeCritActSum.TabIndex = 102;
-			this.cbxGenerateTimeCritActSum.Text = "Generate Time Critical Action Summary (hidden but used)";
-			this.cbxGenerateTimeCritActSum.UseVisualStyleBackColor = false;
-			this.cbxGenerateTimeCritActSum.Visible = false;
-			// 
 			// DlgPrintProcedure
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -231,7 +231,6 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Visible = oneProcedure;
 			cbxOpenAfterCreate2.Checked = false;
 			cbxOverwritePDF2.Visible = oneProcedure;
-			cbxOverwritePDF2.Checked = true;
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
@@ -1096,6 +1095,15 @@ namespace VEPROMS
 		}
 		private void btnCreatePDF_Click(object sender, EventArgs e)
 		{
+			// B2024-058  Add validation for Revision Date field of the Print dialog
+			if (txbRevDate.Visible)
+			{
+				if (!validateDate(txbRevDate))
+				{
+					//txbRevDate.Focus();
+					return;
+				}
+			}
 			DoCreatePDF();
 		}
 
@@ -1193,16 +1201,47 @@ namespace VEPROMS
 			if (_Initializing) return;
 			ppGpbxUserSpecTxt.Enabled = ppCmbxChgBarTxtType.SelectedIndex == (int)PrintChangeBarText.UserDef;
 		}
+		// B2024-058  Add validation for Revision Date field of the Print dialog
+		private bool validateDate(TextBox txtDate)
+		{
+			DateTime dDate;
+			if (!(txtDate.Text == ""))
+			{
+
+				if (DateTime.TryParse(txtDate.Text, out dDate))
+				{
+					return true;
+				}
+				else
+				{
+					string txtDate2 = txtDate.Text;
+					string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
+					string txtTitle = "Invalid Format";
+					MessageBox.Show(message, txtTitle);
+					return false;
+				}
+			}
+			return true;
+		}
+
 		private void txbRevDate_Enter(object sender, EventArgs e)
 		{
 			txbDate = txbRevDate;
 			grpDateSelector.Text = "Select Revision Date";
 			grpDateSelector.Visible = calDateSelector.Visible = true;
 			//C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date
-			DateTime initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
-			calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
+			DateTime dDate;
+			// B2024-058  Add validation for Revision Date field of the Print dialog
+			if (!validateDate(txbDate))
+			{
+				txbRevDate.Focus();
+			}
+			else
+			{
+				DateTime initSelDate = (txbDate.Text != null && txbDate.Text.Length != 0) ? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
+				calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
+			}
 		}
-
 		private void txbRevDate_Leave(object sender, EventArgs e)
 		{
 			if (_Initializing) return;
@@ -1375,6 +1414,7 @@ namespace VEPROMS
 				_NewRevForAllProcs = null;
 		}
 
+
 		//private void cbxDebug_CheckedChanged(object sender, EventArgs e)
 		//{
 		//  cbxCmpPRMSpfd.Visible = cbxDebug.Checked;

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -425,9 +425,9 @@ namespace VEPROMS
 				MessageBox.Show(msg, "Import Completed", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
 																											//MessageBox.Show(string.Format("Finished Importing:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
 			}
-			if (canceledPressed)
+			if (canceledPressed || !isImported)
 			{
-				MessageBox.Show(string.Format("Canceling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				MessageBox.Show(string.Format("Cancelling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Cancelling Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				btnCloseImport.PerformClick();
 			}
 		}
@@ -906,8 +906,8 @@ namespace VEPROMS
 				// C2020-032: Import Procedure set when existing name exists, allow user to import with 'Copy (#) of'. 
 				//	This is similar functionality to the import of a procedure without the overwrite part.
 				string msg = string.Format("The procedure set you are importing, {0}, already exists.\n\nDo you want to import {0} as a COPY of the existing set?\n\nThis will prefix the name with \"Copy (#) of\"", name);
-				DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop);
-				if (dr == DialogResult.Yes)
+				DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.OKCancel, MessageBoxIcon.Stop);
+				if (dr == DialogResult.OK)
 				{
 					string number = "";
 					int max = -1;
@@ -931,6 +931,11 @@ namespace VEPROMS
 
 					ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
 				}
+				//else if (dr == System.Windows.Forms.DialogResult.Cancel)
+				//{
+				//	//canceledPressed = true;
+				//	//resolvedProcNum = false;
+				//}
 				else
 					return false;
 			}

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -139,9 +139,10 @@
 			// 
 			this.myTV.CheckBoxes = true;
 			this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTV.Location = new System.Drawing.Point(0, 184);
+			this.myTV.Location = new System.Drawing.Point(0, 285);
+			this.myTV.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.myTV.Name = "myTV";
-			this.myTV.Size = new System.Drawing.Size(291, 310);
+			this.myTV.Size = new System.Drawing.Size(436, 475);
 			this.myTV.TabIndex = 4;
 			this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
 			// 
@@ -149,6 +150,7 @@
 			// 
 			this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.splitContainer3.Name = "splitContainer3";
 			this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
 			// 
@@ -164,8 +166,9 @@
 			// 
 			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 = 526;
+			this.splitContainer3.Size = new System.Drawing.Size(1766, 902);
+			this.splitContainer3.SplitterDistance = 809;
+			this.splitContainer3.SplitterWidth = 6;
 			this.splitContainer3.TabIndex = 2;
 			// 
 			// panelEx3
@@ -177,9 +180,10 @@
 			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.Location = new System.Drawing.Point(1032, 0);
+			this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx3.Name = "panelEx3";
-			this.panelEx3.Size = new System.Drawing.Size(489, 526);
+			this.panelEx3.Size = new System.Drawing.Size(734, 809);
 			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;
@@ -194,11 +198,12 @@
 			// 
 			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.Location = new System.Drawing.Point(0, 79);
+			this.txtResults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.txtResults.Multiline = true;
 			this.txtResults.Name = "txtResults";
 			this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtResults.Size = new System.Drawing.Size(489, 474);
+			this.txtResults.Size = new System.Drawing.Size(734, 730);
 			this.txtResults.TabIndex = 4;
 			// 
 			// panel1
@@ -206,17 +211,19 @@
 			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.Location = new System.Drawing.Point(0, 34);
+			this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(489, 29);
+			this.panel1.Size = new System.Drawing.Size(734, 45);
 			this.panel1.TabIndex = 3;
 			// 
 			// btnSave
 			// 
 			this.btnSave.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnSave.Location = new System.Drawing.Point(95, 0);
+			this.btnSave.Location = new System.Drawing.Point(142, 0);
+			this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnSave.Name = "btnSave";
-			this.btnSave.Size = new System.Drawing.Size(95, 29);
+			this.btnSave.Size = new System.Drawing.Size(142, 45);
 			this.btnSave.TabIndex = 3;
 			this.btnSave.Text = "Save Results";
 			this.btnSave.UseVisualStyleBackColor = true;
@@ -226,8 +233,9 @@
 			// 
 			this.btnClear.Dock = System.Windows.Forms.DockStyle.Left;
 			this.btnClear.Location = new System.Drawing.Point(0, 0);
+			this.btnClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnClear.Name = "btnClear";
-			this.btnClear.Size = new System.Drawing.Size(95, 29);
+			this.btnClear.Size = new System.Drawing.Size(142, 45);
 			this.btnClear.TabIndex = 2;
 			this.btnClear.Text = "Clear Results";
 			this.btnClear.UseVisualStyleBackColor = true;
@@ -239,8 +247,9 @@
 			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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(489, 23);
+			this.label3.Size = new System.Drawing.Size(734, 34);
 			this.label3.TabIndex = 2;
 			this.label3.Text = "Results";
 			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -270,9 +279,10 @@
 			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.Location = new System.Drawing.Point(1023, 0);
+			this.expandableSplitter2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.expandableSplitter2.Name = "expandableSplitter2";
-			this.expandableSplitter2.Size = new System.Drawing.Size(6, 526);
+			this.expandableSplitter2.Size = new System.Drawing.Size(9, 809);
 			this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter2.TabIndex = 38;
 			this.expandableSplitter2.TabStop = false;
@@ -288,9 +298,10 @@
 			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.Location = new System.Drawing.Point(587, 0);
+			this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx2.Name = "panelEx2";
-			this.panelEx2.Size = new System.Drawing.Size(291, 526);
+			this.panelEx2.Size = new System.Drawing.Size(436, 809);
 			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;
@@ -306,19 +317,21 @@
 			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.Location = new System.Drawing.Point(0, 228);
+			this.txtProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.txtProcess.Multiline = true;
 			this.txtProcess.Name = "txtProcess";
 			this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtProcess.Size = new System.Drawing.Size(291, 376);
+			this.txtProcess.Size = new System.Drawing.Size(436, 581);
 			this.txtProcess.TabIndex = 5;
 			// 
 			// pbProcess
 			// 
 			this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top;
-			this.pbProcess.Location = new System.Drawing.Point(0, 125);
+			this.pbProcess.Location = new System.Drawing.Point(0, 190);
+			this.pbProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.pbProcess.Name = "pbProcess";
-			this.pbProcess.Size = new System.Drawing.Size(291, 25);
+			this.pbProcess.Size = new System.Drawing.Size(436, 38);
 			this.pbProcess.TabIndex = 6;
 			// 
 			// label6
@@ -326,9 +339,10 @@
 			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.Location = new System.Drawing.Point(0, 156);
+			this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label6.Name = "label6";
-			this.label6.Size = new System.Drawing.Size(291, 23);
+			this.label6.Size = new System.Drawing.Size(436, 34);
 			this.label6.TabIndex = 3;
 			this.label6.Text = "Process Status";
 			this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -338,10 +352,11 @@
 			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.Location = new System.Drawing.Point(0, 34);
+			this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panel3.Name = "panel3";
-			this.panel3.Padding = new System.Windows.Forms.Padding(6);
-			this.panel3.Size = new System.Drawing.Size(291, 79);
+			this.panel3.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
+			this.panel3.Size = new System.Drawing.Size(436, 122);
 			this.panel3.TabIndex = 2;
 			// 
 			// pnlLater
@@ -351,18 +366,20 @@
 			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.Location = new System.Drawing.Point(9, 33);
+			this.pnlLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.pnlLater.Name = "pnlLater";
-			this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
-			this.pnlLater.Size = new System.Drawing.Size(279, 37);
+			this.pnlLater.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
+			this.pnlLater.Size = new System.Drawing.Size(418, 57);
 			this.pnlLater.TabIndex = 3;
 			// 
 			// label5
 			// 
 			this.label5.AutoSize = true;
-			this.label5.Location = new System.Drawing.Point(105, 15);
+			this.label5.Location = new System.Drawing.Point(158, 23);
+			this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label5.Name = "label5";
-			this.label5.Size = new System.Drawing.Size(18, 13);
+			this.label5.Size = new System.Drawing.Size(25, 20);
 			this.label5.TabIndex = 5;
 			this.label5.Text = "@";
 			// 
@@ -372,27 +389,30 @@
             | 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.Location = new System.Drawing.Point(194, 14);
+			this.dtpTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.dtpTime.Name = "dtpTime";
 			this.dtpTime.ShowUpDown = true;
-			this.dtpTime.Size = new System.Drawing.Size(133, 20);
+			this.dtpTime.Size = new System.Drawing.Size(198, 26);
 			this.dtpTime.TabIndex = 4;
 			// 
 			// dtpDate
 			// 
 			this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-			this.dtpDate.Location = new System.Drawing.Point(9, 9);
+			this.dtpDate.Location = new System.Drawing.Point(14, 14);
+			this.dtpDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.dtpDate.Name = "dtpDate";
-			this.dtpDate.Size = new System.Drawing.Size(90, 20);
+			this.dtpDate.Size = new System.Drawing.Size(133, 26);
 			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.Location = new System.Drawing.Point(9, 9);
+			this.chkLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.chkLater.Name = "chkLater";
-			this.chkLater.Size = new System.Drawing.Size(279, 17);
+			this.chkLater.Size = new System.Drawing.Size(418, 24);
 			this.chkLater.TabIndex = 4;
 			this.chkLater.Text = "Process Later";
 			this.chkLater.UseVisualStyleBackColor = true;
@@ -404,8 +424,9 @@
 			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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
 			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(291, 23);
+			this.label4.Size = new System.Drawing.Size(436, 34);
 			this.label4.TabIndex = 3;
 			this.label4.Text = "Process";
 			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,9 +456,10 @@
 			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.Location = new System.Drawing.Point(578, 0);
+			this.expandableSplitter1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.expandableSplitter1.Name = "expandableSplitter1";
-			this.expandableSplitter1.Size = new System.Drawing.Size(6, 526);
+			this.expandableSplitter1.Size = new System.Drawing.Size(9, 809);
 			this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter1.TabIndex = 4;
 			this.expandableSplitter1.TabStop = false;
@@ -450,8 +472,9 @@
 			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.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx1.Name = "panelEx1";
-			this.panelEx1.Size = new System.Drawing.Size(385, 526);
+			this.panelEx1.Size = new System.Drawing.Size(578, 809);
 			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;
@@ -483,9 +506,10 @@
             this.sideNavItmDelete,
             this.sideNavItmExit});
 			this.sideNav1.Location = new System.Drawing.Point(0, 0);
+			this.sideNav1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNav1.Name = "sideNav1";
-			this.sideNav1.Padding = new System.Windows.Forms.Padding(1);
-			this.sideNav1.Size = new System.Drawing.Size(385, 526);
+			this.sideNav1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.sideNav1.Size = new System.Drawing.Size(578, 809);
 			this.sideNav1.TabIndex = 3;
 			this.sideNav1.Text = "sideNav1";
 			// 
@@ -498,9 +522,10 @@
 			this.sideNavPanel4.Controls.Add(this.myTVdel);
 			this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
 			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel4.Location = new System.Drawing.Point(80, 31);
+			this.sideNavPanel4.Location = new System.Drawing.Point(109, 40);
+			this.sideNavPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel4.Name = "sideNavPanel4";
-			this.sideNavPanel4.Size = new System.Drawing.Size(300, 494);
+			this.sideNavPanel4.Size = new System.Drawing.Size(461, 767);
 			this.sideNavPanel4.TabIndex = 27;
 			// 
 			// swDeleteFolder
@@ -509,11 +534,12 @@
 			// 
 			// 
 			this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
+			this.swDeleteFolder.Location = new System.Drawing.Point(15, 66);
+			this.swDeleteFolder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swDeleteFolder.Name = "swDeleteFolder";
-			this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteFolder.Size = new System.Drawing.Size(104, 34);
 			this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
 			this.swDeleteFolder.SwitchClickTogglesValue = true;
 			this.swDeleteFolder.TabIndex = 39;
 			this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
@@ -526,10 +552,11 @@
 			// 
 			this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX13.Location = new System.Drawing.Point(85, 42);
+			this.labelX13.Location = new System.Drawing.Point(128, 65);
+			this.labelX13.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX13.Name = "labelX13";
-			this.labelX13.Size = new System.Drawing.Size(168, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
+			this.labelX13.Size = new System.Drawing.Size(252, 34);
+			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
 			this.labelX13.TabIndex = 38;
 			this.labelX13.Text = "Delete Folders";
 			// 
@@ -539,11 +566,12 @@
 			// 
 			// 
 			this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
+			this.swDeleteAnnotations.Location = new System.Drawing.Point(15, 23);
+			this.swDeleteAnnotations.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swDeleteAnnotations.Name = "swDeleteAnnotations";
-			this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteAnnotations.Size = new System.Drawing.Size(104, 34);
 			this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
+			this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
 			this.swDeleteAnnotations.SwitchClickTogglesValue = true;
 			this.swDeleteAnnotations.TabIndex = 37;
 			this.swDeleteAnnotations.Value = true;
@@ -558,10 +586,11 @@
 			// 
 			this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX14.Location = new System.Drawing.Point(85, 14);
+			this.labelX14.Location = new System.Drawing.Point(128, 22);
+			this.labelX14.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX14.Name = "labelX14";
-			this.labelX14.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
+			this.labelX14.Size = new System.Drawing.Size(279, 34);
+			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
 			this.labelX14.TabIndex = 36;
 			this.labelX14.Text = "Delete Annotations";
 			// 
@@ -569,9 +598,10 @@
 			// 
 			this.myTVdel.CheckBoxes = true;
 			this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTVdel.Location = new System.Drawing.Point(0, 127);
+			this.myTVdel.Location = new System.Drawing.Point(0, 205);
+			this.myTVdel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.myTVdel.Name = "myTVdel";
-			this.myTVdel.Size = new System.Drawing.Size(300, 367);
+			this.myTVdel.Size = new System.Drawing.Size(461, 562);
 			this.myTVdel.TabIndex = 34;
 			this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck_DelAnn);
 			// 
@@ -582,9 +612,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnDeleteItems.Checked = true;
 			this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
+			this.btnDeleteItems.Location = new System.Drawing.Point(58, 151);
+			this.btnDeleteItems.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnDeleteItems.Name = "btnDeleteItems";
-			this.btnDeleteItems.Size = new System.Drawing.Size(221, 23);
+			this.btnDeleteItems.Size = new System.Drawing.Size(343, 35);
 			this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
 			this.btnDeleteItems.TabIndex = 35;
@@ -605,9 +636,10 @@
 			this.sideNavPanel3.Controls.Add(this.myTV);
 			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
 			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel3.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel3.Name = "sideNavPanel3";
-			this.sideNavPanel3.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel3.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel3.TabIndex = 10;
 			this.sideNavPanel3.Visible = false;
 			// 
@@ -617,9 +649,10 @@
 			// 
 			// 
 			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
+			this.swCheckROLinks.Location = new System.Drawing.Point(15, 102);
+			this.swCheckROLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCheckROLinks.Name = "swCheckROLinks";
-			this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
+			this.swCheckROLinks.Size = new System.Drawing.Size(136, 34);
 			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swCheckROLinks.SwitchClickTogglesValue = true;
@@ -634,9 +667,10 @@
 			// 
 			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX12.Location = new System.Drawing.Point(107, 66);
+			this.labelX12.Location = new System.Drawing.Point(160, 102);
+			this.labelX12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX12.Name = "labelX12";
-			this.labelX12.Size = new System.Drawing.Size(186, 22);
+			this.labelX12.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
 			this.labelX12.TabIndex = 32;
 			this.labelX12.Text = "Check RO Links";
@@ -646,20 +680,21 @@
 			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox5.CloseButtonVisible = false;
 			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
-			this.warningBox5.Location = new System.Drawing.Point(17, 145);
-			this.warningBox5.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox5.Location = new System.Drawing.Point(26, 223);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox5.Name = "warningBox5";
 			this.warningBox5.OptionsButtonVisible = false;
-			this.warningBox5.Size = new System.Drawing.Size(262, 32);
+			this.warningBox5.Size = new System.Drawing.Size(393, 49);
 			this.warningBox5.TabIndex = 31;
 			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
 			// line3
 			// 
 			this.line3.BackColor = System.Drawing.Color.Transparent;
-			this.line3.Location = new System.Drawing.Point(6, 127);
+			this.line3.Location = new System.Drawing.Point(9, 195);
+			this.line3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line3.Name = "line3";
-			this.line3.Size = new System.Drawing.Size(285, 12);
+			this.line3.Size = new System.Drawing.Size(428, 18);
 			this.line3.TabIndex = 30;
 			this.line3.Text = "line3";
 			// 
@@ -669,9 +704,10 @@
 			// 
 			// 
 			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
+			this.swUpdateROVals.Location = new System.Drawing.Point(15, 15);
+			this.swUpdateROVals.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swUpdateROVals.Name = "swUpdateROVals";
-			this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
+			this.swUpdateROVals.Size = new System.Drawing.Size(136, 34);
 			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swUpdateROVals.SwitchClickTogglesValue = true;
@@ -686,9 +722,10 @@
 			// 
 			// 
 			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
+			this.swRefreshTrans.Location = new System.Drawing.Point(15, 58);
+			this.swRefreshTrans.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshTrans.Name = "swRefreshTrans";
-			this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTrans.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
 			this.swRefreshTrans.SwitchClickTogglesValue = true;
@@ -703,9 +740,10 @@
 			// 
 			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX11.Location = new System.Drawing.Point(107, 10);
+			this.labelX11.Location = new System.Drawing.Point(160, 15);
+			this.labelX11.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX11.Name = "labelX11";
-			this.labelX11.Size = new System.Drawing.Size(186, 22);
+			this.labelX11.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.labelX11.TabIndex = 28;
 			this.labelX11.Text = "Update RO Values";
@@ -718,9 +756,10 @@
 			// 
 			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX6.Location = new System.Drawing.Point(107, 38);
+			this.labelX6.Location = new System.Drawing.Point(160, 58);
+			this.labelX6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX6.Name = "labelX6";
-			this.labelX6.Size = new System.Drawing.Size(186, 22);
+			this.labelX6.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
 			this.labelX6.TabIndex = 28;
 			this.labelX6.Text = "Refresh Transitions";
@@ -730,11 +769,11 @@
 			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox1.CloseButtonVisible = false;
 			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
-			this.warningBox1.Location = new System.Drawing.Point(17, 181);
-			this.warningBox1.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox1.Location = new System.Drawing.Point(26, 278);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox1.Name = "warningBox1";
 			this.warningBox1.OptionsButtonVisible = false;
-			this.warningBox1.Size = new System.Drawing.Size(262, 43);
+			this.warningBox1.Size = new System.Drawing.Size(393, 66);
 			this.warningBox1.TabIndex = 7;
 			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -744,9 +783,10 @@
 			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnFixLinks.Checked = true;
 			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
+			this.btnFixLinks.Location = new System.Drawing.Point(15, 151);
+			this.btnFixLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnFixLinks.Name = "btnFixLinks";
-			this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
+			this.btnFixLinks.Size = new System.Drawing.Size(420, 35);
 			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
             "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
@@ -768,9 +808,10 @@
 			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.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel1.Name = "sideNavPanel1";
-			this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel1.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel1.TabIndex = 2;
 			this.sideNavPanel1.Visible = false;
 			// 
@@ -779,11 +820,11 @@
 			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.Location = new System.Drawing.Point(26, 318);
+			this.warningBox3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox3.Name = "warningBox3";
 			this.warningBox3.OptionsButtonVisible = false;
-			this.warningBox3.Size = new System.Drawing.Size(264, 32);
+			this.warningBox3.Size = new System.Drawing.Size(396, 49);
 			this.warningBox3.TabIndex = 29;
 			this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
@@ -795,18 +836,20 @@
 			// 
 			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.Location = new System.Drawing.Point(8, 5);
+			this.labelX7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX7.Name = "labelX7";
-			this.labelX7.Size = new System.Drawing.Size(251, 22);
+			this.labelX7.Size = new System.Drawing.Size(376, 34);
 			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.Location = new System.Drawing.Point(12, 275);
+			this.line1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line1.Name = "line1";
-			this.line1.Size = new System.Drawing.Size(285, 12);
+			this.line1.Size = new System.Drawing.Size(428, 18);
 			this.line1.TabIndex = 18;
 			this.line1.Text = "line1";
 			// 
@@ -816,9 +859,10 @@
 			// 
 			// 
 			this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+			this.swCkObsoleteROData.Location = new System.Drawing.Point(15, 152);
+			this.swCkObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-			this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+			this.swCkObsoleteROData.Size = new System.Drawing.Size(136, 34);
 			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;
@@ -833,9 +877,10 @@
 			// 
 			// 
 			this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+			this.swHiddenDataLocs.Location = new System.Drawing.Point(15, 109);
+			this.swHiddenDataLocs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-			this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+			this.swHiddenDataLocs.Size = new System.Drawing.Size(136, 34);
 			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;
@@ -852,9 +897,10 @@
 			// 
 			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.Location = new System.Drawing.Point(160, 152);
+			this.labelX3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX3.Name = "labelX3";
-			this.labelX3.Size = new System.Drawing.Size(154, 22);
+			this.labelX3.Size = new System.Drawing.Size(231, 34);
 			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";
@@ -867,9 +913,10 @@
 			// 
 			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.Location = new System.Drawing.Point(160, 109);
+			this.labelX2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX2.Name = "labelX2";
-			this.labelX2.Size = new System.Drawing.Size(140, 22);
+			this.labelX2.Size = new System.Drawing.Size(210, 34);
 			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";
@@ -880,9 +927,10 @@
 			// 
 			// 
 			this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(15, 66);
+			this.swCkOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
 			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;
@@ -899,9 +947,10 @@
 			// 
 			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.Location = new System.Drawing.Point(160, 66);
+			this.labelX1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX1.Name = "labelX1";
-			this.labelX1.Size = new System.Drawing.Size(172, 22);
+			this.labelX1.Size = new System.Drawing.Size(258, 34);
 			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";
@@ -912,9 +961,10 @@
 			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.Location = new System.Drawing.Point(8, 231);
+			this.btnRunCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnRunCheck.Name = "btnRunCheck";
-			this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+			this.btnRunCheck.Size = new System.Drawing.Size(429, 35);
 			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)));
@@ -940,9 +990,10 @@
 			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(89, 31);
+			this.sideNavPanel2.Location = new System.Drawing.Point(134, 48);
+			this.sideNavPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel2.Name = "sideNavPanel2";
-			this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel2.Size = new System.Drawing.Size(436, 760);
 			this.sideNavPanel2.TabIndex = 6;
 			this.sideNavPanel2.Visible = false;
 			// 
@@ -952,9 +1003,10 @@
 			// 
 			// 
 			this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
+			this.swRefreshTblsForSrch.Location = new System.Drawing.Point(15, 235);
+			this.swRefreshTblsForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
-			this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTblsForSrch.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
@@ -971,9 +1023,10 @@
 			// 
 			this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
+			this.lblRefreshTblForSrch.Location = new System.Drawing.Point(160, 235);
+			this.lblRefreshTblForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
-			this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
+			this.lblRefreshTblForSrch.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.lblRefreshTblForSrch.TabIndex = 31;
 			this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
@@ -983,11 +1036,11 @@
 			this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox4.CloseButtonVisible = false;
 			this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
-			this.warningBox4.Location = new System.Drawing.Point(12, 264);
-			this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox4.Location = new System.Drawing.Point(18, 406);
+			this.warningBox4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox4.Name = "warningBox4";
 			this.warningBox4.OptionsButtonVisible = false;
-			this.warningBox4.Size = new System.Drawing.Size(264, 32);
+			this.warningBox4.Size = new System.Drawing.Size(396, 49);
 			this.warningBox4.TabIndex = 30;
 			this.warningBox4.Text = "<b>NOTE</b> These tools can take a long time to run";
 			// 
@@ -996,11 +1049,11 @@
 			this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
 			this.warningBox2.CloseButtonVisible = false;
 			this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
-			this.warningBox2.Location = new System.Drawing.Point(12, 302);
-			this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox2.Location = new System.Drawing.Point(18, 465);
+			this.warningBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
 			this.warningBox2.Name = "warningBox2";
 			this.warningBox2.OptionsButtonVisible = false;
-			this.warningBox2.Size = new System.Drawing.Size(264, 43);
+			this.warningBox2.Size = new System.Drawing.Size(396, 66);
 			this.warningBox2.TabIndex = 28;
 			this.warningBox2.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -1011,9 +1064,10 @@
 			// 
 			// 
 			this.swRmObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRmObsoleteROData.Location = new System.Drawing.Point(10, 66);
+			this.swRmObsoleteROData.Location = new System.Drawing.Point(15, 102);
+			this.swRmObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRmObsoleteROData.Name = "swRmObsoleteROData";
-			this.swRmObsoleteROData.Size = new System.Drawing.Size(91, 22);
+			this.swRmObsoleteROData.Size = new System.Drawing.Size(136, 34);
 			this.swRmObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRmObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("swRmObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
 			this.swRmObsoleteROData.SwitchClickTogglesValue = true;
@@ -1028,9 +1082,10 @@
 			// 
 			// 
 			this.swRefreshWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshWordAttmts.Location = new System.Drawing.Point(10, 122);
+			this.swRefreshWordAttmts.Location = new System.Drawing.Point(15, 188);
+			this.swRefreshWordAttmts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRefreshWordAttmts.Name = "swRefreshWordAttmts";
-			this.swRefreshWordAttmts.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshWordAttmts.Size = new System.Drawing.Size(136, 34);
 			this.swRefreshWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRefreshWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.swRefreshWordAttmts.SwitchClickTogglesValue = true;
@@ -1045,9 +1100,10 @@
 			// 
 			// 
 			this.swStandardHypenChars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swStandardHypenChars.Location = new System.Drawing.Point(10, 94);
+			this.swStandardHypenChars.Location = new System.Drawing.Point(15, 145);
+			this.swStandardHypenChars.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swStandardHypenChars.Name = "swStandardHypenChars";
-			this.swStandardHypenChars.Size = new System.Drawing.Size(91, 22);
+			this.swStandardHypenChars.Size = new System.Drawing.Size(136, 34);
 			this.swStandardHypenChars.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swStandardHypenChars, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("swStandardHypenChars.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
 			this.swStandardHypenChars.SwitchClickTogglesValue = true;
@@ -1064,9 +1120,10 @@
 			// 
 			this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX4.Location = new System.Drawing.Point(107, 66);
+			this.labelX4.Location = new System.Drawing.Point(160, 102);
+			this.labelX4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX4.Name = "labelX4";
-			this.labelX4.Size = new System.Drawing.Size(167, 22);
+			this.labelX4.Size = new System.Drawing.Size(250, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("labelX4.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
 			this.labelX4.TabIndex = 24;
 			this.labelX4.Text = "Remove Obsolete RO Data";
@@ -1079,9 +1136,10 @@
 			// 
 			this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX5.Location = new System.Drawing.Point(107, 122);
+			this.labelX5.Location = new System.Drawing.Point(160, 188);
+			this.labelX5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX5.Name = "labelX5";
-			this.labelX5.Size = new System.Drawing.Size(186, 22);
+			this.labelX5.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("labelX5.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
 			this.labelX5.TabIndex = 25;
 			this.labelX5.Text = "Refresh Word Attachments";
@@ -1094,9 +1152,10 @@
 			// 
 			this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX9.Location = new System.Drawing.Point(107, 94);
+			this.labelX9.Location = new System.Drawing.Point(160, 145);
+			this.labelX9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX9.Name = "labelX9";
-			this.labelX9.Size = new System.Drawing.Size(186, 22);
+			this.labelX9.Size = new System.Drawing.Size(279, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX9, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("labelX9.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
 			this.labelX9.TabIndex = 25;
 			this.labelX9.Text = "Standardize Hyphen Characters";
@@ -1107,9 +1166,10 @@
 			// 
 			// 
 			this.swRmOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRmOrphanDataRecs.Location = new System.Drawing.Point(10, 38);
+			this.swRmOrphanDataRecs.Location = new System.Drawing.Point(15, 58);
+			this.swRmOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.swRmOrphanDataRecs.Name = "swRmOrphanDataRecs";
-			this.swRmOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+			this.swRmOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
 			this.swRmOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.swRmOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("swRmOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
 			this.swRmOrphanDataRecs.SwitchClickTogglesValue = true;
@@ -1126,9 +1186,10 @@
 			// 
 			this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX10.Location = new System.Drawing.Point(107, 38);
+			this.labelX10.Location = new System.Drawing.Point(160, 58);
+			this.labelX10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX10.Name = "labelX10";
-			this.labelX10.Size = new System.Drawing.Size(184, 22);
+			this.labelX10.Size = new System.Drawing.Size(276, 34);
 			this.superTooltip1.SetSuperTooltip(this.labelX10, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("labelX10.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
 			this.labelX10.TabIndex = 22;
 			this.labelX10.Text = "Remove Orphan Data Records";
@@ -1141,18 +1202,20 @@
 			// 
 			this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.labelX8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX8.Location = new System.Drawing.Point(5, 3);
+			this.labelX8.Location = new System.Drawing.Point(8, 5);
+			this.labelX8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.labelX8.Name = "labelX8";
-			this.labelX8.Size = new System.Drawing.Size(251, 22);
+			this.labelX8.Size = new System.Drawing.Size(376, 34);
 			this.labelX8.TabIndex = 21;
 			this.labelX8.Text = "Repair these Data Issues:";
 			// 
 			// line2
 			// 
 			this.line2.BackColor = System.Drawing.Color.Transparent;
-			this.line2.Location = new System.Drawing.Point(4, 237);
+			this.line2.Location = new System.Drawing.Point(6, 365);
+			this.line2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.line2.Name = "line2";
-			this.line2.Size = new System.Drawing.Size(281, 12);
+			this.line2.Size = new System.Drawing.Size(422, 18);
 			this.line2.TabIndex = 20;
 			this.line2.Text = "line2";
 			// 
@@ -1162,9 +1225,10 @@
 			this.btnRunRepair.Checked = true;
 			this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnRunRepair.Location = new System.Drawing.Point(5, 198);
+			this.btnRunRepair.Location = new System.Drawing.Point(8, 305);
+			this.btnRunRepair.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btnRunRepair.Name = "btnRunRepair";
-			this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
+			this.btnRunRepair.Size = new System.Drawing.Size(420, 35);
 			this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair 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, 103)));
@@ -1176,9 +1240,10 @@
 			// 
 			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.Location = new System.Drawing.Point(122, 48);
+			this.sideNavPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.sideNavPanel5.Name = "sideNavPanel5";
-			this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
+			this.sideNavPanel5.Size = new System.Drawing.Size(448, 760);
 			this.sideNavPanel5.TabIndex = 14;
 			this.sideNavPanel5.Visible = false;
 			// 
@@ -1187,9 +1252,10 @@
 			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.Location = new System.Drawing.Point(86, 57);
+			this.btn_ShowUsers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.btn_ShowUsers.Name = "btn_ShowUsers";
-			this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
+			this.btn_ShowUsers.Size = new System.Drawing.Size(256, 35);
 			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)));
@@ -1272,8 +1338,9 @@
 			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.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.panelEx4.Name = "panelEx4";
-			this.panelEx4.Size = new System.Drawing.Size(1177, 56);
+			this.panelEx4.Size = new System.Drawing.Size(1766, 87);
 			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;
@@ -1300,9 +1367,10 @@
             this.stepItem3,
             this.stepItem4});
 			this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			this.progressSteps1.Location = new System.Drawing.Point(123, 18);
+			this.progressSteps1.Location = new System.Drawing.Point(184, 28);
+			this.progressSteps1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.progressSteps1.Name = "progressSteps1";
-			this.progressSteps1.Size = new System.Drawing.Size(1032, 26);
+			this.progressSteps1.Size = new System.Drawing.Size(1548, 40);
 			this.progressSteps1.TabIndex = 18;
 			// 
 			// stepItem1
@@ -1341,9 +1409,10 @@
 			// 
 			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.Location = new System.Drawing.Point(28, 15);
+			this.lblAdmToolProgressType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.lblAdmToolProgressType.Name = "lblAdmToolProgressType";
-			this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34);
+			this.lblAdmToolProgressType.Size = new System.Drawing.Size(147, 52);
 			this.lblAdmToolProgressType.TabIndex = 19;
 			this.lblAdmToolProgressType.Text = "Checking:";
 			// 
@@ -1359,10 +1428,11 @@
 			// 
 			// frmBatchRefresh
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1177, 586);
+			this.ClientSize = new System.Drawing.Size(1766, 902);
 			this.Controls.Add(this.splitContainer3);
+			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "frmBatchRefresh";

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -11,6 +11,7 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -1799,6 +1800,21 @@ namespace VEPROMS
 				}
 			}
 
+			//B2024-074 If only deleting annotations from an individual procedure, verify can check out procedure.
+			string msgpi = string.Empty;
+			foreach (ProcedureInfo pi in pil)
+			{
+				//LINQ used for 1st check of if statement
+				//basically check if procedure was already part of a docVersionsFolder
+				//before checking if procedure was checked out already
+				//to avoid duplicate messages for checked out procedures
+				if (!dvil.Any(x => x.Procedures.Any(y => y.ItemID == pi.ItemID)) && !MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgpi))
+				{
+					sbDocVersions.AppendLine(msgpi);
+					cancelledOut = true;
+				}
+			}
+
 			if (cancelledOut)
 			{
 				StringBuilder sb = new StringBuilder();

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -295,7 +295,10 @@ namespace VEPROMS
 				}
 
 			}
-			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
+			// B2024-062 Added check for EmptyProcedure.  We don't need to show the Try Again message if the procedure
+			// is empty, as it would be just be a waste of time for the user.
+			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && !MyPromsPrinter.EmptyProcedure &&
+			MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
 			
 			
 			if (_PdfFile == null)

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1670,16 +1670,38 @@ namespace VEPROMS
 					return;
 				}
 
-				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
+				string stk = Volian.Base.Library.vlnStackTrace.StackToString(); 
 
 				if (!stk.Contains("Exception"))
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2342,27 @@ namespace VEPROMS
 					CurrentID = txtSearch.Text;
 				}
 			}
+
+			// Add retrieve displaytabs state here.
+			openDisplaytabstate();
+		}
+
+		public void openDisplaytabstate()
+		{
+			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
+		
+			if (DisPlayTabState.Rows.Count > 0)
+			{
+				foreach (DataRow TabState in DisPlayTabState.Rows)
+				{
+					int _ItemID = (int)TabState["ItemID"];
+					//ItemInfoList _Procedures = ItemInfoList.GetList(_ItemID, (int)E_FromType.Procedure));
+					ItemInfo _Procedure = ItemInfo.Get(_ItemID);
+					//ItemInfo.Get
+					//ItemInfo.Get
+					OpenItem(_Procedure);
+				}
+			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -511,7 +511,7 @@ namespace VEPROMS
 
 		private void btnPC_Click(object sender, EventArgs e)
 		{
-			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop) == DialogResult.Yes)
+			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNo, MessageBoxIcon.Stop) == DialogResult.Yes)
 			{
 				btnApplicability.Visible = true;
 				tiApplicability.Visible = true;

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

@@ -8004,6 +8004,171 @@ namespace VEPROMS.CSLA.Library
 			MyContent.Config = _ProcedureConfig.ToString();
 		}
 		#endregion
+		public class DisplayTabs
+		{
+			private int _ItemID;
+			public int ItemID
+			{
+				get { return _ItemID; }
+				set { _ItemID = value; }
+
+			}
+			private string _DisplayTabID;
+			public string DisplayTabID
+			{
+				get { return _DisplayTabID; }
+				set { _DisplayTabID = value; }
+			}
+			private string _DisplayTabName;
+			public string DisplayTabName
+			{
+				get { return _DisplayTabName; }
+				set { _DisplayTabName = value; }
+			}
+
+			public SafeDataReader Dr { get; }
+
+			public DisplayTabs()
+			{
+
+			}
+
+			public DisplayTabs(int itemID, String displayTabID, String displayTabName)
+			{
+				_ItemID = itemID;
+				_DisplayTabID = displayTabID;
+				_DisplayTabName = displayTabName;
+			}
+
+			public DisplayTabs(SafeDataReader dr)
+			{
+				Dr = dr;
+			}
+		}
+		public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
+		{
+			try
+			{
+				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
+																								  //ItemInfo.AddList(tmp);
+																								  //tmp.AddEvents();
+				return tmp;
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+			}
+		}
+		private DataTable dt = new DataTable();
+		private DataTable DataPortal_Fetch(DisplayTabs criteria)
+		{
+			
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabData";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						da.Fill(dt);
+						cn.Close();
+						da.Dispose();
+						return dt;
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+					}
+
+				}			
+			}
+
+		}
+		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//{
+		//	try
+		//	{
+		//		//DisplayTabs tmp = 
+		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
+		//																											  //ItemInfo.AddList(tmp);
+		//																											  //tmp.AddEvents();
+		//		//return tmp;
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+		//	}
+		//}
+		//private DataTable dt = new DataTable();
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		//{
+
+		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+		//	{
+		//		using (SqlCommand cm = cn.CreateCommand())
+		//		{
+		//			try
+		//			{
+		//				cm.CommandType = CommandType.StoredProcedure;
+		//				cm.CommandText = "AddDisplayTabState";
+		//				cm.CommandTimeout = Database.DefaultTimeout;
+		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
+		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+		//				cm.ExecuteNonQuery();
+		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
+		//				//da.Fill(dt);
+		//				//cn.Close();
+		//				//da.Dispose();
+		//				//return dt; // fix
+		//			}
+		//			catch (Exception ex)
+		//			{
+		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+		//			}
+
+		//		}
+		//	}
+
+		//}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.ExecuteNonQuery();
+						//SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+
+				}
+			}
+
+		}
 	}
 	#endregion
 	#region SectionInfo

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

@@ -951,7 +951,10 @@ namespace VEPROMS.CSLA.Library
 			// it is pasted into a section without enhanced data, then clear it.
  
 			// config data can only be on hls/notes/cautions for pasted steps.
-			if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote) return;
+			// B2024-059: clear links on a source section.  When a paste occurs, the section is copied with the links but not
+			//		new section is created in the enhanced document, so the links point to the original section (copied).  These
+			//		need to be removed.
+			if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote && !pasteItem.IsSection) return;
 
 			// See if the pasted step's section is enhanced with enhanced steps, and if not, clear it
 			//  Also, if pasting into a source section, don't clear (B2017-225), the 'isSourceSection' portion of the code.
@@ -974,6 +977,12 @@ namespace VEPROMS.CSLA.Library
 				// of the pasted step.
 				if (pasteItem.HasEnhancedLinkedStep) pasteItem.RemoveEnhancedFromConfig(); 
 			}
+			// B2024-059: clear links on a source section
+			if (isSourceSection)
+			{
+				EnhancedDocuments seleds = pasteItem.GetMyEnhancedDocuments();
+				foreach (EnhancedDocument ed in seleds) pasteItem.DoUnlinkEnhanced(pasteItem, ed.Type, true);
+			}
 		}
 		#endregion
 		#region Insert Child
@@ -1867,6 +1876,10 @@ namespace VEPROMS.CSLA.Library
 			if (IsCaution) enhType = 20006;
 			return enhType;
 		}
+
+		// B2024-075: Paste Before/After with Enhanced Documents is creating situation
+		//where Background item is linked to Source but Source is not linked to Background
+		//When Fixing the linking, need to not create a duplicate link if one already exists
 		public void DoCreateLinksEnhancedSingleItem(ItemInfo enhii, int enhtype)
 		{
 			// Link the 2 items, srcII & enhii:
@@ -1884,12 +1897,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsSection)
@@ -1907,12 +1923,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsProcedure)
@@ -1933,16 +1952,66 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-                    sc.AddEnhancedDocument(enhtype, enhii.ItemID);
-                    sc.SaveEnhancedDocuments();
-                    ii.MyContent.Config = sc.ToString();
-                    ii.Save();
-                    RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+						sc.SaveEnhancedDocuments();
+						ii.MyContent.Config = sc.ToString();
+						ii.Save();
+						RefreshConfig();
+					}
                 }
 			}
 		}
 		#endregion
 		#region DataPortal
+		// C2017-031:  Support for paste/replace an enhanced step
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ContentID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ContentID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2064,9 +2133,72 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
 			}
 		}
+	#endregion
+	#region PastingPartEnhancedCriteria
+	// C2017-031:  Support for paste/replace an enhanced step
+	[Serializable()]
+	public class PastingPartEnhancedCriteria
+	{
+		#region Properties
+		private int _StartItemID;
+		public int StartItemID
+		{
+			get { return _StartItemID; }
+			set { _StartItemID = value; }
+		}
+		private int _ItemID;            // paste relative to this itemid
+		public int ItemID
+		{
+			get { return _ItemID; }
+			set { _ItemID = value; }
+		}
+		private EAddpingPart _AddType;
+		public EAddpingPart AddType
+		{
+			get { return _AddType; }
+			set { _AddType = value; }
+		}
+		private int? _FromType = null;
+		public int? FromType
+		{
+			get { return _FromType; }
+			set { _FromType = value; }
+		}
+		private int? _Type = null;
+		public int? Type
+		{
+			get { return _Type; }
+			set { _Type = value; }
+		}
+		private DateTime _DTS;
+		public DateTime DTS
+		{
+			get { return _DTS; }
+			set { _DTS = value; }
+		}
+		private string _UserID;
+		public string UserID
+		{
+			get { return _UserID; }
+			set { _UserID = value; }
+		}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
 		#endregion
-		#region PastingPartCriteria
-		[Serializable()]
+	}
+	#endregion
+	#region PastingPartCriteria
+	[Serializable()]
 		public class PastingPartCriteria
 		{
 			#region Properties
@@ -2355,6 +2487,14 @@ 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
 		}
+		// C2017-031:  Support for paste/replace an enhanced step
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2516,8 +2656,16 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newItemInfo = null;
 			try
 			{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-				if (newItemInfo == null) return null;
+				// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+				if (itemInfo.IsEnhancedStep)
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+					if (newItemInfo == null) return null;
+				}
+				else
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+				}
 			}
 			catch (Exception ex1)
 			{

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

@@ -156,32 +156,38 @@ namespace VEPROMS.CSLA.Library
 				SessionInfoList sil = DataPortal.Fetch<SessionInfoList>(new SessionInfoList.CanCheckOutItemCriteria(objectID, objectType));
 				if (sil.Count == 0)
 					return true;
-        if (objectType == CheckOutType.Session)
-        {
-          if (sil.Count == 1)
-          {
-            OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
-            if (oil.Count == 0)
-              return true;
-            else
-            {
-              message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
-              return false;
-            }
-          }
-          else
-          {
-            message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
-            return false;
-          }
-        }
+				if (objectType == CheckOutType.Session)
+				{
+					if (sil.Count == 1)
+					{
+						OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
+						if (oil.Count == 0)
+							return true;
+						else
+						{
+							message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
+							return false;
+						}
+					}
+					else
+					{
+						message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
+						return false;
+					}
+				}
 				bool rv = true;
 				// C2015-022 part of separate windows logic, check the processID instead of the sessionID
 				foreach (SessionInfo si in sil)
 				{
 					if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Procedure)
 					{
-						message = string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(objectID).MyProcedure.DisplayNumber, si.UserID);
+						//B2024-074 If no Number for Procedure, Display Title
+						ProcedureInfo tmpproc = ItemInfo.Get(objectID).MyProcedure;
+						string name = tmpproc.DisplayNumber;
+						if (string.IsNullOrEmpty(name))
+						{ name = tmpproc.DisplayText; }
+
+						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)
@@ -195,8 +201,16 @@ namespace VEPROMS.CSLA.Library
 						OwnerInfo oi = OwnerInfo.GetBySessionIDandVersionID(si.SessionID, objectID);
 						if (oi == null)
 							message = message + string.Format("The working draft is already checked out to {0}", si.UserID) + Environment.NewLine;
-						else if(oi.OwnerType == 0)
-							message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+						else if (oi.OwnerType == 0)
+						{
+							//B2024-074 If no Number for Procedure, Display Title
+							ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+							string name = tmpproc.DisplayNumber;
+							if (string.IsNullOrEmpty(name))
+							{ name = tmpproc.DisplayText; }
+
+							message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+						}
 						else if (oi.OwnerType == 1)
 							message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 2)
@@ -211,7 +225,15 @@ namespace VEPROMS.CSLA.Library
 						if (oi != null)
 						{
 							if (oi.OwnerType == 0)
-								message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+							{
+								//B2024-074 If no Number for Procedure, Display Title
+								ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+								string name = tmpproc.DisplayNumber;
+								if (string.IsNullOrEmpty(name))
+								{ name = tmpproc.DisplayText; }
+
+								message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+							}
 							else if (oi.OwnerType == 1)
 								message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 2)

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

@@ -1132,6 +1132,91 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.Add", ex);
 			}
 		}
+		public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "DeactivateStateDisplayTabTmp";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName, string UserID, int order)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.Parameters.AddWithValue("@order", order);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+				}
+			}
+		}
+		public static DataTable GetDisplayTabs(string UserID) //, string displayTabID, string displayTabName)
+														   //public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabdata";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						//cm.ExecuteNonQuery();						
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
 		[Transactional(TransactionalTypes.TransactionScope)]
 		protected override void DataPortal_Update()
 		{

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -277,17 +277,27 @@ namespace Volian.Controls.Library
 
 		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
 		{
-			//using (Annotation annotation = CurrentAnnotation.Get())
-			//{
-			//				annotation.Delete();
-			_AnnotationSearch.LoadingList = true;
-			Annotation.DeleteAnnotation(CurrentAnnotation);
-			//				annotation.Save();
-			_AnnotationSearch.LoadingList = false;
-			CurrentAnnotation = null;
-			UpdateAnnotationGrid();
-			_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
-			//}
+			// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation
+			if (CurrentAnnotation != null)
+			{
+				//using (Annotation annotation = CurrentAnnotation.Get())
+				//{
+				//				annotation.Delete();
+				_AnnotationSearch.LoadingList = true;
+				Annotation.DeleteAnnotation(CurrentAnnotation);
+				//				annotation.Save();
+				_AnnotationSearch.LoadingList = false;
+				CurrentAnnotation = null;
+				UpdateAnnotationGrid();
+				_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
+																   //}
+			}
+			else
+			{
+				FlexibleMessageBox.Show("You Must Select an Annotation To Remove", "Annotation Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				return;
+			}
+
 		}
 
 		private void btnSaveAnnotation_Click(object sender, EventArgs e)
@@ -674,12 +684,15 @@ namespace Volian.Controls.Library
 				{
 					using (Annotation annotation = CurrentAnnotation.Get())
 					{
-						annotation.RtfText = rtxbComment.Rtf;
-						annotation.SearchText = rtxbComment.Text;
-						annotation.MyAnnotationType = annotationType;
-						annotation.DTS = DateTime.Now;
-						annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
-						annotation.Save();
+						if (annotation != null) // B2024-061 check for null reference
+						{
+							annotation.RtfText = rtxbComment.Rtf;
+							annotation.SearchText = rtxbComment.Text;
+							annotation.MyAnnotationType = annotationType;
+							annotation.DTS = DateTime.Now;
+							annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
+							annotation.Save();
+						}
 					}
 				}
 			}

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

@@ -503,7 +503,7 @@ namespace Volian.Controls.Library
 			this.cbxSortBySetpointID.Size = new System.Drawing.Size(121, 23);
 			this.cbxSortBySetpointID.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxSortBySetpointID.TabIndex = 11;
-			this.cbxSortBySetpointID.Text = "Sort By Sepoint ID";
+			this.cbxSortBySetpointID.Text = "Sort By Setpoint ID";
 			this.cbxSortBySetpointID.Visible = false;
 			// 
 			// DisplayReports

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

@@ -270,7 +270,7 @@ namespace Volian.Controls.Library
 			this.cbxTranCategory.Name = "cbxTranCategory";
 			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
 			this.cbxTranCategory.TabIndex = 1;
-			this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions";
+			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
 			// 
 			// lblTranCategory
 			// 
@@ -402,7 +402,7 @@ namespace Volian.Controls.Library
 			this.cbxTranCategory.Name = "cbxTranCategory";
 			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
 			this.cbxTranCategory.TabIndex = 1;
-			this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions";
+			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
 			// 
 			// lblTranCategory
 			// 

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -672,8 +672,10 @@ namespace Volian.Controls.Library
 			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
+				// B2024-038: if section, refresh the editor even if the section is not expanded.
+				bool isSec = myItemInfo.IsSection;
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
-					pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded)
+					(pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded || isSec))   
 				{
 					EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
 					switch (pasteType)
@@ -710,7 +712,8 @@ namespace Volian.Controls.Library
 			}
 			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
 			{
-				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
+				// B2024-038: changed tab key to procedure (was item, which caused crash if section)
+				CloseTabItem(_MyDisplayTabItems["Item - " + proc.ItemID.ToString()]); //Grab itemID and set to close open tab.
 				return false; //B2017-179 PasteReplace will return null if was aborted
 			}
 			return false;

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -103,7 +103,7 @@ namespace Volian.Controls.Library
 		public string TbFSwd
 		{
 			get	{return tbFSWd.Text;}
-			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
 		}
 
 		public string TbFSht
@@ -111,7 +111,7 @@ namespace Volian.Controls.Library
 			get { return tbFSHt.Text; }
 			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
 		}
-	
+
 		#endregion
 		#region Constructor
 		public DisplayTags()

PROMS/Volian.Controls.Library/EditItem.cs

@@ -9,6 +9,7 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -285,7 +286,7 @@ namespace Volian.Controls.Library
 		}
 		public EditItem ActiveParent
 		{
-			get { return _MyParentEditItem != null ? _MyParentEditItem : _MyPreviousEditItem.ActiveParent; }
+			get { return _MyParentEditItem != null ? _MyParentEditItem : _MyPreviousEditItem?.ActiveParent; }
 		}
 		/// <summary>
 		/// Return the Parent EditItem
@@ -893,6 +894,18 @@ namespace Volian.Controls.Library
 			b4topadjust -= newFocus.Top;
 			TopMostYBefore -= b4topadjust;
 
+			//B2024-075: If Deleting an item in a Source Document that is unlinked
+			//and the overall procedure has connected Background Documents
+			//and a window is open containing the background documents
+			//then need to force a refresh on that window as
+			//step numbering will shift
+			EnhancedDocuments ProcEnh = MyItemInfo.MyProcedure.GetMyEnhancedDocuments();
+			if (ProcEnh.Count > 0)
+			{
+				DisplayTabItem wndowToRefresh = MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {ProcEnh[0].ItemID}");
+				wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+			}
+
 			//_MyTimer.ActiveProcess = "Dispose";
 			Dispose();
 			//_MyTimer.ActiveProcess = "SetAllTabs";
@@ -1634,10 +1647,54 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.Before, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			// if enhanced items were created, then see if they need displayed:
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
+
+        //B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+        //since source is done first
+        //this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+        //if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+        //and don't have a corresponding spot in the Source
+        private void FixEnhanceLinkOnSource(ItemInfo SourceItem, ItemInfo newEnhItem,  EnhancedDocuments enhancedDocuments)
+		{
+			if (enhancedDocuments.Count > 0)
+				CreateLinksEnhancedSingleItem(SourceItem, newEnhItem, enhancedDocuments[0].Type); 
+		}
 		private void AddAllEnhancedItemsToDisplay(ItemInfo newItemInfo)
 		{
 			EnhancedDocuments eds = newItemInfo.GetMyEnhancedDocuments();
@@ -1684,12 +1741,15 @@ namespace Volian.Controls.Library
 				}
 			}
 		}
-		public void UnlinkEnhanced(ItemInfo enhII)
+		public void UnlinkEnhanced(EditItem enhII)
 		{
 			// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced
 			//	Pass in to unlink as before this change
-			enhII.DoUnlinkEnhanced(enhII, 0, false);
+			// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+			//so can refresh the UI
+			enhII.MyItemInfo.DoUnlinkEnhanced(enhII.MyItemInfo, 0, false);
 			SetFocus();
+			enhII.MyStepPanel.Reset(enhII.MyItemInfo); //need to reset parts so refreshes display to show as unlinked
 		}
 		public ItemInfo AddMissingEnhancedStep(ItemInfo ii, int EnhType)
 		{
@@ -1753,7 +1813,42 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.After, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			//if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+			//and don't have a cooresponding spot in the Source
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
 		public void PasteChild(int copyStartID)
@@ -1944,7 +2039,8 @@ namespace Volian.Controls.Library
 					sia.IdentifyChildren(highlight);
 				}
 			}
-			if (MyBeforeEditItems != null)
+			// C2017-031:  Support for paste/replace an enhanced step: don't identify/copy before items, i.e. notes/cautions
+			if (MyBeforeEditItems != null && !MyItemInfo.IsEnhancedStep)
 			{
 				foreach (EditItem sib in MyBeforeEditItems)
 				{

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -256,7 +256,8 @@ namespace Volian.Controls.Library
 		private int _origCfgHt = 0;	// keep track if original size was stored in cfg
 		private int _origCfgWd = 0;
 		private bool _pastedNew = false;   // need this for flagging newly pasted image (may need to clear cfg)
-		private DisplayTags _displayTags;
+		private DisplayTags _displayTags = new DisplayTags();
+		//House myhouse = new House();
 
 		#endregion
 		#region Constructors
@@ -316,8 +317,11 @@ namespace Volian.Controls.Library
 		}
 		private void SetWidthsAndHeights(System.Drawing.Image img)
 		{
+
 			int wd = img.Width * MyStepPanel.DPI / 72; // converts from screen resolution's DPI to image's points (72/inch)
 			int ht = img.Height * MyStepPanel.DPI / 72;
+
+
 			if (MyItemInfo.MyContent.MyImage != null)   // image is null if creating new.
 			{
 				ImageConfig ic = new ImageConfig(MyItemInfo.MyContent.MyImage);
@@ -340,9 +344,9 @@ namespace Volian.Controls.Library
 				_displayTags.TbFSwd = wd.ToString();
 				_displayTags.TbFSht = ht.ToString();
 			}
-
-
 		}
+
+
 		// the following gets called for 'NEW' images
 		private E_ImageSource InsType = E_ImageSource.None;
 		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType, DisplayTags displayTags)

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -1231,7 +1231,7 @@ namespace Volian.Controls.Library
 		}
 		public ItemSelectedChangedEventArgs(EditItem myEditItem)
 		{
-			_MyItemInfo = myEditItem.MyItemInfo;
+			_MyItemInfo = myEditItem?.MyItemInfo;
 			_MyEditItem = myEditItem;
 		}
 	}

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -485,6 +485,8 @@ namespace Volian.Controls.Library
 		public void RefreshDisplay(bool activeMode)
 		{
 			if (IsExperimenting) return;
+			if (IsDisposed) return;
+
 			ActiveMode = activeMode;
 			OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
 			//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -337,8 +337,10 @@ namespace Volian.Controls.Library
 				else if (btn.Name.Contains("Unlink"))
 				{
 					// C2019=003: add a confirmation dialog before unlinking a step:
+					// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+					//so can refresh the UI
 					if (FlexibleMessageBox.Show(this, "Do you want to unlink this step?", "Confirm Enhanced Step Unlink", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-						MyEditItem.UnlinkEnhanced(MyEditItem.MyItemInfo);
+						MyEditItem.UnlinkEnhanced(MyEditItem);
 				}
 			}
 			else
@@ -1750,7 +1752,7 @@ namespace Volian.Controls.Library
 			// note in follow if statements, 'setting' == false when in enhanced document:
 			if (setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0))	// this step is in enhanced, but not linked // B2018-112 and is allowed to edit
 				allowDel = true;	// allow delete if not linked
-			btnCpyStp.Enabled = setting;
+			btnCpyStp.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi); // C2017-031:  Support for paste/replace an enhanced step
 			//B20170-158 Allow a Unlinked Step to be pasted before or after a linked step.
 			StepTabPanel tmp = Parent as StepTabPanel;
 			//B2020-058: crash on null reference
@@ -1801,7 +1803,8 @@ namespace Volian.Controls.Library
 			btnPasteAfter.Enabled = btnCMPasteAfter.Enabled = enable;
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && !MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep;
+			// C2017-031:  Support for paste/replace an enhanced step, enable button
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -4110,9 +4113,19 @@ namespace Volian.Controls.Library
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(tmp.MyDisplayTabControl.MyCopyStep.ItemID, MyItemInfo, true);
 			EditItem oldEditItem = MyEditItem;
+			// C2017-031:  Support for paste/replace an enhanced step, if pasting an enhanced, remove its EditItem from the 'cache'.  A new EditItem gets created during paste.
+			if (MyEditItem != null && MyEditItem.MyItemInfo.IsEnhancedStep) MyEditItem.MyStepPanel._LookupEditItems.Remove(MyEditItem.MyItemInfo.ItemID);
 			MyEditItem = MyEditItem.PasteReplace(tmp.MyDisplayTabControl.MyCopyStep.ItemID);
 			if (MyEditItem == null) oldEditItem.IdentifyMe(false); // B2017-179 if null then we didn't do the replace but did position to the first transition that needs resolved
-			if (MyEditItem != null && MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, add Dispose of old EditItem if enhanced
+			if (MyEditItem != null && ((MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) || MyEditItem.MyItemInfo.IsEnhancedStep))
+				oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, refresh ItemInfo's in user interface caches.
+			if (MyEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				MyEditItem.MyItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+				tmp.MyStepPanel.SelectedItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+			}
 		}
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1740,10 +1740,13 @@ namespace Volian.Controls.Library
 							//		1) 'to' & 'from' both 'non', i.e. Neither can have enhanced config data (be source or enhanced)
 							//				can do Before/After/Replace
 							//		2) 'to' section is 'source' and 'from' section is 'non' (has no MyEnhancedDocuments)
-							//				can do Before/After - no links exist in pasted section.
-							//				cannot do Replace
+							//				can do Before/After - no links exist in pasted section so cannot do Replace
 							//		3) 'to' section is 'source' and 'from' section is same docversion 'source'
-							//				can do Before/After/Replace
+							//				can do Before/After (B2024-038 removes replace)
+							//		4) 'to' section is not 'source' and 'from' section is source
+							//				can do  Before/After but not replace - would have to manage
+							//				links for 'from' section (B2024-038 added this case)
+
 							SectionConfig secToCfg = iiPasteHere.MyConfig as SectionConfig;
 							SectionConfig secFromCfg = iiClipboard.MyConfig as SectionConfig;
 
@@ -1752,13 +1755,22 @@ namespace Volian.Controls.Library
 							bool secFromIsEnhanced = iiClipboard.IsEnhancedSection;
 							bool secFromIsSource = secFromCfg.MyEnhancedDocuments != null && secFromCfg.MyEnhancedDocuments.Count > 0 && secFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool secCanPaste = false;
-							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;	// 1)
-							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource) 																		// 2)
+							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;   // 1)
+							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource)                                                                       // 2)
 							{
 								secCanPaste = true;
 								okToReplace = false;
 							}
-							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true;		// 3)
+							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID)
+							{
+								secCanPaste = true;     // 3)
+								okToReplace = false;
+							}
+							else if (!secToIsSource && secFromIsSource)
+							{
+								secCanPaste = true; // 4
+								okToReplace = false;
+							}
 							if (iiClipboard.IsRtfRaw) secCanPaste = okToReplace = false;   // never paste an equation.
 							if (secCanPaste) cm.MenuItems.Add("Paste Section Before", new EventHandler(mi_Click));
 							if (okToReplace && secCanPaste) cm.MenuItems.Add("Replace Existing Section", new EventHandler(mi_Click));

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -138,6 +138,15 @@ namespace Volian.Print.Library
 			get { return _Prefix; }
 			set { _Prefix = value; }
 		}
+
+		// B2024-062 Set to true when the procedure being printed has no content.
+		// When set to true, will prevent the "Try Again" dialog from appearing
+		// and simply exit the print function
+		private bool _EmptyProcedure = false;
+		public bool EmptyProcedure
+		{
+			get { return _EmptyProcedure; }
+		}
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		public event PromsPrinterStatusEvent StatusChanged;
 		internal void OnStatusChanged(object sender, PromsPrintStatusArgs args)
@@ -933,6 +942,9 @@ namespace Volian.Print.Library
 			{
 				MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				ProfileTimer.Pop(profileDepth);
+				// B2024-062 Added check for EmptyProcedure. This is to prevent the Try Again message 
+				// from appearing after the user clicks on the OK button from the Empty Procedure message
+				_EmptyProcedure = true;
 				return null;
 			}
 			OnStatusChanged(myProcedure.DisplayNumber, PromsPrinterStatusType.ProgressSetup, myProcedure.Sections.Count);