B2024-041 - Update PromsFixes for the RevDate and RevDescriptions

Format only changes

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,6 +241,21 @@ namespace JR.Utils.GUI.Forms
             return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
         }
 
+        /// <summary>
+        /// Shows the specified message box.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <param name="text">The text.</param>
+        /// <param name="caption">The caption.</param>
+        /// <param name="buttons">The buttons.</param>
+        /// <param name="icon">The icon.</param>
+        /// <param name="defaultButton">The default button.</param>
+        /// <returns>The dialog result.</returns>
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
+        }
+
         #endregion
 
         #region Internal form class
@@ -420,15 +435,15 @@ namespace JR.Utils.GUI.Forms
             private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
-            
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
+
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms
 
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
+             
 
                     case MessageBoxButtons.OK:
                     default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            #endregion
+            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
+            {
+                flexibleMessageBoxForm.visibleButtonsCount = 3;
 
-            #region Private event handlers
+                flexibleMessageBoxForm.button1.Visible = true;
+                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
+                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
 
-            /// <summary>
-            /// Handles the Shown event of the FlexibleMessageBoxForm control.
-            /// </summary>
-            /// <param name="sender">The source of the event.</param>
-            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+                flexibleMessageBoxForm.button2.Visible = true;
+                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
+                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
+
+                flexibleMessageBoxForm.button3.Visible = true;
+                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
+                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
+
+                flexibleMessageBoxForm.ControlBox = false;
+            }
+
+
+
+
+                #endregion
+
+                #region Private event handlers
+
+                /// <summary>
+                /// Handles the Shown event of the FlexibleMessageBoxForm control.
+                /// </summary>
+                /// <param name="sender">The source of the event.</param>
+                /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+                private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
             {
                 int buttonIndexToFocus = 1;
                 Button buttonToFocus;
@@ -866,6 +904,46 @@ namespace JR.Utils.GUI.Forms
                 return flexibleMessageBoxForm.ShowDialog(owner);
             }
 
+            /// <summary>
+            /// Shows the specified message box.
+            /// </summary>
+            /// <param name="owner">The owner.</param>
+            /// <param name="text">The text.</param>
+            /// <param name="caption">The caption.</param>
+            /// <param name="buttons">The buttons.</param>
+            /// <param name="icon">The icon.</param>
+            /// <param name="defaultButton">The default button.</param>
+            /// <returns>The dialog result.</returns>
+            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+            {
+                //Create a new instance of the FlexibleMessageBox form
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                flexibleMessageBoxForm.ShowInTaskbar = false;
+
+                //Bind the caption and the message text
+                flexibleMessageBoxForm.CaptionText = caption;
+                flexibleMessageBoxForm.MessageText = text;
+                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
+
+                //Set the buttons visibilities and texts. Also set a default button.
+                SetDialogButtonsCustom(flexibleMessageBoxForm);
+
+                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
+                SetDialogIcon(flexibleMessageBoxForm, icon);
+
+                //Set the font for all controls
+                flexibleMessageBoxForm.Font = FONT;
+                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
+
+                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
+                SetDialogSizes(flexibleMessageBoxForm, text, caption);
+
+				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
+				SetDialogStartPosition(flexibleMessageBoxForm, owner);
+				//Show the dialog
+				return flexibleMessageBoxForm.ShowDialog(owner);
+			}
+
             #endregion
         } //class FlexibleMessageBoxForm
 

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1320,6 +1320,10 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
+			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
+			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
+			//	for procedures.
+			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}
 
 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -99,6 +99,10 @@ namespace VEPROMS
 			MyProcedure = procedureInfo;
 			InitializeComponent();
 			this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
