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

Merging B2024-036 and F2024-063 from development into master after successful testing.

PROMS/Formats/Formats.csproj

@@ -126,6 +126,7 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
+    <Content Include="fmtall\BVPSAOPDEVall.xml" />
     <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -406,6 +407,7 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
+    <Content Include="genmacall\BVPSAOPdev.svg" />
     <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -45,7 +45,6 @@ namespace VEPROMS
 			this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnNew = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
-			this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
 			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
@@ -339,7 +338,6 @@ namespace VEPROMS
 			this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnNew,
             this.btnOpen,
-            this.btnPrint,
             this.btnPrepare,
             this.btnAdmin});
 			// 
@@ -365,16 +363,7 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
-			// 
-			// btnPrint
-			// 
-			this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
-			this.btnPrint.Enabled = false;
-			this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image")));
-			this.btnPrint.Name = "btnPrint";
-			this.btnPrint.SubItemsExpandWidth = 24;
-			this.btnPrint.Text = "Create &PDF";
-			this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
+
 			// 
 			// btnPrepare
 			// 
@@ -1646,7 +1635,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnNew;
 		private DevComponents.DotNetBar.ButtonItem btnOpen;
 		private DevComponents.DotNetBar.ButtonItem btnPrepare;
-		private DevComponents.DotNetBar.ButtonItem btnPrint;
 		private DevComponents.DotNetBar.ItemContainer icRecentDocs;
 		private DevComponents.DotNetBar.LabelItem labelItem8;
 		private DevComponents.DotNetBar.ItemContainer itemContainer5;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2098,7 +2098,6 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
-			this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
@@ -3126,22 +3125,44 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
+								if (dvi.MultiUnitCount == 0)
+								{
+									prnDlg.SelectedSlave = -1;
+								}
+								else if (dvi.MultiUnitCount > 0)
+								{
+									string[] arguments = Environment.GetCommandLineArgs();
+									for (int i = 0; i < arguments.Length; i++)
+									{
+										if (arguments[i].Contains("/C="))
+										{
+											Console.WriteLine("In arguments loop");
+											//int num;
+											string[] childarg = arguments[i].Split('=');
+											if (int.TryParse(childarg[1], out int num))
+											{
+												prnDlg.SelectedSlave = num;
+											}
+										}
+									}
+
+								}
 								prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
 								prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 														 //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
 														 //while (!_RunNext) Application.DoEvents();
-							}
-						}
 
+							}
+							
+						}
 						ranAuto = true;
 					}
-				}
-			}
 
-			if (ranAuto)
-			{
-				this.Close();
+					if (ranAuto)
+					{
+						this.Close();
+					}
+				}
 			}
 		}
 
@@ -4092,10 +4113,6 @@ namespace VEPROMS
 
 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
 
-			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
-				btnPrint.Visible = false;
-			else
-				btnPrint.Visible = true;
 
 			// Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active
 			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment
@@ -4350,7 +4367,6 @@ namespace VEPROMS
 				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
 			}
 
-			btnPrint.Enabled = (_CurrentItem != null);
 		}
 
 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
@@ -4842,12 +4858,7 @@ namespace VEPROMS
 			StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
 		}
 
-		private void btnPrint_Click(object sender, EventArgs e)
-		{
-			DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);
-			prnDlg.MySessionInfo = MySessionInfo;
-			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
-		}
+
 
 		private void lblResolution_Click(object sender, EventArgs e)
 		{

PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs

@@ -254,7 +254,7 @@ namespace VEPROMS
 			// 
 			this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ppBtnCancel.Location = new System.Drawing.Point(742, 342);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
 			this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnCancel.Name = "ppBtnCancel";
 			this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
 			// ppBtnOK
 			// 
 			this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ppBtnOK.Location = new System.Drawing.Point(669, 342);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -29,6 +29,7 @@ namespace VEPROMS
 		private List<MiniConfig> _DeletedApples;
 		private List<EnhancedMiniConfig> _Enhanced;
 		private DocVersionConfig _DocVersionConfig;
+		private string _OrgPDFPath; // B2024-030 used to save last PDF path
 		
 		// Default values
 		private string _DefaultFormatName = null;
@@ -97,6 +98,7 @@ namespace VEPROMS
 
 			_Initializing = true;
 			InitializeComponent();
+			_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
 			btnGeneral.PerformClick(); // always start with General tab or button
 			_Initializing = false;
 
@@ -323,8 +325,6 @@ namespace VEPROMS
 				tiApplicability.Visible = false;
 			}
 
-			ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
-
 			//end add new applicability stuff
 			lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;
 
@@ -538,11 +538,32 @@ namespace VEPROMS
 			}
 		}
 
-		// The following code was added to fix Bug B2013-117
-		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
+		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
+		private void CheckPDFLocationPath()
 		{
-			if (_Initializing == false)
-				_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text;
+			string pdfloc = ppTxtBxPDFLoc.Text;
+			if (pdfloc == string.Empty) return;
+			if (!Directory.Exists(ppTxtBxPDFLoc.Text))
+			{
+				string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
+				DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				if (dr == DialogResult.Yes)
+				{
+					try
+					{
+						Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
+					}
+					catch (Exception ex)
+					{
+						MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+					}
+				}
+				else
+				{
+					_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+				}
+			}
 		}
 
 		private string AddSlaveNode(MiniConfig mc)
