From 3f4ca2ac230e2c840b01cf71aa3fd09cf309cd70 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 2 Dec 2022 19:45:11 +0000 Subject: [PATCH] =?UTF-8?q?B2022-142=20the=20insert=20RO=20tree=20now=20re?= =?UTF-8?q?freshes=20when=20going=20between=20regular=20steps,=20RO=20Tabl?= =?UTF-8?q?e=20steps,=20and=20RO=20Figure=20steps.=20B2022-135=20=E2=80=93?= =?UTF-8?q?=20improved=20logic=20to=20ensure=20we=20are=20using=20the=20Do?= =?UTF-8?q?c=20Version=20associated=20with=20the=20current=20step=20text.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/DisplayRO.cs | 33 ++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index 12502cd7..bd7f02a3 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -79,7 +79,11 @@ namespace Volian.Controls.Library public bool RoTreeNeedsReloaded { - get { return (MyROFST != null && _currRofstID != null && MyROFST.ROFstID != (int)_currRofstID) || (MyDvi != null && _currDocVersionID != null && MyDvi.VersionID != (int)_currDocVersionID); } + get { return (MyROFST != null && _currRofstID != null && MyROFST.ROFstID != (int)_currRofstID) || + (MyDvi != null && _currDocVersionID != null && MyDvi.VersionID != (int)_currDocVersionID) || + // B2022-142 check if we went from a RO Table or RO Figure step type to a regular step type + // or if we went from a regular step type to a RO Table or RO Figure step type + (_myRTB != null && (_myRTB.IsRoTable != lastRTBwasROTable || _myRTB.IsRoFigure != lastRTBwasROFigure)); } } public ROFstInfo MyROFST @@ -114,19 +118,23 @@ namespace Volian.Controls.Library public DocVersionInfo MyDvi { - get { return _docVersionInfo; } + // B2022-135 Submitted for Admin Tools (Check RO Links tool) + get { return (_myRTB != null) ? _myRTB.MyDVI : _docVersionInfo; } set { - // Check if DocVersion Has Changed - if (_docVersionInfo != value) + // B2022-135 Submitted for Admin Tools (Check RO Links tool) + if (_docVersionInfo == null || _docVersionInfo != value || _docVersionInfo.VersionID != value.VersionID) { _docVersionInfo = value; - if (_docVersionInfo != null) - - // B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. - _currDocVersionID = (_docVersionInfo != null) ? (int?)_docVersionInfo.VersionID : null; + if (_myRTB != null && (_docVersionInfo == null || _docVersionInfo.VersionID != _myRTB.MyDVI.VersionID)) + { + _docVersionInfo = _myRTB.MyDVI; + } } + + // B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. + _currDocVersionID = (_docVersionInfo != null) ? (int?)_docVersionInfo.VersionID : null; } } @@ -172,6 +180,10 @@ namespace Volian.Controls.Library } } + // B2022-142 added this local variables to keep flag if the last step type was a RO Table or a RO Figure + // this is used to determin if we need to re-load the RO tree + private bool lastRTBwasROTable = false; + private bool lastRTBwasROFigure = false; public StepRTB MyRTB { get { return _myRTB; } @@ -189,6 +201,11 @@ namespace Volian.Controls.Library } else if(_myRTB != value) { + if (_myRTB != null) + { + lastRTBwasROTable = _myRTB.IsRoTable; // B2022-141 save whether last RTB was a RO Table + lastRTBwasROFigure = _myRTB.IsRoFigure; // B2022-141 save whether last RTB was a RO Figure + } _myRTB = value; MyRTB.LinkChanged += new StepRTBLinkEvent(MyRTB_LinkChanged);