C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS

code changes look good. ready for testing phase

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/frmAnnotationsCleanup.cs

@@ -54,6 +54,7 @@ namespace VEPROMS
 			lbAnnotationTypes.DisplayMember = "Value";
 			lbAnnotationTypes.ValueMember = "Key";
 			lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged;
+			lbAnnotationTypes.ClearSelected();
 
 		}
 			// create comma delimited string of procedures selected by user.
@@ -104,71 +105,77 @@ namespace VEPROMS
 		// Process used to cleanup annotations "(Proceed?" button)
 		private void button1_Click(object sender, EventArgs e)
 		{
-
-			TextBox frm2 = mainForm.GettxtProcess();
-			TextBox frm3 = mainForm.GettxtResults();
-			AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-			AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
-			frm3.AppendText("Deleting Annotations: Annotation Type: " + '"' + AnnotationName + '"');
-			frm3.AppendText(Environment.NewLine + "P = Procedure, F = Folder" + Environment.NewLine);
-			int deletecountProc = 0;
-			int deletecountDocv = 0;
-			foreach (var p in pil2)
+			if (lbAnnotationTypes.SelectedIndex > -1)
 			{
-				if (p.IsProcedure)
-				{
-					//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-					//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
-					//deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(p));
-					deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, p.ItemID.ToString());
-					frm2.AppendText(Environment.NewLine + p.DisplayNumber + ' ' + p.DisplayText);
-					//frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Type: " + '"' + AnnotationName + '"' + " count: " + deletecountProc);
-					frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' +  " Delete count: " + deletecountProc);
-					Annotation.DeleteAnnotationProcByType(AnnotationTyp, p.ItemID.ToString());
-					lblCountNumber.Text = "0";
-				}
 
-			}
-			foreach (var d in dvil2)
-			{
-				if (d.IsDocVersion)
+				TextBox frm2 = mainForm.GettxtProcess();
+				TextBox frm3 = mainForm.GettxtResults();
+				AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+				AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+				frm3.AppendText("Deleting Annotations: Annotation Type: " + '"' + AnnotationName + '"');
+				frm3.AppendText(Environment.NewLine + "P = Procedure, F = Folder" + Environment.NewLine);
+				int deletecountProc = 0;
+				int deletecountDocv = 0;
+				foreach (var p in pil2)
 				{
-					//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-					//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
-					deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, d.VersionID.ToString());
-					frm2.AppendText(Environment.NewLine + d.ActiveParent.ToString());
-					frm3.AppendText(Environment.NewLine + "F: " + '"' + d.ActiveParent.ToString() + '"' + " Delete count: " + deletecountDocv);
-					AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-					Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString());
+					if (p.IsProcedure)
+					{
+						//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+						//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+						//deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(p));
+						deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, p.ItemID.ToString());
+						frm2.AppendText(Environment.NewLine + p.DisplayNumber + ' ' + p.DisplayText);
+						//frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Type: " + '"' + AnnotationName + '"' + " count: " + deletecountProc);
+						frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Delete count: " + deletecountProc);
+						Annotation.DeleteAnnotationProcByType(AnnotationTyp, p.ItemID.ToString());
+						lblCountNumber.Text = "0";
+					}
 
-					lblCountNumber.Text = "0";
 				}
+				foreach (var d in dvil2)
+				{
+					if (d.IsDocVersion)
+					{
+						//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+						//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+						deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, d.VersionID.ToString());
+						frm2.AppendText(Environment.NewLine + d.ActiveParent.ToString());
+						frm3.AppendText(Environment.NewLine + "F: " + '"' + d.ActiveParent.ToString() + '"' + " Delete count: " + deletecountDocv);
+						AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+						Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString());
+
+						lblCountNumber.Text = "0";
+					}
+				}
+				frm3.AppendText(Environment.NewLine + Environment.NewLine + "Total Annotations Deleted: " + totalDeleteCnt + Environment.NewLine + Environment.NewLine);
 			}