+
+			//Preset path for single procedures.
+			PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
+			txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 		}
 		private void dlgExportImport_Load(object sender, EventArgs e)
 		{
@@ -172,6 +176,7 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
+				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -190,6 +195,8 @@ namespace VEPROMS
 		private bool successfullExport = true;
 		private void btnDoExport_Click(object sender, EventArgs e)
 		{
+		
+
 			btnExport.Enabled = false;
 			string msg = "Finished Exporting:\n\n";
 			if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -220,6 +227,42 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
+				var fileLocation = txtExport.Text;
+				if (File.Exists(fileLocation))
+					{   // C2022-029 if an existing export of the same name is found, provide option to overwrite it
+					DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name.  You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
+
+					// Extract directory, filename, and extension
+					string directory = Path.GetDirectoryName(fileLocation);
+					string filename = Path.GetFileNameWithoutExtension(fileLocation);
+					string extension = Path.GetExtension(fileLocation);
+					fileLocation = $"{directory}\\{filename}{extension}";
+
+					if (ovewriteEx == DialogResult.Abort)
+					{
+						MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
+						btnCloseExport.Enabled = true;
+						return;
+					}
+					else if (ovewriteEx == DialogResult.Retry)
+					{
+						//Overwrite will occur, set msg.
+						msg = "The export file has been overwritten.  ";
+					}
+					else if (ovewriteEx == DialogResult.Ignore)
+					{
+						// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
+						DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
+						string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
+						string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
+
+						//Move and set msg.
+						File.Move(fileLocation, newFileLocation);
+						msg = "The previous export has been renamed, the export file has been created.  ";
+					}
+
+				}
+
 				this.Cursor = Cursors.WaitCursor;
 				MyStart = DateTime.Now;
 				btnDoExport.Enabled = false;
@@ -230,7 +273,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(txtExport.Text);
+				xd.Save(fileLocation);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -706,7 +749,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;

PROMS/VEPROMS User Interface/dlgExportImport.designer.cs

@@ -400,6 +400,7 @@ namespace VEPROMS
 			this.pnlImport.PerformLayout();
 			this.ResumeLayout(false);
 
+
 		}
 
 		#endregion

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

@@ -1309,7 +1309,8 @@ namespace VEPROMS.CSLA.Library
 					else if (addType == EAddpingPart.Replace)   // what about user interface for enhanced pasted steps?
 					{
 						ItemInfo enhReplaceItem = ItemInfo.Get(edSource.ItemID);
-						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid);
+						TreeNode trn = null;
+						newEnhancedItemInfo = Item.PasteReplace(enhReplaceItem, tmpCopyEnhancedID, chgid, trn);
 					}
 
 					// update the config data for the new enhanced item (procedure, section or step) to point back to the correct source
@@ -2497,13 +2498,16 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region PasteReplace
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid)
+
+
+
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
 		{
-			bool tmp= false;
-			return PasteReplace(itemInfo, copyStartID, chgid, ref tmp);
+			bool tmp = false;
+			return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, ref tmp);
 		}
 		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
-		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, ref bool firstTrans)
+		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
 		{
 			firstTrans = false;
 			if (!CanDeleteObject())
@@ -2560,7 +2564,14 @@ namespace VEPROMS.CSLA.Library
 				}
 				else
 				{
-					newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+					//Create tree node for copied procedure when no other procedures exist in the folder
+					VETreeNode vtn = treeNodeReplace as VETreeNode;
+					DocVersionInfo dvi = vtn.VEObject as DocVersionInfo;
+	
+					ItemInfo newProc = dvi.PasteChild(copyStartID);
+					VETreeNode tn1 = new VETreeNode(newProc);
+					treeNodeReplace.Nodes.Add(tn1);        // add tree node to end of list.
+					treeNodeReplace = tn1;
 				}
 				return newItemInfo;
 			}

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -688,8 +688,14 @@ namespace Volian.Controls.Library
 							edtitm.PasteSiblingAfter(copyStartID);
 							break;
 						case ItemInfo.EAddpingPart.Replace:
+							
 							EditItem ei = edtitm.PasteReplace(copyStartID);
