From 00bc9cea508810159cfacd844e4f5150b0e0207c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 27 Aug 2021 19:01:48 +0000 Subject: [PATCH] B2021-086 Fixed the bug where a superseded watermark was placed on top of a workflow watermark when an approval (with a different revision number) was done. --- PROMS/Volian.Controls.Library/vlnTreeView.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 9ff8dd14..9db2048f 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1324,7 +1324,8 @@ namespace Volian.Controls.Library RevisionInfo ri = mi.Tag as RevisionInfo; { MenuItem mip = mi.Parent as MenuItem; - if (ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) + //B2021-086 Added the check for the last revision stage is an Approved stage + if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved!=0) superceded = true; } vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); @@ -1339,7 +1340,8 @@ namespace Volian.Controls.Library RevisionInfo ri = mi.Tag as RevisionInfo; { MenuItem mip = mi.Parent as MenuItem; - if (ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) + //B2021-086 Added the check for the last revision stage is an Approved stage + if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved != 0) superceded = true; } ItemInfo ii = ItemInfo.Get(ri.ItemID);