Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
John Jenko 2021-08-27 19:01:48 +00:00
parent 84c8442c66
commit 00bc9cea50
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Volian.Controls.Library/vlnTreeView.cs
View File

@ -1324,7 +1324,8 @@ namespace Volian.Controls.Library
RevisionInfo ri = mi.Tag as RevisionInfo; RevisionInfo ri = mi.Tag as RevisionInfo;
{ {
MenuItem mip = mi.Parent as MenuItem; 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; superceded = true;
} }
vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); 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; RevisionInfo ri = mi.Tag as RevisionInfo;
{ {
MenuItem mip = mi.Parent as MenuItem; 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; superceded = true;
} }
ItemInfo ii = ItemInfo.Get(ri.ItemID); ItemInfo ii = ItemInfo.Get(ri.ItemID);