From d28304fd4ccfffe1de0d5b94d4d04f02b67dc5e6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 24 May 2016 19:06:30 +0000 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20expand=20the=20RO=20step=20prop?= =?UTF-8?q?erties=20panel=20if=20the=20working=20draft=20does=20not=20have?= =?UTF-8?q?=20a=20RO=20Path=20set=20Disable=20the=20GoTo=20button=20if=20o?= =?UTF-8?q?n=20an=20empty=20RO=20table=20type.=20=20Disable=20the=20Insert?= =?UTF-8?q?=20RO=20button=20if=20the=20working=20draft=20does=20not=20have?= =?UTF-8?q?=20a=20RO=20Path=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 4 +++- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 304146a2..cdbe69fc 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3255,10 +3255,12 @@ namespace VEPROMS } private void tc_LinkModifyRO(object sender, StepPanelLinkEventArgs args) { + if (_SelectedROFst == null && (SelectedDVI == null || SelectedDVI.DocVersionAssociationCount == 0)) return; // B2016-128, not RO path associated to the working draft + if (SelectedStepTabPanel == null) return; + infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; - if (SelectedStepTabPanel == null) return; displayRO.MyROFSTLookup = SelectedROFst.GetROFSTLookup(SelectedDVI); displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 312c4b6d..d41ade84 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -900,7 +900,8 @@ namespace Volian.Controls.Library private void SetupGoToButton() { if (MyEditItem is GridItem && (MyEditItem as GridItem).MyFlexGrid.IsRoTable) - btnCMGoTo.Enabled = btnGoTo.Enabled = UserInfo.CanEditROs(MyUserInfo, Mydvi);//Don't allow Writers and Reviews run the RO Editor + // B2016-127 - disable if is an RO table type but no RO was selected. + btnCMGoTo.Enabled = btnGoTo.Enabled = UserInfo.CanEditROs(MyUserInfo, Mydvi) && (MyEditItem as GridItem).MyFlexGrid.ROID != null;//Don't allow Writers and Reviews run the RO Editor else { if (_MyStepRTB == null) return; @@ -1112,7 +1113,8 @@ namespace Volian.Controls.Library btnCMChgStep.Enabled = btnChgTyp.Enabled = setting; btnInsHLS.Enabled = btnInsCaut.Enabled = btnInsNote.Enabled = btnInsRNO.Enabled = btnInsFig.Enabled = btnInsTable.Enabled = btnInsSubstep.Enabled = btnInsBefore.Enabled = btnInsAfter.Enabled = setting; - btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = setting; + btnInsTrans.Enabled = btnCMTransition.Enabled = setting; + btnInsRO.Enabled = btnCMRO.Enabled = setting && Mydvi.DocVersionAssociationCount > 0; // 2016-128 don't enable if RO Path was not selected at the Working Draft node btnInsAftH.Enabled = btnInsBefH.Enabled = setting; btnCMChgCase.Enabled = btnChgCase.Enabled = setting; btnCMHardSpace.Enabled = btnInsHrdSpc.Enabled = setting; @@ -1559,7 +1561,7 @@ namespace Volian.Controls.Library if (btnInsRNO.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.RNO, sd, btnInsRNO, 0, btnCMInsRNO, docontextmenus); btnInsTrans.Enabled = btnCMTransition.Enabled = !MyItemInfo.IsFigure; - btnInsRO.Enabled = btnCMRO.Enabled = true; + btnInsRO.Enabled = btnCMRO.Enabled = Mydvi.DocVersionAssociationCount > 0; // 2016-128 don't enable if RO Path was not selected at the Working Draft node // if in Calvert Alarms Condition/Response, disable insert of Cautions and Notes if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) @@ -3243,7 +3245,7 @@ namespace Volian.Controls.Library btnSymbols.Enabled = enable && !MyFlexGrid.IsRoTable;// enable; btnIndent.Enabled = enable && !MyFlexGrid.IsRoTable;// ;enable; btnInsTrans.Enabled = enable && !MyFlexGrid.IsRoTable;// ; - btnInsRO.Enabled = enable; + btnInsRO.Enabled = enable && Mydvi.DocVersionAssociationCount > 0; // 2016-128 don't enable if RO Path was not selected at the Working Draft node btnCMRtfCellEdit.Enabled = enable && !MyFlexGrid.IsRoTable; } private void btnTblDgnAdjustSize_Click(object sender, EventArgs e)