Merge pull request 'Development' (#410) from Development into master

Merging all items through B2024-03 from development into master after successful testing.

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

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/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