From d959824dd41534728ca85b8547b5f484a4acd0c9 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 24 Jan 2014 05:13:03 +0000 Subject: [PATCH] Added DevNoteOrCautionTabOffset property Hid Volian "V" Create PDF button when viewing a multi unit procedure Added null check to mylookup value in ContainsKey method of ItemInfo class --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 11 ++++++++++- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 4 ++-- .../Format/PlantFormat.cs | 8 ++++++++ PROMS/fmtxml/FmtFileToXml.cs | 1 + PROMS/fmtxml/PlantSpecific_ByrBwd.cs | 11 +++++------ PROMS/fmtxml/TranslateFMT.XSL | Bin 206238 -> 206634 bytes 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index b22d625e..70ab8364 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -343,9 +343,15 @@ namespace VEPROMS displayHistory.ApplDisplayMode = pnl.ApplDisplayMode; //added by jcb 20130718 to support enabling/diabling create pdf button until user selects a unit if (pnl.ApplDisplayMode > 0) + { pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = true; + btnPrint.Visible = true; + } else + { pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = false; + btnPrint.Visible = false; + } //end added by jcb 20130718 } } @@ -1872,8 +1878,11 @@ namespace VEPROMS } SetCaption(tv.SelectedNode as VETreeNode); displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem; - Console.WriteLine("tc_SelectedDisplayTabItemChanged"); lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole; + if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1) + btnPrint.Visible = false; + else + btnPrint.Visible = true; } private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) { diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 657c89d9..83499e2f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4516,7 +4516,7 @@ namespace VEPROMS.CSLA.Library { foreach (Dictionary mylookup in MyLookups.Values) { - if (mylookup.ContainsKey(itemID)) + if (mylookup != null && mylookup.ContainsKey(itemID)) return mylookup[itemID]; } return null; @@ -4526,7 +4526,7 @@ namespace VEPROMS.CSLA.Library { foreach (Dictionary mylookup in MyLookups.Values) { - if (mylookup.ContainsKey(itemID)) + if (mylookup != null && mylookup.ContainsKey(itemID)) return true; } return false; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index e90f9510..66138786 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2711,6 +2711,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent"); } } + private LazyLoad _DevNoteOrCautionTabOffset; + public string DevNoteOrCautionTabOffset + { + get + { + return LazyLoad(ref _DevNoteOrCautionTabOffset, "@DevNoteOrCautionTabOffset"); + } + } private LazyLoad _BoxLeftAdj; public string BoxLeftAdj { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 6dc73d15..45a96390 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -737,6 +737,7 @@ public struct StepSectionLayout public string RNOWidthAdj; public string BoxLeftAdj; public string UseRNOParentIdent; + public string DevNoteOrCautionTabOffset; //end for Braidwood by jcb /* Format flags moved to here.... */ diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index 8dae03a5..232eb50c 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -73,14 +73,13 @@ namespace fmtxml fmtdata.SectData.StepSectionData.StpSectLayData.ColS = 66F; fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 526F; fmtdata.StepData[2].TabData.RNOIdent = "ERG STEP : "; - fmtdata.StepData[3].TabData.RNOIdent = "ERG NOTE :"; - fmtdata.StepData[6].TabData.RNOIdent = "ERG CAUTION:"; - fmtdata.StepData[7].TabData.RNOIdent = "ERG NOTE :"; - fmtdata.StepData[9].TabData.RNOIdent = "ERG CAUTION:"; - fmtdata.StepData[6].ColOverride = "42"; - fmtdata.StepData[7].ColOverride = "42"; + fmtdata.StepData[3].TabData.RNOIdent = "ERG NOTE : "; + fmtdata.StepData[6].TabData.RNOIdent = "ERG CAUTION: "; + fmtdata.StepData[7].TabData.RNOIdent = "ERG NOTE : "; + fmtdata.StepData[9].TabData.RNOIdent = "ERG CAUTION: "; fmtdata.StepData[43].ColOverride = "42"; fmtdata.SectData.StepSectionData.StpSectLayData.UseRNOParentIdent = "True"; + fmtdata.SectData.StepSectionData.StpSectLayData.DevNoteOrCautionTabOffset = "42"; } } public partial class FmtToXml diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 47c80fe371b9bbebf731a6f644b1a2f3618216d5..0da60c04cd9dc40951ee5f43719ac89fdcf70560 100644 GIT binary patch delta 154 zcmbPtnrGEHo`x-qev;D#WEj~v{TT8YN*GcZ{3ka`2n!}MBr*6iqyb?uP^^TZX8J-` zM&<1Vl8jlp)BD2F)$^jLpMKDl(Q>+61OZiro0*EIC#W;>Om+xyYQN>ixc!zJ(~)}s DBt9wf delta 37 tcmZ2=j%VI!o`x-qev;F#xiTtkUn0qvr8_-Anu)DF$AfWujtA4edjJwk4b}hv