From d503cf96f9225eff5895ccdb2794c1055dc0b3c3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 27 Aug 2021 19:48:38 +0000 Subject: [PATCH] B2021-088 Fixed approval logic so that it will generate approval/workflow versions of Child procedures. --- PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 9 +++++---- PROMS/VEPROMS User Interface/frmPDFStatusForm.cs | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 18e9b135..39e21a56 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -903,10 +903,11 @@ namespace VEPROMS // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings(); int profileDepth2 = ProfileTimer.Push(">>>> CreatePdf.GetItemAndChildren"); - if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier) - MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave); - else - MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); + // B2021-088 moved this if/else to frmPDFStatusForm() so that the Approval logic will have access to this logic + //if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier) + // MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave); + //else + // MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); // C2018-015 add the procedure tree path and the procedure number and title to the meta file if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0}", MyProcedure.SearchDVPath.Replace("\a"," | ")); if (BaselineMetaFile.IsOpen) BaselineMetaFile.WriteLine("!! {0} | {1}", MyProcedure.DisplayNumber, MyProcedure.DisplayText); diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 45538dee..a1d8b9e8 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -84,6 +84,14 @@ namespace VEPROMS } public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf) { + // B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic + ProcedureInfo MyProcedure = myItem as ProcedureInfo; + if (MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave > 0 || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseTransitionModifier || MyProcedure.ActiveFormat.PlantFormat.FormatData.TransData.UseSpecificTransitionModifier) + MyProcedure = ProcedureInfo.GetItemAndChildrenByUnit(MyProcedure.ItemID, 0, MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave); + else + MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); + myItem = MyProcedure; + Prefix = prefix; OpenPDF = openPDF; DidAll = didAll;