From 10445a7fd33050f0c6c89cad09ec2032b26132a6 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 25 Jun 2020 14:13:39 +0000 Subject: [PATCH] C2019-019: Put out message when approval completes --- PROMS/VEPROMS User Interface/dlgApproveProcedure.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 82412622..60bf8716 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -1059,6 +1059,7 @@ namespace VEPROMS // Summary of Changes (use the following 2 flags, code using them is below) bool askedSumChg = false; bool doSumChg = false; + List procsApproved = new List(); foreach (ApprovalProcedure ap in MyProcedures) { ProcedureInfo pi = ap.ProcInfo; @@ -1068,6 +1069,7 @@ namespace VEPROMS string pdfPath = string.Format(@"{0}\{1}", VlnSettings.TemporaryFolder, pdfTmp); if (!TryToDelete(summaryPDF)) break; if (!TryToDelete(pdfPath)) break; + procsApproved.Add(ap.ProcInfo.DisplayNumber + " " + ap.ProcInfo.DisplayText); RevisionInfo ric = pi.MyDocVersion.DocVersionConfig.SelectedSlave > 0 ? RevisionInfo.GetCurrentByItemIDandUnitID(pi.ItemID, pi.MyDocVersion.DocVersionConfig.SelectedSlave) : RevisionInfo.GetCurrentByItemID(pi.ItemID); // RevisionInfo rip = RevisionInfo.GetPreviousByItemID(pi.ItemID); DateTime myDTS = pi.DTS; // pi.DTS is date of last approval @@ -1159,7 +1161,7 @@ namespace VEPROMS //frmPDFStatusForm frm = new frmPDFStatusForm(myproc, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); //myproc.ChangeBarDate = myDTS; frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumAndDate, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location, pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts, true, "", false, false, false, - MyProcedures.Count > (MyProcedures[0].ProcInfo.MyDocVersion.Procedures.Count / 4), pi.MyDocVersion.DocVersionConfig.Print_DuplexBlankPageText); // C2019-004: Allow user to define duplex lank page text at the docversion level + MyProcedures.Count > (MyProcedures[0].ProcInfo.MyDocVersion.Procedures.Count / 4), pi.MyDocVersion.DocVersionConfig.Print_DuplexBlankPageText, null); // C2019-004: Allow user to define duplex lank page text at the docversion level frm.AllowAllWatermarks = true; frm.CloseWhenDone = !ViewPDF; frm.DocReplace = new Dictionary(); // will hold the Word Attachments with resolved ROs @@ -1217,6 +1219,11 @@ namespace VEPROMS //UpdateProcedureDTS(pi, DateTime.Now); pi.MyDocVersion.DocVersionConfig.SelectedSlave = selectedSlave; } + // C2019-019: Put out a complete message when approval is done. + if (procsApproved.Count > 0) + { + MessageBox.Show("Approve Procedures has completed.", "Approve Procedure", MessageBoxButtons.OK); + } return true; }