diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 9097498a..f24a381a 100644 Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 1751f6ed..05e3d73e 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -3065,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; diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 4d61ef03..ee22b33e 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/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;