-			frm3.AppendText(Environment.NewLine + Environment.NewLine + "Total Annotations Deleted: " + totalDeleteCnt + Environment.NewLine + Environment.NewLine);
 
 		}
 
 		// Retrieve number of annotations that will be deleted.
 		private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			btnClean.Enabled = false;
-			lblCountNumber.Text = "";
-			int deletecountProc = 0;
-			int deletecountDocv = 0;
-			if (pil2.Count > 0)
+			if (lbAnnotationTypes.SelectedIndex > -1)
 			{
-				AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-				deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2));
-			}
+				btnClean.Enabled = false;
+				lblCountNumber.Text = "";
+				int deletecountProc = 0;
+				int deletecountDocv = 0;
+				if (pil2.Count > 0)
+				{
+					AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+					deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2));
+				}
 
-			if (dvil2.Count > 0)
-			{
-				AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
-				deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
+				if (dvil2.Count > 0)
+				{
+					AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+					deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
+				}
+				lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
+				totalDeleteCnt = (deletecountProc + deletecountDocv).ToString();
+				btnClean.Enabled = true;
 			}
-			lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
-			totalDeleteCnt = (deletecountProc + deletecountDocv).ToString();
-			btnClean.Enabled = true;
 
 		}
 			// Close form.

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -10,6 +10,8 @@ using System.IO;
 using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
+using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -24,11 +26,17 @@ namespace VEPROMS
 		private bool IsAdministratorUser = false; //C2020-035 used to control what Set Amins can do
 												  // C2017-030 - new Admin Tools user interface
 												  // pass in session info to constructor
-		public frmBatchRefresh(SessionInfo sessionInfo)
+
+		private frmVEPROMS _veProms;
+
+		public frmBatchRefresh(SessionInfo sessionInfo, frmVEPROMS veProms)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
 
+			_veProms = veProms;
+
+
 			// When opening Admin tools Check tab will be default.
 			this.sideNavItmCheck.Checked = true;
 
@@ -36,7 +44,10 @@ namespace VEPROMS
 			{
 				AdminToolType = (E_AdminToolType)4;
 				if (swDeleteFolder.Value)
+				{
 					ResetDelTV(true);
+					setupProgessSteps1();
+				}
 				else
 					ResetDelTV(false);
 			}
@@ -101,6 +112,8 @@ namespace VEPROMS
 
 		private Dictionary<TreeNode, ProcedureInfo> myProcedures = new Dictionary<TreeNode, ProcedureInfo>();
 		private Dictionary<TreeNode, DocVersionInfo> myDocVersions = new Dictionary<TreeNode, DocVersionInfo>();
+		private Dictionary<TreeNode, FolderInfo> myFolders = new Dictionary<TreeNode, FolderInfo>();
+
 		private void frmBatchRefresh_Load(object sender, EventArgs e)
 		{
 			IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -143,6 +156,7 @@ namespace VEPROMS
 			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
+			myFolders.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 			TreeNode tn = myTV.Nodes.Add(fi.Name);
 			tn.Tag = fi;
@@ -166,44 +180,21 @@ namespace VEPROMS
 
 			if (fi.ChildFolderCount > 0)
 			{
-				if (noProcs)
-				{
-					LoadBottomLevelFolders(fi, myTVdel);
-				}
-				else
-				{
-					TreeNode tn = new TreeNode(fi.Name);
-					tn.Tag = fi;
-					tn.StateImageIndex = -1; // Hide the checkbox for the root node
-					LoadChildFolders(fi, tn, noProcs);
-					myTVdel.Nodes.Add(tn);
-				}
+				TreeNode tn = new TreeNode(fi.Name);
+				tn.Tag = fi;
+				tn.StateImageIndex = -1; // Hide the checkbox for the root node
+				LoadChildFolders(fi, tn, noProcs);
+				myTVdel.Nodes.Add(tn);
 			}
 
 			if (myTVdel.SelectedNode != null)
 				myTVdel.SelectedNode.Expand();
-			this.Cursor = Cursors.Default;
 
-			//btnFixLinks.Enabled = false;
-			//this.Cursor = Cursors.WaitCursor;
-			////myTreeNodePath = new List<string>();
-			//myTVdel.Nodes.Clear();
-			//myDocVersions.Clear();
-			//FolderInfo fi = FolderInfo.GetTop();
-			//TreeNode tn = myTVdel.Nodes.Add(fi.Name );
-			//tn.Tag = fi;
-			//if (fi.ChildFolderCount > 0)
-			//{
-			//	if (noProcs)
-			//	{
-			//		LoadBottomLevelFolders(fi, myTVdel);
-			//	}
-			//	else
-			//		LoadChildFolders(fi, tn, noProcs);
-			//}
-			//if (myTVdel.SelectedNode != null)
-			//	myTVdel.SelectedNode.Expand();
-			//this.Cursor = Cursors.Default;
+			//Expand if folders
+			if (noProcs)
+				myTVdel.ExpandAll();
+
+			this.Cursor = Cursors.Default;
 		}
 
 		// B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set
