From 9262837ba166826338f1ffb1c3ed35dc5176ab0d Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 7 Feb 2014 17:32:59 +0000 Subject: [PATCH] Added support for passing an override DocVersion ID as a 1-time fix to Braidwood data Utilized ROFSTLookup instead of ROFST in Display RO tab Change Display RO ROFSTLookup based on selected tab --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 70ab8364..0654c0d9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -74,7 +74,7 @@ namespace VEPROMS } } } - + public DocVersionInfo SelectedDVI { get { return _SelectedDVI; } @@ -229,6 +229,8 @@ namespace VEPROMS UpdateFormats(parameter.Substring(4)); else if (parameter.ToUpper().StartsWith("/UF")) UpdateFormats(null); + else if (parameter.ToUpper().StartsWith("/ODV=")) + tv.OverrideDocVersionID = int.Parse(parameter.Substring(5, parameter.Length - 5)); } VETreeNode tn = VETreeNode.GetFolder(1); tv.Nodes.Add(tn); @@ -1714,8 +1716,8 @@ namespace VEPROMS infoTabs.SelectedTab = infotabRO; //if (dtp == null) return; - displayRO.Mydvi = SelectedDVI; - displayRO.MyROFST = SelectedROFst; + //displayRO.Mydvi = SelectedDVI; + displayRO.MyROFSTLookup = SelectedROFst.GetROFSTLookup(SelectedDVI); displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedEditItem == null ? null : SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.TabControl = tc; @@ -1851,7 +1853,7 @@ namespace VEPROMS else if (args.PanelTabName == "DisplayROUpdateROFST") { _SelectedROFst = null; - displayRO.MyROFST = SelectedROFst; + displayRO.MyROFSTLookup = SelectedROFst.GetROFSTLookup(SelectedDVI); displayRO.RefreshRoTree(); } } @@ -1878,6 +1880,7 @@ namespace VEPROMS } SetCaption(tv.SelectedNode as VETreeNode); displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem; + displayRO.MyROFSTLookup = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion); lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole; if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1) btnPrint.Visible = false; @@ -2078,12 +2081,12 @@ namespace VEPROMS infoTabs.SelectedTab = infotabRO; if (SelectedStepTabPanel == null) return; - displayRO.MyROFST = SelectedROFst; + displayRO.MyROFSTLookup = SelectedROFst.GetROFSTLookup(SelectedDVI); displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo; displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ? E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image: E_ROValueType.Text; - displayRO.Mydvi = SelectedDVI; + //displayRO.Mydvi = SelectedDVI; displayRO.ProgressBar = bottomProgBar; displayRO.TabControl = tc; }