diff --git a/PROMS/Formats/fmtall/FNPCASall.xml b/PROMS/Formats/fmtall/FNPCASall.xml index f64883f9..73adc8ee 100644 Binary files a/PROMS/Formats/fmtall/FNPCASall.xml and b/PROMS/Formats/fmtall/FNPCASall.xml differ diff --git a/PROMS/Formats/fmtall/FNPDEVall.xml b/PROMS/Formats/fmtall/FNPDEVall.xml index b0fcf35a..3c2ab517 100644 Binary files a/PROMS/Formats/fmtall/FNPDEVall.xml and b/PROMS/Formats/fmtall/FNPDEVall.xml differ diff --git a/PROMS/Formats/fmtall/FNPEBKall.xml b/PROMS/Formats/fmtall/FNPEBKall.xml index b375037a..c1759280 100644 Binary files a/PROMS/Formats/fmtall/FNPEBKall.xml and b/PROMS/Formats/fmtall/FNPEBKall.xml differ diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index b55dcc96..250ab1f8 100644 Binary files a/PROMS/Formats/fmtall/FNPSAM1all.xml and b/PROMS/Formats/fmtall/FNPSAM1all.xml differ diff --git a/PROMS/Formats/fmtall/FNP_00all.xml b/PROMS/Formats/fmtall/FNP_00all.xml index 2cfc9b1f..eb92a09e 100644 Binary files a/PROMS/Formats/fmtall/FNP_00all.xml and b/PROMS/Formats/fmtall/FNP_00all.xml differ diff --git a/PROMS/Formats/fmtall/FNP_01all.xml b/PROMS/Formats/fmtall/FNP_01all.xml index 79ccc29d..994ef125 100644 Binary files a/PROMS/Formats/fmtall/FNP_01all.xml and b/PROMS/Formats/fmtall/FNP_01all.xml differ diff --git a/PROMS/Formats/fmtall/FNPall.xml b/PROMS/Formats/fmtall/FNPall.xml index fc1d705e..3108f773 100644 Binary files a/PROMS/Formats/fmtall/FNPall.xml and b/PROMS/Formats/fmtall/FNPall.xml differ diff --git a/PROMS/Formats/fmtall/fnpnmpall.xml b/PROMS/Formats/fmtall/fnpnmpall.xml index 94e7cff1..23116552 100644 Binary files a/PROMS/Formats/fmtall/fnpnmpall.xml and b/PROMS/Formats/fmtall/fnpnmpall.xml differ diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index 955b5c78..47b85a1b 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/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; } diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index dca9ff95..fbd56849 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/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) diff --git a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs b/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs index a96f7d1d..c7105441 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.Designer.cs +++ b/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 diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 3d4532d4..90c04f15 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/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 // diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index dcc6b668..84fd66a1 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/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; } } /// /// Return the Parent EditItem