@@ -215,10 +206,13 @@ namespace VEPROMS
 			{
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
+
 				if (fic.ChildFolderCount > 0)
+				{
 					if (LoadChildFolders(fic, tnc, noProcs))
 						loadedChildWorkingDraft = true;
-				// B2020-114 and C2020-035 only show folders the Set Admin can access
+				}
+
 				if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
@@ -226,40 +220,27 @@ namespace VEPROMS
 					else
 						loadedWorkingDraft = true;
 				}
-			}
-			if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft
-			if (tn.Parent != null && !loadedWorkingDraft)
-				tn.Remove();
-			return loadedWorkingDraft;
-		}
-		/// <summary>
-		/// Load only bottom layer of folders into treenode.
-		/// </summary>
-		/// <param name="fi"></param>
-		/// <param name="tn"></param>
-		private void LoadBottomLevelFolders(FolderInfo fi, TreeView treeView)
-		{
-			foreach (FolderInfo fic in fi.SortedChildFolders)
-			{
-				if (fic.ChildFolderCount > 0)
-				{
-					// Recursively call for child folders
-					LoadBottomLevelFolders(fic, treeView);
-				}
 				else
 				{
-					if (fic.Name != "PROMS")
-					{
-
-
-
-						// If the folder is a bottom-level folder (no child folders), add it directly to the TreeView
-						TreeNode tnc = treeView.Nodes.Add(fic.Name);
-						tnc.Tag = fic;
-					}
+					// Add the folder to the dictionary
+					if (!myFolders.ContainsKey(tnc))
+						myFolders.Add(tnc, fic);
 				}
 			}
+
+			if (loadedChildWorkingDraft)
+			{
+				loadedWorkingDraft = true;
+			}
+
+			if (tn.Parent != null && !loadedWorkingDraft)
+			{
+				tn.Remove();
+			}
+
+			return loadedWorkingDraft;
 		}
+
 		private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
 		{
 			bool rtnval = false;
@@ -1276,6 +1257,76 @@ namespace VEPROMS
 				}
 			}
 		}
