diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 62e9edbc..712df772 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -1149,8 +1149,11 @@ namespace VEPROMS } // C2018-007: When performing more than a single procedure approval (approve all or some), only prompt once whether to include // Summary of Changes (use the following 2 flags, code using them is below) - bool askedSumChg = false; + // C2022-022: Moved the prompt once for Summary of changes out of loop and allow user to cancel, go back to approval dialog bool doSumChg = false; + DialogResult doSumChgDR = FlexibleMessageBox.Show("Do you want to save the Summary of Changes along with the Approved PDF?\r\n\r\nSelecting 'Cancel' will cancel the approval process.", "Create Summary of Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);// == DialogResult.Yes; + if (doSumChgDR == DialogResult.Cancel) return false; + doSumChg = doSumChgDR == DialogResult.Yes; List procsApproved = new List(); foreach (ApprovalProcedure ap in MyProcedures) { @@ -1240,12 +1243,6 @@ namespace VEPROMS } } byte[] summaryBuf = null; - // C2018-007: only prompt once for summary of changes - if (!askedSumChg) - { - doSumChg = MessageBox.Show("Do you want to save the Summary of Changes along with the Approved PDF?", "Create Summary of Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes; - askedSumChg = true; - } //B2017-149 Allow the user to choose if they want the Summary of Changes report created during the approval process if (doSumChg) summaryBuf = CreateSummary(ref pi, summaryPDF, myDTS); DateTime currentDTS = DateTime.Now;