-							if (ei == null) return false; //B2017-179 PasteReplace will return null if was aborted
+							if (ei == null)
+							{		
+								CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
+								return false; //B2017-179 PasteReplace will return null if was aborted
+							}
+							
 							if (ei.MyItemInfo.ItemID != edtitm.MyItemInfo.ItemID)
 							{
 								edtitm.Dispose();

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1825,6 +1825,7 @@ namespace Volian.Controls.Library
 			EditItem newFocus = null;
 			EditItem nextEditItem = MyNextEditItem;
 			EditItem prevEditItem = MyPreviousEditItem;
+			if (MyStepPanel?.SelectedEditItem?.ActiveParent == null) return null; //Was causing an error when active parent was null and the replaced proc was opened in the editor.
 			EditItem parentEditItem = ActiveParent;
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
@@ -1835,7 +1836,8 @@ namespace Volian.Controls.Library
 			bool gotoFirstTrans = false;
 			try
 			{
-				newItemInfo = Item.PasteReplace(MyItemInfo, copyStartID, GetChangeId(MyItemInfo), ref gotoFirstTrans);
+				TreeNode treeNodeReplace = null;
+				newItemInfo = Item.PasteReplace(MyItemInfo, copyStartID, GetChangeId(MyItemInfo), treeNodeReplace, ref gotoFirstTrans);
 				if (gotoFirstTrans)  //B2017-179 could not replace step, we are positioning onto the first transition that needs resolved
 				{
 					MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(newItemInfo);

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -2018,7 +2018,6 @@ namespace Volian.Controls.Library
 				// lots of paste options:
                 case "Paste Procedure":
 				case "Paste Procedure Before":
-				case "Replace Existing Procedure":
 				case "Paste Procedure After":
 				case "Paste Section":
 				case "Paste Section Before":
@@ -2031,6 +2030,18 @@ namespace Volian.Controls.Library
 				case "Paste Subsection":
 					tv_NodePaste(mi.Text);
 					break;
+				case "Replace Existing Procedure":
+					DialogResult ovewriteEx = FlexibleMessageBox.Show("This will overwrite the selected procedure with then one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the procedure?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
+
+					if (ovewriteEx == DialogResult.Cancel) break;
+					else
+					{
+						TreeNode treenodeDirectory = SelectedNode.Parent;
+						tv_NodePaste(mi.Text);
+						break;
+					}
+
+					
 				case "Delete":
 					if (tv_NodeDelete())
 					{
@@ -2397,6 +2408,7 @@ namespace Volian.Controls.Library
 				}
 			}
 			VETreeNode tn = SelectedNode as VETreeNode;
+			TreeNode treeNodeReplace = SelectedNode.Parent; //Get Tree Node of Parent we are proc we are placing into.
 			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)
@@ -2432,13 +2444,17 @@ namespace Volian.Controls.Library
 			else if (p.IndexOf("After") > -1)
 				PasteBeforeOrAfter(MenuSelections.StepAfter, tn, iiClipboard.ItemID);
 			else if (p.IndexOf("Replace") > -1)
-				PasteReplace(tn, iiClipboard.ItemID);
+			{
+				PasteReplace(tn, iiClipboard.ItemID, treeNodeReplace);
+			}
 			else  // paste as child
 				PasteAsChild(tn, iiClipboard.ItemID);
-			this.Cursor = Cursors.Default;
+
+			//if (p.IndexOf("Replace") <= -1)
+				this.Cursor = Cursors.Default;
 		}
 
-		private void PasteAsDocVersionChild(VETreeNode tn, int copyStartID)
+		public void PasteAsDocVersionChild(VETreeNode tn, int copyStartID)
 		{
 			// Only need to handle paste in tree since this will create a new procedure.
 			DocVersionInfo dvi = tn.VEObject as DocVersionInfo;
@@ -2525,7 +2541,7 @@ namespace Volian.Controls.Library
 			}
 			SelectedNode = (VETreeNode)((newtype == MenuSelections.StepAfter) ? tn.NextNode : tn.PrevNode);
 		}
-		private void PasteReplace(VETreeNode tn, int copyStartID)
+		private void PasteReplace(VETreeNode tn, int copyStartID, TreeNode treeNodeReplace)
 		{
 			VETreeNode prevtn = (VETreeNode) tn.PrevNode;
 			VETreeNode partn = (VETreeNode) tn.Parent;
@@ -2536,23 +2552,43 @@ namespace Volian.Controls.Library
 			{
 				// first, check if a changeid is required.
 				string chgId = OnGetChangeId(this, new vlnTreeItemInfoEventArgs(ii));
-				ItemInfo replItemInfo = Item.PasteReplace(ii, copyStartID, chgId);
+				ItemInfo replItemInfo = Item.PasteReplace(ii, copyStartID, chgId, treeNodeReplace);
+
 				StepConfig replItemConfig = ii.MyConfig as StepConfig;
 				if (replItemInfo != null)
 				{
-					OnOpenItem(this, new vlnTreeItemInfoEventArgs(replItemInfo));
 					ItemInfo newEnhStep = replItemInfo.PasteEnhancedItems(copyStartID, ii, ItemInfo.EAddpingPart.Replace, chgId);
 				}
 			}
 			// 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;
+
+	
 		}
-		private void tv_NodeCopy()
+		public void PasteRepalceEmpty(VETreeNode tn, int copyStartID)
 		{
-			if (SelectedNode==null)return;
-			VETreeNode tn = SelectedNode as VETreeNode;
-      OnNodeCopy(this, new vlnTreeEventArgs(tn));
+			// Only need to handle paste in tree since this will create a new procedure.
+			DocVersionInfo dvi = tn.VEObject as DocVersionInfo;
+			if (dvi.DocVersionAssociationCount == 0)
+			{
+				// Set docversionassociation to the copied docversion association
+				// so that the rofst for ro's can be found. (if there is no association set)
+				ROFstInfo rfi = GetAssociationRofstId(copyStartID);
+				Association myAs = Association.MakeAssociation(dvi.Get(), rfi.GetJustROFst(), "");
+				dvi.RefreshDocVersionAssociations();
+			}
+			ItemInfo newProc = dvi.PasteChild(copyStartID);
+			VETreeNode tn1 = new VETreeNode(newProc);
+			SelectedNode.Nodes.Add(tn1);        // add tree node to end of list.
+			SelectedNode = tn1;
 		}
+			private void tv_NodeCopy()
+		{
+			if (SelectedNode == null) return;
+			VETreeNode tn = SelectedNode as VETreeNode;
+			OnNodeCopy(this, new vlnTreeEventArgs(tn));
+		}
+
 		#endregion
 		#region PropertyPagesInterface
 		private void SetupNodeProperties()