+		//After check model to select and deselect nodes on the delete and annotation tree.
+		private void myTV_AfterCheck_DelAnn(object sender, TreeViewEventArgs e)
+		{
+			if (e.Action != TreeViewAction.Unknown)
+			{
+				if (e.Node.Nodes.Count > 0)
+				{
+					CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
+				}
+			}
+
+			if (e.Node.Checked)
+			{
+				// Ensure child nodes follow the parent node's state
+				CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
+			}
+			else
+			{
+				// Automatically deselect parent nodes if current node is unchecked
+				if (swDeleteFolder.Value)
+					DiselectParentNodes_DelAnn(e.Node);
+			}
+
+			btnFixLinks.Enabled = AtLeastOneNodeChecked_DelAnn(); // Ensure button is enabled based on custom logic
+		}
+		private void DiselectParentNodes_DelAnn(TreeNode node)
+		{
+			TreeNode parent = node.Parent;
+			while (parent != null)
+			{
+				parent.Checked = false;
+				parent = parent.Parent;
+			}
+		}
+		private void DiselectChildNodes_DelAnn(TreeNodeCollection children)
+		{
+			foreach (TreeNode child in children)
+			{
+				child.Checked = false;
+				DiselectChildNodes_DelAnn(child.Nodes);
+			}
+		}
+		private void CheckChildNodes_DelAnn(TreeNode treeNode, bool isChecked)
+		{
+			foreach (TreeNode tn in treeNode.Nodes)
+			{
+				tn.Checked = isChecked;
+
+				if (tn.Nodes.Count > 0)
+					CheckChildNodes_DelAnn(tn, isChecked);
+			}
+		}
+		private bool AtLeastOneNodeChecked_DelAnn()
+		{
+			foreach (TreeNode node in myTV.Nodes)
+			{
+				if (node.Checked || AnyChildNodeChecked_DelAnn(node))
+					return true;
+			}
+			return false;
+		}
+		private bool AnyChildNodeChecked_DelAnn(TreeNode node)
+		{
+			foreach (TreeNode childNode in node.Nodes)
+			{
+				if (childNode.Checked || AnyChildNodeChecked_DelAnn(childNode))
+					return true;
+			}
+			return false;
+		}
 
 		private ProgressBarItem _ProgressBar = null;
 
@@ -1466,8 +1517,20 @@ namespace VEPROMS
 					break;
 
 				case E_AdminToolType.Delete:
-					splitContainer3.Panel2Collapsed = true;
-					progressSteps1.Visible = false;
+					if (swDeleteFolder.Value)
+					{
+						splitContainer3.Panel2Collapsed = false;
+						progressSteps1.Items.Add(siOrphDatRecs);
+						lblAdmToolProgressType.Text = "Deleting: ";
+						progressSteps1.Visible = true;
+						progressSteps1.Refresh();
+					}
+					else
+					{
+						lblAdmToolProgressType.Text = "";
+						splitContainer3.Panel2Collapsed = true;
+						progressSteps1.Visible = false;
+					}
 					break;
 			}
 		}