@@ -588,6 +609,9 @@ namespace VEPROMS
 
 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
+			//B2024-030 Check the PDF Location path and prompt to create the folders if needed
+			CheckPDFLocationPath();
+
 			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157
 
 			// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -773,7 +797,6 @@ namespace VEPROMS
 
 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
-
 			this.Close();
 		}
 

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1612,7 +1612,13 @@ namespace Volian.Controls.Library
 						if (!docVersionIsEnhanced && !docVersionIsSource && !procIsSource) canPaste = true;
 						else if (docVersionIsSource && !procIsSource) canPaste = true;
 						else if (docVersionIsSource) canPaste = (!procIsSource || (iiClipboard.MyDocVersion.ItemID == dvi.ItemID));
-						else if (docVersionIsEnhanced) canPaste = !procIsSource;
+						else if (docVersionIsEnhanced)
+						{
+							// B2024-028 Do not allow paste of non-enhanced into enhanced set 
+							//	(consistent with paste before/after, i.e. don't allow)
+							canPaste = false;
+							cm.MenuItems.Add("CANNOT PASTE HERE,  Click for more information...", new EventHandler(mi_Click));
+						}
 						if (iiClipboard.IsRtfRaw) canPaste = false;   // never paste an equation.
 						if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click));
 					}
@@ -1670,9 +1676,9 @@ namespace Volian.Controls.Library
 							if (!prCanPaste)
 							{
 								if (prToIsEnhanced)
-								cm.MenuItems.Add("CANNOT PASTE HERE,  Click for more information...", new EventHandler(mi_Click));
+									cm.MenuItems.Add("CANNOT PASTE HERE,  Click for more information...", new EventHandler(mi_Click));
 								else
-								cm.MenuItems.Add("CANNOT PASTE HERE.  Click for more information...", new EventHandler(mi_Click));
+									cm.MenuItems.Add("CANNOT PASTE HERE.  Click for more information...", new EventHandler(mi_Click));
 							}
 						}
 						#endregion
@@ -2103,8 +2109,9 @@ namespace Volian.Controls.Library
 				"It can only be pasted before or after another document, within the set, that is linked to an Enhanced Document.", "Cannot Paste Here");
 					break;
 				case "CANNOT PASTE HERE,  Click for more information...":
+					// B2024-028 clarify message
 					FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" +
-				"It CANNOT be pasted before or after an Enhanced Document.", "Cannot Paste Here");
+						"You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here");
 					break;
 				//case "Check Out Procedure Set":
 				//  CheckOutDocVersion(SelectedNode as VETreeNode);
@@ -3058,6 +3065,15 @@ namespace Volian.Controls.Library
 						{
 							SaveEnhancedForSection(sourceSect, newenhSection, sed.Type);
 							RefreshRelatedNode(SectionInfo.Get(newenhSection.ItemID));
+							// B2024-023: when inserting a source section, the associated
+							//	enhanced section did not appear in tree view or in edit window (if it
+							//	was displayed in editor).  Add to tree view and close the enhanced
+							//	procedure edit window. Note that closing of edit window was done to
+							//	be consistent on what happens upon delete of source w/ and enhanced
+							//	section.
+							SectionInfo tmpsi = SectionInfo.Get(newenhSection.ItemID);
+							RefreshRelatedNode(ProcedureInfo.Get(tmpsi.MyParent.ItemID));
+							OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(tmpsi, true));
 						}
 					}
 					return;

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -699,7 +699,7 @@ namespace Volian.Print.Library
 
 				try
 				{
-					if (File.Exists(outputFileName))
+					if (File.Exists(outputFileName) && !OverWrite && !outputFileName.Contains("PageNumberPass") && !outputFileName.Contains("Foldout"))
 					{
 						if (!BaselineTesting && !SaveLinks) // B2024-031 don't do if creating PDF hyperlinks
 						{
@@ -836,14 +836,6 @@ namespace Volian.Print.Library
 			OnStatusChanged("Print " + myProcedure.DisplayNumber, PromsPrinterStatusType.Start);
 			string outputFileName = pdfFolder + "\\" + Prefix + PDFFile; // RHM20150506 Multiline ItemID TextBox
 
-			if (!OverWrite && File.Exists(outputFileName))
-			{
-				if (MessageBox.Show(outputFileName + " exists.  Overwrite file?", "File Exists", MessageBoxButtons.YesNo) == DialogResult.No)
-				{
-					ProfileTimer.Pop(profileDepth);
-					return null;
-				}
-			}
 			string retval = PrintProcedureOrFoldout(myProcedure, null, outputFileName, makePlacekeeper, makeContinuousActionSummary, makeTimeCriticalAction);
 			ProfileTimer.Pop(profileDepth);
 			return retval;