@@ -1669,6 +1732,7 @@ namespace VEPROMS
 		//C2024-005 Delete Annotations, Delete Folders
 		private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e)
 		{
+			setupProgessSteps1();
 			swDeleteFolder.Value = !swDeleteAnnotations.Value;
 			if (swDeleteFolder.Value)
 				ResetDelTV(true);
@@ -1678,6 +1742,7 @@ namespace VEPROMS
 
 		private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
 		{
+			setupProgessSteps1();
 			swDeleteAnnotations.Value = !swDeleteFolder.Value;
 			if (swDeleteFolder.Value)
 				ResetDelTV(true);
@@ -1691,68 +1756,120 @@ namespace VEPROMS
 			txtResults.Clear();
 			txtProcess.Clear();
 
+			this.Cursor = Cursors.WaitCursor;
+
+			//Create checked proce and doc info lists.
+			List<ProcedureInfo> pil = new List<ProcedureInfo>();
+			List<DocVersionInfo> dvil = new List<DocVersionInfo>();
+
+			// Create a list of procedures the user selected
+			foreach (TreeNode tn in myProcedures.Keys)
+				if (tn.Checked)
+					pil.Add(myProcedures[tn]);
+
+			// Create a list of doc versions the user selected
+			foreach (TreeNode tn in myDocVersions.Keys)
+				if (tn.Checked)
+					dvil.Add(myDocVersions[tn]);
+
+			bool cancelledOut = false; // Flag to indicate if the process should be cancelled
+			StringBuilder sbDocVersions = new StringBuilder();
+
+			foreach (DocVersionInfo dq in dvil)
+			{
+				string msg = string.Empty;
+				if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg))
+				{
+					string msgp = string.Empty;
+					foreach (ProcedureInfo pi in dq.Procedures)
+					{
+						if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp))
+						{
+							FolderInfo fi = (FolderInfo)dq.ActiveParent;
+							int itemID = (int)fi.FolderID;
+							string folderName = fi.Name;
+
+							if (swDeleteFolder.Value)
+								sbDocVersions.AppendLine($"{folderName} - {msgp}");
+							else
+								sbDocVersions.AppendLine(msgp);
+
+							cancelledOut = true;
+						}
+					}
+				}
+			}
+
+			//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();
+				sb.AppendLine("The batch update process was not successful for all working drafts selected.");
+				sb.AppendLine("The following procedures are currently checked out...");
+				sb.AppendLine();
+				sb.AppendLine(sbDocVersions.ToString());
+				sb.AppendLine();
+				if (swDeleteFolder.Value)
+					sb.AppendLine("If you want to delete these folders, please contact the respective users and have them close any procedures in the working draft.");
+				else
+					sb.AppendLine("If you want to delete annotations from these working drafts, please contact the respective users and have them close any procedures in the working draft.");
+				sb.AppendLine();
+				txtProcess.AppendText(sb.ToString());
+				this.Cursor = Cursors.Default;
+				return;
+			}
+
+
+
 
 			if (swDeleteFolder.Value)
 			{
-				//TODO process deletions of folders
-				txtProcess.AppendText("Deleting Folders...");
+				if (FlexibleMessageBox.Show(this, "Are you sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+				{
+					txtProcess.AppendText("Deleting Folders...");
 
-				//List<ProcedureInfo> pil = new List<ProcedureInfo>();
-				//foreach (TreeNode tn in myProcedures.Keys)
-				//	if (tn.Checked)
-				//		pil.Add(myProcedures[tn]);
+					//Load Selected Folders
+					List<FolderInfo> ef = new List<FolderInfo>();
+					foreach (TreeNode tn in myFolders.Keys)
 
-				////Load Selected Folders
-				Dictionary<int, string> folderData = new Dictionary<int, string>();
+						if (tn.Checked)
+							ef.Add(myFolders[tn]);
 
-				//List<FolderInfo> Flist = new List<FolderInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		Flist.Add();
-
-				//List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		dvil.Add(myDocVersions[tn]);
-
-				//foreach (TreeNode tn in myTVdel.Nodes)
-				//{
-				//	if (tn.Checked)
-				//	{
-				//		var itemInfo = myProcedures[tn];
-				//		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
-				//	}
-				//}
-
-				//ProcessDelete(dvil);
+					ProcessDelete(dvil, ef);
+				}
 			}
 			else
 			{
-					// Write progress status
-				txtProcess.AppendText("Deleting Annotations..." + Environment.NewLine);
-
-					// Create a list of procedures the user selected
-				List<ProcedureInfo> pil = new List<ProcedureInfo>();
-				foreach (TreeNode tn in myProcedures.Keys)
-					if (tn.Checked)
-						pil.Add(myProcedures[tn]);
-
-					// Create a list of doc versions the user selected
-				List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				foreach (TreeNode tn in myDocVersions.Keys)
-					if (tn.Checked)
-						dvil.Add(myDocVersions[tn]);
+				// Write progress status
+				txtProcess.AppendText("Deleting Annotations...");
 
 				frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil);
-				
+
 				frmAnnoDel.ShowDialog();
 
 
 			}
+			this.Cursor = Cursors.Default;
 		}
 
-		private void ProcessDelete(List<DocVersionInfo> foldersToDelete)
+		private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete)
 		{
+			int foldersDeleted = 0;
+
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
@@ -1760,17 +1877,19 @@ namespace VEPROMS
 
 			foreach (var kvp in foldersToDelete)
 			{
-				int itemID = (int)kvp.ItemID;
-				string folderName = kvp.Name;
+				//Gather folder information			
+				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
+				int itemID = (int)fi.FolderID;
+				string folderName = fi.Name;
 
 				// Perform the deletion operation
-				// Assume DeleteFolderByID is a method that deletes the folder by its ItemID
 				bool deletionSuccessful = DeleteFolderByID(itemID);
 
 				// Update txtProcess with the progress
 				if (deletionSuccessful)
 				{
 					txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
+					foldersDeleted += 1;
 				}
 				else
 				{
@@ -1778,13 +1897,69 @@ namespace VEPROMS
 				}
 				txtProcess.AppendText(Environment.NewLine);
 			}
+
+
+			//Delete non working info folders.
+			foreach (var kvp in emptyFoldersToDelete)
+			{
+				//Gather folder information			
+				FolderInfo fi = (FolderInfo)kvp;
+				int itemID = (int)fi.FolderID;
+				string folderName = fi.Name;
+
+				// Perform the deletion operation
+				bool deletionSuccessful = DeleteFolderByID(itemID);
+
+				// Update txtProcess with the progress
+				if (deletionSuccessful)
+				{
+					txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
+					foldersDeleted += 1;
+				}
+				else
+				{
+					txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
+				}
+				txtProcess.AppendText(Environment.NewLine);
+
+			}
+
+
+
+
+			//Run Repair
+			int prgStpIdx = -1;
+			StepProgress(++prgStpIdx, 50);
+			PurgeDisconnectedItems(); // Orphan Items
+			StepProgress(prgStpIdx, 100);
+
+			//rebuild
+			ResetDelTV(true);
+
+			MessageBox.Show($"Folder deletion completed, {foldersDeleted} folders have been deleted.", "Delete Folders");
+			ClearStepProgress();
+
+			txtResults.AppendText($"Folder deletion process completed, {foldersDeleted} folders have been deleted.");
+			txtResults.AppendText(Environment.NewLine);
 		}
-		// Example deletion method
-		private bool DeleteFolderByID(int itemID)
+
+		private bool DeleteFolderByID(int folderID)
 		{
-			// Implement your folder deletion logic here
-			// Return true if deletion was successful, false otherwise
-			return true; // Placeholder
+			try
+			{
+				//Delete
+				Folder.DeleteFolderAdmin(folderID);
+
+				//update treeview UI via veProms
+				_veProms.tv_FolderDelete(folderID);
+
+				return true;
+			}
+			catch (Exception ex)
+			{
+				string err = ex.ToString();
+				return false;
+			}
 		}
 
 		public List<ProcedureInfo> RetrieveChkAnnotations()

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -121,9 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+    <value>This allows the user to remove folders and sub folders as well as their contents.
 
 Be sure a current backup of the database exists prior performing this function.
 
@@ -132,28 +130,34 @@ It is recommended that this be done during off hours.
 </value>
   </data>
   <data name="labelX13.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+    <value>This allows the user to remove folders and sub folders as well as their contents.
 
 Be sure a current backup of the database exists prior performing this function.
 
 It is recommended that this be done during off hours.
+
 </value>
   </data>
   <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+    <value>This function will allow the user to remove annotations from the selected working drafts.
 
 Be sure a current backup of the database exists prior to running this function.
 
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
   </data>
   <data name="labelX14.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+    <value>This function will allow the user to remove annotations from the selected working drafts.
 
 Be sure a current backup of the database exists prior to running this function.
 
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
+    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
+
+Click on the on/off switches to turn on/off each tool.
+
+Note that only one of these tools can be run at a time.</value>
   </data>
   <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
     <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.

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

@@ -254,6 +254,21 @@ namespace VEPROMS
 			tc.RefreshItem(myItemInfo);
 		}
 
+		public void tv_FolderDelete(int folderId)
+		{
+			// Create an instance of the event args if needed
+			var args = new vlnTreeFolderDeleteEventArgs(folderId);
+
+			// Trigger the deletion using the event arguments
+			tv.RemoveFolder(args.FolderId);
+
+		}
+		private bool Tv_DeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args)
+		{
+			tv.RemoveFolder(args.FolderId);
+			return true;
+		}
+
 		private E_UCFImportOptions _UCFImportOptionsFromSettings;
 
 		public frmVEPROMS()
@@ -474,6 +489,7 @@ namespace VEPROMS
 			tv.NodeNew += new vlnTreeViewEvent(tv_NodeNew);
 			tv.OpenItem += new vlnTreeViewItemInfoEvent(tv_OpenItem);
 			tv.TabDisplay += new StepPanelTabDisplayEvent(tc_PanelTabDisplay);
+			tv.DeleteFolder += new vlnTreeViewItemInfoDeleteFolderEvent(Tv_DeleteFolder);
 			tv.DeleteItemInfo += new vlnTreeViewItemInfoDeleteEvent(tv_DeleteItemInfo);
 			tv.InsertItemInfo += new vlnTreeViewItemInfoInsertEvent(tv_InsertItemInfo);
 			tv.NodeInsert += new vlnTreeViewEvent(tv_NodeInsert);
@@ -1654,16 +1670,36 @@ 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)
+
+					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
@@ -2304,6 +2340,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)
@@ -2741,7 +2798,7 @@ namespace VEPROMS
 
 		void btnAdministrativeTools_Click(object sender, EventArgs e)
 		{
-			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo);
+			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo, this);
 			frm.ProgressBar = bottomProgBar;
 			frm.ShowDialog(this);
 		}

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

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/Folder.cs

@@ -1433,6 +1433,31 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Folder.Remove", ex);
 			}
 		}
+
+		[Transactional(TransactionalTypes.TransactionScope)]
+		public static void DeleteFolderAdmin(int folderID)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Folder.Remove", 0);
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandTimeout = Database.SQLTimeout;
+						cm.CommandText = "deleteFolderAdmin";
+						cm.Parameters.AddWithValue("@FolderID", folderID);
+						cm.ExecuteNonQuery();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				if (_MyLog.IsErrorEnabled) _MyLog.Error("Folder.Remove", ex);
+				throw new DbCslaException("Folder.Remove", ex);
+			}
+		}
 		#endregion
 		#region Exists
 		public static bool Exists(int folderID)

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

@@ -16,6 +16,12 @@ namespace Volian.Controls.Library
 	public delegate ItemInfo DisplayTabControlEditorSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate void DisplayTabControlEvent(object sender, EventArgs args);
 	public delegate void DisplayTabControlStatusEvent(object sender, DisplayTabControlStatusEventArgs args);
+	public class DisplayTabData
+	{
+		public int ItemID { get; set; }
+		public string DisplayTabID { get; set; }
+		public string DisplayTabName { get; set; }
+	}
 	public partial class DisplayTabControlStatusEventArgs : EventArgs
 	{
 		private VolianStatusType _Type;
@@ -672,8 +678,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 +718,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;
@@ -1142,6 +1151,9 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
+
+				List<DisplayTabData> DisplayTabs = new List<DisplayTabData>();
+
 				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)

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

@@ -285,7 +285,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

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

@@ -1,36 +1,36 @@
 namespace Volian.Controls.Library
 {
-    partial class vlnTreeView
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	partial class vlnTreeView
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
 
-        #region Component Designer generated code
+		#region Component Designer generated code
 
-        /// <summary>
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
+		/// <summary>
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			components = new System.ComponentModel.Container();
+		}
 
-        #endregion
-    }
+		#endregion
+	}
 }

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -26,7 +26,9 @@ namespace Volian.Controls.Library
   public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args);
 	public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args);
+																											 
 	public delegate bool vlnTreeViewItemInfoInsertEvent(object sender, vlnTreeItemInfoInsertEventArgs args);
+	public delegate bool vlnTreeViewItemInfoDeleteFolderEvent(object sender, vlnTreeFolderDeleteEventArgs args);
 	public delegate bool vlnTreeViewItemInfoPasteEvent(object sender, vlnTreeItemInfoPasteEventArgs args);
 	public delegate TreeNode vlnTreeViewTreeNodeEvent(object sender, vlnTreeEventArgs args);
 	public delegate DialogResult vlnTreeViewPropertyEvent(object sender, vlnTreePropertyEventArgs args);
@@ -220,6 +222,15 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 	}
+	public class vlnTreeFolderDeleteEventArgs : EventArgs
+	{
+		public int FolderId { get; }
+
+		public vlnTreeFolderDeleteEventArgs(int folderId)
+		{
+			FolderId = folderId;
+		}
+	}
 	public enum E_InsertType {Before, After, Child};
 	public partial class vlnTreeItemInfoInsertEventArgs
 	{
@@ -427,6 +438,12 @@ namespace Volian.Controls.Library
 			if (DeleteItemInfo != null) return DeleteItemInfo(sender, args);
 			return false;
 		}
+		public event vlnTreeViewItemInfoDeleteFolderEvent DeleteFolder;
+		private bool OnDeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args)
+		{
+			if (DeleteItemInfo != null) return DeleteFolder(sender, args);
+			return false;
+		}
 		public event vlnTreeViewItemInfoInsertEvent InsertItemInfo;
 		private bool OnInsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args)
 		{
@@ -551,6 +568,11 @@ namespace Volian.Controls.Library
 		{
 			if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args);
 		}
+														  
+																				
+   
+																				  
+   
     public event vlnTreeViewEvent ExportImportProcedureSets;
     private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
     {
@@ -1059,6 +1081,11 @@ namespace Volian.Controls.Library
 
 					#region Menu_Delete
 					if (ok)
+	  
+																					   
+																						  
+											
+																							 
 						{
 							// Add delete to the menu unless at the very 'top' node, on a grouping (partinfo)
 							// node (RNOs, Steps, Cautions, Notes) or Folder/DocVersion that contains any items.
@@ -1082,6 +1109,7 @@ namespace Volian.Controls.Library
 								}
 							}
 						}
+	  
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 6 - {0}", GC.GetTotalMemory(true));
 					#region Menu_ExternalTransitions
@@ -1712,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;
 
@@ -1724,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));
@@ -1940,6 +1980,16 @@ namespace Volian.Controls.Library
 				OnPrintTransitionReport(this, new vlnTreeEventArgs(SelectedNode as VETreeNode));
 				return;
 			}
+																		  
+	
+																								 
+		   
+	
+																		  
+	
+																								 
+		   
+	
       if (mi.Text == "Export Procedure Set" || mi.Text == "Export Procedure")
       {
         OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -2408,6 +2458,7 @@ namespace Volian.Controls.Library
 				}
 			}
 			VETreeNode tn = SelectedNode as VETreeNode;
+																											 
 			DocVersionInfo dvi = tn.VEObject as DocVersionInfo;
 			// Check for paste into a docversion - queries/code is different than paste related to an item (into a proc or section)
 			if (dvi != null)
@@ -2579,6 +2630,7 @@ namespace Volian.Controls.Library
 			// B2018-047: was crashing on the following line (before change it was casting the result to a VETreeNote when the partn.FirstNode was just a TreeNode)
 			SelectedNode = prevtn != null ? prevtn.NextNode : partn.FirstNode;
 			return replItemInfo;
+
 		}
 		public void PasteRepalceEmpty(VETreeNode tn, int copyStartID)
 		{
@@ -3582,6 +3634,41 @@ namespace Volian.Controls.Library
 			}
 			return false;
 		}
+  
+		public void RemoveFolder(int folderId)
+		{
+			TreeNode nodeToRemove = FindNodeById(folderId, this.Nodes);
+			if (nodeToRemove != null)
+			{
+				// Perform the removal logic
+				nodeToRemove.Remove(); // This removes the node from its parent
+			}
+		}
+		private TreeNode FindNodeById(int folderId, TreeNodeCollection nodes)
+		{
+			foreach (TreeNode node in nodes)
+			{
+				VETreeNode vetNode = node as VETreeNode;
+				if (vetNode != null)
+				{
+					FolderInfo folderInfo = vetNode.VEObject as FolderInfo;
+					if (folderInfo != null && folderInfo.FolderID == folderId)
+					{
+						return node;
+					}
+					else
+					{
+						TreeNode foundNode = FindNodeById(folderId, node.Nodes);
+						if (foundNode != null)
+						{
+							return foundNode;
+						}
+					}
+				}
+			}
+			return null;
+		}
+
 		private bool DeleteItemInfoAndChildren(ItemInfo ii)
 		{
 			DateTime dtStart = DateTime.Now;

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);